From 873d71775db5a5ad87545836970138a275103bfd Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Thu, 5 Dec 2019 17:46:17 -0800 Subject: [PATCH] [buster] [cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237) The bug has most of the context for this fix. Basically, the cloud image disables TPM drives, and we want to reenable them. I added the virt and hardware-agnostic drivers (TIS/CRB/XEN/VTPM), and I explictly didn't add the hardware-specific drivers. I also didn't bother with CONFIG_HW_RANDOM_TPM as we already set CONFIG_RANDOM_TRUST_CPU=y which handles any early-boot RNG issues. Signed-off-by: Joe Richey --- debian/changelog | 7 +++++++ debian/config/amd64/config.cloud-amd64 | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a63cb0d4e..cd3d18372 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.19.87-2) UNRELEASED; urgency=medium + + [ Joe Richey ] + * [cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237) + + -- Joe Richey Thu, 05 Dec 2019 17:38:37 -0800 + linux (4.19.87-1) buster; urgency=medium * New upstream stable update: diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64 index 2ea5b0d80..623716678 100644 --- a/debian/config/amd64/config.cloud-amd64 +++ b/debian/config/amd64/config.cloud-amd64 @@ -185,7 +185,19 @@ CONFIG_XEN_BLKDEV_FRONTEND=m ## ## file: drivers/char/tpm/Kconfig ## -# CONFIG_TCG_TPM is not set +CONFIG_TCG_TPM=m +# CONFIG_HW_RANDOM_TPM is not set +CONFIG_TCG_TIS=m +# CONFIG_TCG_TIS_SPI is not set +# CONFIG_TCG_TIS_I2C_ATMEL is not set +# CONFIG_TCG_TIS_I2C_INFINEON is not set +# CONFIG_TCG_TIS_I2C_NUVOTON is not set +# CONFIG_TCG_NSC is not set +# CONFIG_TCG_ATMEL is not set +# CONFIG_TCG_INFINEON is not set +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=m +CONFIG_TCG_VTPM_PROXY=m ## ## file: drivers/char/xillybus/Kconfig