[PATCH 6/6] tpm: move TPM space code out of tpm_transmit()

[Jarkko Sakkinen]

Prepare and commit TPM space before and after calling tpm_transmit()
instead of doing that inside tpm_transmit(). After this change we can
remove TPM_TRANSMIT_NESTED flag.

Signed-off-by: Jarkko Sakkinen <jarkko.sakki...@linux.intel.com>
---
 drivers/char/tpm/tpm-dev-common.c | 31 ++++++++++++++++++++++++++++---
 drivers/char/tpm/tpm-interface.c  | 21 ---------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/drivers/char/tpm/tpm-dev-common.c 
b/drivers/char/tpm/tpm-dev-common.c
index cbb0ee30b511..22c7ac819662 100644
--- a/drivers/char/tpm/tpm-dev-common.c
+++ b/drivers/char/tpm/tpm-dev-common.c
@@ -30,13 +30,38 @@ static DEFINE_MUTEX(tpm_dev_wq_lock);
 static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space,
                                u8 *buf, size_t bufsiz)
 {
-       ssize_t ret;
+       struct tpm_output_header *header = (void *)buf;
+       ssize_t ret, len;
 
        mutex_lock(&chip->tpm_mutex);
-       ret = tpm_transmit(chip, space, buf, bufsiz, TPM_TRANSMIT_UNLOCKED);
+       ret = tpm2_prepare_space(chip, space, buf, bufsiz);
+       /* If the command is not implemented by the TPM, synthesize a
+        * response with a TPM2_RC_COMMAND_CODE return for user-space.
+        */
+       if (ret == -EOPNOTSUPP) {
+               header->length = cpu_to_be32(sizeof(*header));
+               header->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS);
+               header->return_code = cpu_to_be32(TPM2_RC_COMMAND_CODE |
+                                                 TSS2_RESMGR_TPM_RC_LAYER);
+               ret = sizeof(*header);
+               goto out;
+       }
+       if (ret)
+               goto out;
+
+       len = tpm_transmit(chip, space, buf, bufsiz, TPM_TRANSMIT_UNLOCKED);
+       if (len < 0) {
+               ret = len;
+               goto out;
+       }
+
+       ret = tpm2_commit_space(chip, space, buf, &len);
+out:
        mutex_unlock(&chip->tpm_mutex);
+       if (ret)
+               return ret;
 
-       return ret;
+       return len;
 }
 
 static void tpm_dev_async_work(struct work_struct *work)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index dcdf2436ae44..cb21880d957c 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -147,21 +147,6 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip,
                return -E2BIG;
        }
 
-       rc = tpm2_prepare_space(chip, space, buf, bufsiz);
-       /*
-        * If the command is not implemented by the TPM, synthesize a
-        * response with a TPM2_RC_COMMAND_CODE return for user-space.
-        */
-       if (rc == -EOPNOTSUPP) {
-               header->length = cpu_to_be32(sizeof(*header));
-               header->tag = cpu_to_be16(TPM2_ST_NO_SESSIONS);
-               header->return_code = cpu_to_be32(TPM2_RC_COMMAND_CODE |
-                                                 TSS2_RESMGR_TPM_RC_LAYER);
-               return sizeof(*header);
-       }
-       if (rc)
-               return rc;
-
        rc = chip->ops->send(chip, buf, count);
        if (rc < 0) {
                if (rc != -EPIPE)
@@ -202,12 +187,6 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip,
        if (len < TPM_HEADER_SIZE || len != be32_to_cpu(header->length))
                return -EFAULT;
 
-       rc = tpm2_commit_space(chip, space, buf, &len);
-       if (rc) {
-               dev_err(&chip->dev, "%s: commit error %d\n", __func__, rc);
-               return rc;
-       }
-
        return len;
 }
 
-- 
2.19.1