From: amirmizi6@gmail.com
To: Eyal.Cohen@nuvoton.com, jarkko.sakkinen@linux.intel.com,
oshrialkoby85@gmail.com, alexander.steffen@infineon.com,
robh+dt@kernel.org, mark.rutland@arm.com, peterhuewe@gmx.de,
jgg@ziepe.ca, arnd@arndb.de, gregkh@linuxfoundation.org,
benoit.houyere@st.com, eajames@linux.ibm.com, joel@jms.id.au
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-integrity@vger.kernel.org, oshri.alkoby@nuvoton.com,
tmaimon77@gmail.com, gcwilson@us.ibm.com, kgoldman@us.ibm.com,
Dan.Morav@nuvoton.com, oren.tanami@nuvoton.com,
shmulik.hager@nuvoton.com, amir.mizinski@nuvoton.com,
Amir Mizinski <amirmizi6@gmail.com>
Subject: [PATCH v7 5/7] tpm: Handle an exception for TPM Firmware Update mode.
Date: Mon, 27 Apr 2020 15:49:29 +0300 [thread overview]
Message-ID: <20200427124931.115697-6-amirmizi6@gmail.com> (raw)
In-Reply-To: <20200427124931.115697-1-amirmizi6@gmail.com>
From: Amir Mizinski <amirmizi6@gmail.com>
An extra precaution for TPM Firmware Update Mode.
For example if TPM power was cut while in Firmware update, platform
should ignore "selftest" failure and skip TPM initialization sequence.
Suggested-by: Benoit Houyere <benoit.houyere@st.com>
Signed-off-by: Amir Mizinski <amirmizi6@gmail.com>
---
drivers/char/tpm/tpm2-cmd.c | 4 ++++
include/linux/tpm.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 7603295..6e42946 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -727,6 +727,10 @@ int tpm2_auto_startup(struct tpm_chip *chip)
goto out;
rc = tpm2_do_selftest(chip);
+
+ if (rc == TPM2_RC_UPGRADE || rc == TPM2_RC_COMMAND_CODE)
+ return 0;
+
if (rc && rc != TPM2_RC_INITIALIZE)
goto out;
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index 03e9b18..5a2e031 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -199,6 +199,7 @@ enum tpm2_return_codes {
TPM2_RC_INITIALIZE = 0x0100, /* RC_VER1 */
TPM2_RC_FAILURE = 0x0101,
TPM2_RC_DISABLED = 0x0120,
+ TPM2_RC_UPGRADE = 0x012D,
TPM2_RC_COMMAND_CODE = 0x0143,
TPM2_RC_TESTING = 0x090A, /* RC_WARN */
TPM2_RC_REFERENCE_H0 = 0x0910,
--
2.7.4
next prev parent reply other threads:[~2020-04-27 12:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 12:49 [PATCH v7 0/7] Add tpm i2c ptp driver amirmizi6
2020-04-27 12:49 ` [PATCH v7 1/7] tpm: tpm_tis: Make implementation of read16, read32 and write32 optional amirmizi6
2020-04-27 12:49 ` [PATCH v7 2/7] tpm: tpm_tis: Add verify_data_integrity handle toy tpm_tis_phy_ops amirmizi6
2020-04-29 5:34 ` Jarkko Sakkinen
2020-04-30 10:19 ` Amir Mizinski
2020-04-27 12:49 ` [PATCH v7 3/7] tpm: tpm_tis: Rewrite "tpm_tis_req_canceled()" amirmizi6
2020-04-29 5:37 ` Jarkko Sakkinen
2020-04-30 10:29 ` Amir Mizinski
2020-04-27 12:49 ` [PATCH v7 4/7] tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception amirmizi6
2020-04-27 12:49 ` amirmizi6 [this message]
2020-04-27 12:49 ` [PATCH v7 6/7] tpm: Add YAML schema for TPM TIS I2C options amirmizi6
2020-05-05 16:12 ` Rob Herring
2020-05-06 15:20 ` Amir Mizinski
2020-05-06 19:02 ` Rob Herring
2020-04-27 12:49 ` [PATCH v7 7/7] tpm: tpm_tis: add tpm_tis_i2c driver amirmizi6
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200427124931.115697-6-amirmizi6@gmail.com \
--to=amirmizi6@gmail.com \
--cc=Dan.Morav@nuvoton.com \
--cc=Eyal.Cohen@nuvoton.com \
--cc=alexander.steffen@infineon.com \
--cc=amir.mizinski@nuvoton.com \
--cc=arnd@arndb.de \
--cc=benoit.houyere@st.com \
--cc=devicetree@vger.kernel.org \
--cc=eajames@linux.ibm.com \
--cc=gcwilson@us.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=joel@jms.id.au \
--cc=kgoldman@us.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=oren.tanami@nuvoton.com \
--cc=oshri.alkoby@nuvoton.com \
--cc=oshrialkoby85@gmail.com \
--cc=peterhuewe@gmx.de \
--cc=robh+dt@kernel.org \
--cc=shmulik.hager@nuvoton.com \
--cc=tmaimon77@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).