tpm: add tpm_calc_ordinal_duration() wrapper

Add convenient wrapper for ordinal duration computation
to remove boiler plate if else statement over TPM2.

if (chip->flags & TPM_CHIP_FLAG_TPM2)
	tpm2_calc_ordinal_duration(chip, ordinal);
else
	tpm1_calc_ordinal_duration(chip, ordinal);

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/st33zp24/st33zp24.c b/drivers/char/tpm/st33zp24/st33zp24.c
index 16be974955ea352a24047d61459e4c6a47cc76a2..abd675bec88c8435a6b1277b3fac6336d0339c21 100644 (file)
--- a/drivers/char/tpm/st33zp24/st33zp24.c
+++ b/drivers/char/tpm/st33zp24/st33zp24.c
@@ -430,7 +430,7 @@ static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf,
                ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
 
                ret = wait_for_stat(chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID,
-                               tpm1_calc_ordinal_duration(chip, ordinal),
+                               tpm_calc_ordinal_duration(chip, ordinal),
                                &tpm_dev->read_queue, false);
                if (ret < 0)
                        goto out_err;

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index bb3eed907c721c771d9711394f8f77bb49604cc0..305eb3069101bed97a343b7bf4c3cb23e2a2ab53 100644 (file)
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -47,6 +47,25 @@ module_param_named(suspend_pcr, tpm_suspend_pcr, uint, 0644);
 MODULE_PARM_DESC(suspend_pcr,
                 "PCR to use for dummy writes to facilitate flush on suspend.");
 
+/**
+ * tpm_calc_ordinal_duration() - calculate the maximum command duration
+ * @chip:    TPM chip to use.
+ * @ordinal: TPM command ordinal.
+ *
+ * The function returns the maximum amount of time the chip could take
+ * to return the result for a particular ordinal in jiffies.
+ *
+ * Return: A maximal duration time for an ordinal in jiffies.
+ */
+unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
+{
+       if (chip->flags & TPM_CHIP_FLAG_TPM2)
+               return tpm2_calc_ordinal_duration(chip, ordinal);
+       else
+               return tpm1_calc_ordinal_duration(chip, ordinal);
+}
+EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
+
 static int tpm_validate_command(struct tpm_chip *chip,
                                 struct tpm_space *space,
                                 const u8 *cmd,
@@ -220,10 +239,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip,
        if (chip->flags & TPM_CHIP_FLAG_IRQ)
                goto out_recv;
 
-       if (chip->flags & TPM_CHIP_FLAG_TPM2)
-               stop = jiffies + tpm2_calc_ordinal_duration(chip, ordinal);
-       else
-               stop = jiffies + tpm1_calc_ordinal_duration(chip, ordinal);
+       stop = jiffies + tpm_calc_ordinal_duration(chip, ordinal);
        do {
                u8 status = chip->ops->status(chip);
                if ((status & chip->ops->req_complete_mask) ==

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index c59d2c20c339bdfccfa9df52fe56a5d51d8ba16d..73511cd89befdf064779486bb39467175b20763a 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -547,6 +547,7 @@ int tpm_get_timeouts(struct tpm_chip *);
 int tpm1_auto_startup(struct tpm_chip *chip);
 int tpm_do_selftest(struct tpm_chip *chip);
 unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);
+unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);
 int tpm_pm_suspend(struct device *dev);
 int tpm_pm_resume(struct device *dev);
 

diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c
index 991260134659c74cc3e927805ae941fa6885df60..dfbe9c60cbcf4e7531c317ad9b7616109ff9be48 100644 (file)
--- a/drivers/char/tpm/tpm1-cmd.c
+++ b/drivers/char/tpm/tpm1-cmd.c
@@ -307,4 +307,3 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
        else
                return duration;
 }
-EXPORT_SYMBOL_GPL(tpm1_calc_ordinal_duration);

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index d26b439976bc9d70803a6f0d6613f1e5c1221b7c..3eef5565286ddc99f6034dbf413648cbec6fb55d 100644 (file)
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -132,7 +132,6 @@ unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
        else
                return msecs_to_jiffies(TPM2_DURATION_DEFAULT);
 }
-EXPORT_SYMBOL_GPL(tpm2_calc_ordinal_duration);
 
 
 struct tpm2_pcr_read_out {

diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
index ad76482ee38796566d04b4a54c835c86a1ccd191..217f7f1cbde80ee58d76aaeeeac0a5ca9f7b3228 100644 (file)
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -456,10 +456,7 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len)
                return rc;
        }
        ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
-       if (chip->flags & TPM_CHIP_FLAG_TPM2)
-               duration = tpm2_calc_ordinal_duration(chip, ordinal);
-       else
-               duration = tpm1_calc_ordinal_duration(chip, ordinal);
+       duration = tpm_calc_ordinal_duration(chip, ordinal);
 
        rc = i2c_nuvoton_wait_for_data_avail(chip, duration, &priv->read_queue);
        if (rc) {

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 14c332104de4d5f3fe7e321bf4cc8fed0f7c19b9..f9e73d0f938675385db5fcc3ed615171b7b2c2c2 100644 (file)
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -473,11 +473,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len)
        if (chip->flags & TPM_CHIP_FLAG_IRQ) {
                ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
 
-               if (chip->flags & TPM_CHIP_FLAG_TPM2)
-                       dur = tpm2_calc_ordinal_duration(chip, ordinal);
-               else
-                       dur = tpm1_calc_ordinal_duration(chip, ordinal);
-
+               dur = tpm_calc_ordinal_duration(chip, ordinal);
                if (wait_for_tpm_stat
                    (chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, dur,
                     &priv->read_queue, false) < 0) {

diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 77097229bf49ce0f22830db6f07850be80d542d2..b150f87f38f513f48c5aca4ffa521cd78b7607e4 100644 (file)
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -164,7 +164,7 @@ static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count)
        notify_remote_via_evtchn(priv->evtchn);
 
        ordinal = be32_to_cpu(((struct tpm_input_header*)buf)->ordinal);
-       duration = tpm1_calc_ordinal_duration(chip, ordinal);
+       duration = tpm_calc_ordinal_duration(chip, ordinal);
 
        if (wait_for_tpm_stat(chip, VTPM_STATUS_IDLE, duration,
                        &priv->read_queue, true) < 0) {