Skip to content

Headed for upstream, no need to review.

Justin M. Forbes requested to merge jmflinuxtx/kernel-ark:tpmfix into os-build

The vendor check introduced by commit 554b841d ("tpm: Disable RNG for all AMD fTPMs") doesn't work properly on a number of Intel fTPMs. On the reported systems the TPM doesn't reply at bootup and returns back the command code. This makes the TPM fail probe on Lenovo Legion Y540 laptop.

Since only Microsoft Pluton is the only known combination of AMD CPU and fTPM from other vendor, disable hwrng otherwise. In order to make sysadmin aware of this, print also info message to the klog.

Cc: stable@vger.kernel.org Fixes: 554b841d ("tpm: Disable RNG for all AMD fTPMs") Reported-by: Todd Brandt todd.e.brandt@intel.com Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217804 Reported-by: Patrick Steinhardt ps@pks.im Reported-by: Raymond Jay Golo rjgolo@gmail.com Reported-by: Ronan Pigott ronan@rjp.ie Reviewed-by: Jerry Snitselaar jsnitsel@redhat.com Signed-off-by: Jarkko Sakkinen jarkko@kernel.org

Merge request reports