LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
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 v5 3/7] tpm: tpm_tis: rewrite "tpm_tis_req_canceled()"
Date: Sun, 5 Apr 2020 15:53:48 +0300 [thread overview]
Message-ID: <20200405125352.183693-4-amirmizi6@gmail.com> (raw)
In-Reply-To: <20200405125352.183693-1-amirmizi6@gmail.com>
From: Amir Mizinski <amirmizi6@gmail.com>
Using this function while read/write data resulted in aborted operation.
After investigating according to TCG TPM Profile (PTP) Specifications,
i found cancel should happen only if TPM_STS.commandReady bit is lit and
couldn't find a case when the current condition is valid.
So i'm removing the case for "TPM_VID_WINBOND" since we have no need for it
Also default comparison is wrong. only cmdReady bit need to be compared
instead of the full lower status register byte.
Fixes: 1f86605 (tpm: Fix cancellation of TPM commands (polling mode))
Signed-off-by: Amir Mizinski <amirmizi6@gmail.com>
---
drivers/char/tpm/tpm_tis_core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 6c4f232..453d7ef 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -713,13 +713,10 @@ 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-04-05 12:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-05 12:53 Add tpm i2c ptp driver amirmizi6
2020-04-05 12:53 ` [PATCH v5 1/7] tpm: tpm_tis: Make implementation of read16 read32 write32 optional amirmizi6
2020-04-05 12:53 ` [PATCH v5 2/7] tpm: tpm_tis: Add check_data handle to tpm_tis_phy_ops in order to check data integrity amirmizi6
2020-04-06 18:28 ` Jarkko Sakkinen
2020-04-05 12:53 ` amirmizi6 [this message]
2020-04-05 12:53 ` [PATCH v5 4/7] tpm: tpm_tis: Fix expected bit handling and send all bytes in one shot without last byte in exception amirmizi6
2020-04-05 12:53 ` [PATCH v5 5/7] tpm: Handle an exception for TPM Firmware Update mode amirmizi6
2020-04-05 12:53 ` [PATCH v5 6/7] dt-bindings: tpm: Add YAML schema for TPM TIS I2C options amirmizi6
2020-04-05 12:53 ` [PATCH v5 7/7] tpm: tpm_tis: add tpm_tis_i2c driver amirmizi6
2020-04-08 3:06 ` Joel Stanley
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=20200405125352.183693-4-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 \
--subject='Re: [PATCH v5 3/7] tpm: tpm_tis: rewrite "tpm_tis_req_canceled()"' \
/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
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).