tpm: Fix cancellation of TPM commands (polling mode)

On one of my machines the cancellation of TPM commands does not work.
The reason is that by writing into sysfs 'cancel' the tpm_tis_ready
call causes the status flag TPM_STS_VALID to be set in the statusregister.
However, the TIS driver seems to wait for TPM_STS_COMMAND_READY.
Once a 2nd time sysfs 'cancel' is written to, the TPM_STS_COMMAND_READY flag
also gets set, resulting in TPM_STS_VALID|TPM_STS_COMMAND_READY to be
read from the status register.

This patch now converts req_canceled into a function to enable more complex
comparisons against possible cancellation status codes.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>

1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 3615d210e603..e4e0c65df768 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -400,6 +400,19 @@ out:
         return rc;
 }
 
+static bool tpm_tis_req_canceled(struct tpm_chip *chip, u8 status)
+{
+        switch (chip->vendor.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);
+        }
+}
+
 static const struct file_operations tis_ops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
@@ -445,7 +458,7 @@ static struct tpm_vendor_specific tpm_tis = {
         .cancel = tpm_tis_ready,
         .req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID,
         .req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID,
-        .req_canceled = TPM_STS_COMMAND_READY,
+        .req_canceled = tpm_tis_req_canceled,
         .attr_group = &tis_attr_grp,
         .miscdev = {
                     .fops = &tis_ops,},