Skip to content

Commit 5e3a3f2

Browse files
StMaHajarkkojs
authored andcommitted
tpm: Add upgrade/reduced mode support for TPM1.2 modules
In case a TPM in failure mode is detected, the TPM should be accessible through a transparent communication channel for analysing purposes (e.g. TPM_GetTestResult) or a field upgrade. Since a TPM in failure mode has similar reduced functionality as in field upgrade mode, the flag TPM_CHIP_FLAG_FIRMWARE_UPGRADE is also valid. As described in TCG TPM Main Part1 Design Principles, Revision 116, chapter 9.2.1. the TPM also allows an update function in case a TPM is in failure mode. If the TPM in failure mode is detected, the function tpm1_auto_startup() sets TPM_CHIP_FLAG_FIRMWARE_UPGRADE flag, which is used later during driver initialization/deinitialization to disable functionality which makes no sense or will fail in the current TPM state. The following functionality is affected: * Do not register TPM as a hwrng * Do not get pcr allocation * Do not register sysfs entries which provide information impossible to obtain in limited mode Signed-off-by: Stefan Mahnke-Hartmann <stefan.mahnke-hartmann@infineon.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
1 parent 200e340 commit 5e3a3f2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

drivers/char/tpm/tpm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ enum tpm_addr {
5555
#define TPM_WARN_DOING_SELFTEST 0x802
5656
#define TPM_ERR_DEACTIVATED 0x6
5757
#define TPM_ERR_DISABLED 0x7
58+
#define TPM_ERR_FAILEDSELFTEST 0x1C
5859
#define TPM_ERR_INVALID_POSTINIT 38
5960

6061
#define TPM_TAG_RQU_COMMAND 193

drivers/char/tpm/tpm1-cmd.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,12 @@ int tpm1_auto_startup(struct tpm_chip *chip)
709709
if (rc)
710710
goto out;
711711
rc = tpm1_do_selftest(chip);
712-
if (rc) {
712+
if (rc == TPM_ERR_FAILEDSELFTEST) {
713+
dev_warn(&chip->dev, "TPM self test failed, switching to the firmware upgrade mode\n");
714+
/* A TPM in this state possibly allows or needs a firmware upgrade */
715+
chip->flags |= TPM_CHIP_FLAG_FIRMWARE_UPGRADE;
716+
return 0;
717+
} else if (rc) {
713718
dev_err(&chip->dev, "TPM self test failed\n");
714719
goto out;
715720
}

0 commit comments

Comments
 (0)