tpm: encapsulate tpm_dev_transmit()

Encapsulate tpm_transmit() call pattern to tpm_dev_transmit() because it
is identically used from two places. Use unlocked version of
tpm_transmit() so that we are able to move the calls to
tpm2_prepare_space() and tpm2_commit_space() later on to this new
function.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Tested-by: Alexander Steffen <Alexander.Steffen@infineon.com>

diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
index 5eecad2..7597969 100644 (file)
--- a/drivers/char/tpm/tpm-dev-common.c
+++ b/drivers/char/tpm/tpm-dev-common.c
@@ -27,7 +27,19 @@
 static struct workqueue_struct *tpm_dev_wq;
 static DEFINE_MUTEX(tpm_dev_wq_lock);
 
-static void tpm_async_work(struct work_struct *work)
+static ssize_t tpm_dev_transmit(struct tpm_chip *chip, struct tpm_space *space,
+                               u8 *buf, size_t bufsiz)
+{
+       ssize_t ret;
+
+       mutex_lock(&chip->tpm_mutex);
+       ret = tpm_transmit(chip, space, buf, bufsiz, TPM_TRANSMIT_UNLOCKED);
+       mutex_unlock(&chip->tpm_mutex);
+
+       return ret;
+}
+
+static void tpm_dev_async_work(struct work_struct *work)
 {
        struct file_priv *priv =
                        container_of(work, struct file_priv, async_work);
@@ -35,9 +47,8 @@ static void tpm_async_work(struct work_struct *work)
 
        mutex_lock(&priv->buffer_mutex);
        priv->command_enqueued = false;
-       ret = tpm_transmit(priv->chip, priv->space, priv->data_buffer,
-                          sizeof(priv->data_buffer), 0);
-
+       ret = tpm_dev_transmit(priv->chip, priv->space, priv->data_buffer,
+                              sizeof(priv->data_buffer));
        tpm_put_ops(priv->chip);
        if (ret > 0) {
                priv->response_length = ret;
@@ -80,7 +91,7 @@ void tpm_common_open(struct file *file, struct tpm_chip *chip,
        mutex_init(&priv->buffer_mutex);
        timer_setup(&priv->user_read_timer, user_reader_timeout, 0);
        INIT_WORK(&priv->timeout_work, tpm_timeout_work);
-       INIT_WORK(&priv->async_work, tpm_async_work);
+       INIT_WORK(&priv->async_work, tpm_dev_async_work);
        init_waitqueue_head(&priv->async_wait);
        file->private_data = priv;
 }
@@ -183,8 +194,8 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf,
                return size;
        }
 
-       ret = tpm_transmit(priv->chip, priv->space, priv->data_buffer,
-                          sizeof(priv->data_buffer), 0);
+       ret = tpm_dev_transmit(priv->chip, priv->space, priv->data_buffer,
+                              sizeof(priv->data_buffer));
        tpm_put_ops(priv->chip);
 
        if (ret > 0) {