2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 6a8771f47a55..32362cf35b8d 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -846,6 +846,15 @@ int tpm_do_selftest(struct tpm_chip *chip)
 
         do {
                 rc = __tpm_pcr_read(chip, 0, digest);
+                if (rc == TPM_ERR_DISABLED || rc == TPM_ERR_DEACTIVATED) {
+                        dev_info(chip->dev,
+                                 "TPM is disabled/deactivated (0x%X)\n", rc);
+                        /* TPM is disabled and/or deactivated; driver can
+                         * proceed and TPM does handle commands for
+                         * suspend/resume correctly
+                         */
+                        return 0;
+                }
                 if (rc != TPM_WARN_DOING_SELFTEST)
                         return rc;
                 msleep(delay_msec);
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 8c1df302fbb6..010547138281 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -39,6 +39,9 @@ enum tpm_addr {
 };
 
 #define TPM_WARN_DOING_SELFTEST 0x802
+#define TPM_ERR_DEACTIVATED     0x6
+#define TPM_ERR_DISABLED        0x7
+
 #define TPM_HEADER_SIZE         10
 extern ssize_t tpm_show_pubek(struct device *, struct device_attribute *attr,
                                 char *);