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,
"benoit.houyere@st.com--to=mark.rutland"@arm.com,
peterhuewe@gmx.de, christophe-h.richard@st.com, jgg@ziepe.ca,
arnd@arndb.de, gregkh@linuxfoundation.org
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 v12 5/9] tpm: tpm_tis: Rewrite "tpm_tis_req_canceled()"
Date: Thu, 25 Jun 2020 17:46:45 +0300 [thread overview]
Message-ID: <20200625144650.269719-6-amirmizi6@gmail.com> (raw)
In-Reply-To: <20200625144650.269719-1-amirmizi6@gmail.com>
From: Amir Mizinski <amirmizi6@gmail.com>
Using this function while reading/writing data resulted in an aborted
operation.
After investigating the issue according to the TCG TPM Profile (PTP)
Specifications, I found that "request to cancel" should occur only if
TPM_STS.commandReady bit is lit.
Note that i couldn't find a case where the present condition
(in the linux kernel) is valid, so I'm removing the case for
"TPM_VID_WINBOND" since we have no need for it.
Also, the default comparison is wrong. Only cmdReady bit needs to be
compared instead of the full lower status register byte.
Fixes: 1f866057291f (tpm: Fix cancellation of TPM commands (polling mode))
Signed-off-by: Amir Mizinski <amirmizi6@gmail.com>
---
drivers/char/tpm/tpm_tis_core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 347c020..a38465f 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -701,13 +701,11 @@ static bool tpm_tis_req_canceled(struct tpm_chip *chip, u8 status)
struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
switch (priv->manufacturer_id) {
- case TPM_VID_WINBOND:
- return ((status == TPM_STS_VALID) ||
- (status == (TPM_STS_VALID | TPM_STS_COMMAND_READY)));
case TPM_VID_STM:
return (status == (TPM_STS_VALID | TPM_STS_COMMAND_READY));
default:
- return (status == TPM_STS_COMMAND_READY);
+ return ((status & TPM_STS_COMMAND_READY) ==
+ TPM_STS_COMMAND_READY);
}
}
--
2.7.4
next prev parent reply other threads:[~2020-06-25 14:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 14:46 [PATCH v12 0/9] Add tpm i2c ptp driver amirmizi6
2020-06-25 14:46 ` [PATCH v12 1/9] tpm: Make read{16, 32}() and write32() in tpm_tis_phy_ops optional amirmizi6
2020-06-25 14:46 ` [PATCH v12 2/9] tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception amirmizi6
2020-06-25 14:46 ` [PATCH v12 3/9] tpm: tpm_tis: Add retry in case of protocol failure amirmizi6
2020-06-25 22:00 ` Jarkko Sakkinen
2020-06-25 14:46 ` [PATCH v12 4/9] tpm: tpm_tis: Add verify_data_integrity handle to tpm_tis_phy_ops amirmizi6
2020-06-25 22:02 ` Jarkko Sakkinen
2020-06-25 14:46 ` amirmizi6 [this message]
2020-06-25 14:46 ` [PATCH v12 6/9] tpm: Handle an exception for TPM Firmware Update mode amirmizi6
2020-06-25 14:46 ` [PATCH v12 7/9] tpm: tpm_tis: verify TPM_STS register is valid after locality request amirmizi6
2020-06-25 14:46 ` [PATCH v12 8/9] tpm: Add YAML schema for TPM TIS I2C options amirmizi6
2020-06-25 14:46 ` [PATCH v12 9/9] 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=20200625144650.269719-6-amirmizi6@gmail.com \
--to=amirmizi6@gmail.com \
--cc="benoit.houyere@st.com--to=mark.rutland"@arm.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=christophe-h.richard@st.com \
--cc=devicetree@vger.kernel.org \
--cc=gcwilson@us.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=kgoldman@us.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).