Re: [PATCH v5 03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c

[Nayna Jain]

On 09/29/2018 04:00 AM, Tomas Winkler wrote:
+unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
+{
+       int duration_idx = TPM_UNDEFINED;
+       int duration = 0;
+
+       /*
+        * We only have a duration table for protected commands, where the upper
+        * 16 bits are 0. For the few other ordinals the fallback will be used.
+        */
+       if (ordinal < TPM_MAX_ORDINAL)
+               duration_idx = tpm1_ordinal_duration[ordinal];
+
+       if (duration_idx != TPM_UNDEFINED)
+               duration = chip->duration[duration_idx];
+       if (duration <= 0)
+               return 2 * 60 * HZ;
+       else
+               return duration;
+}
+EXPORT_SYMBOL_GPL(tpm1_calc_ordinal_duration);
diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c 
b/drivers/char/tpm/tpm_i2c_nuvoton.c
index caa86b19c76d..5d20e98b844f 100644
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -370,6 +370,7 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, 
size_t len)
        struct i2c_client *client = to_i2c_client(dev);
        u32 ordinal;
        size_t count = 0;
+       unsigned long duration;
        int burst_count, bytes2write, retries, rc = -EIO;

        for (retries = 0; retries < TPM_RETRY; retries++) {
@@ -455,12 +456,11 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 
*buf, size_t len)
                return rc;
        }
        ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
-       rc = i2c_nuvoton_wait_for_data_avail(chip,
-                                            tpm_calc_ordinal_duration(chip,
-                                                                      ordinal),
-                                            &priv->read_queue);
+       duration = tpm1_calc_ordinal_duration(chip, ordinal);

The original code in the nuvoton driver does not differentiate between 
TPM 1.2 and TPM 2.0 as it does in tpm_tis_core.c.  Before making any 
changes, I would first fix it, so that it could easily be backported. 
Only then do the refactoring

Thanks & Regards,
   - Nayna


+       rc = i2c_nuvoton_wait_for_data_avail(chip, duration, &priv->read_queue);
        if (rc) {
-               dev_err(dev, "%s() timeout command duration\n", __func__);
+               dev_err(dev, "%s() timeout command duration %ld\n",
+                       __func__, duration);
                i2c_nuvoton_ready(chip);
                return rc;
        }
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index d2345d9fd7b5..14c332104de4 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -476,7 +476,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const 
u8 *buf, size_t len)
                if (chip->flags & TPM_CHIP_FLAG_TPM2)
                        dur = tpm2_calc_ordinal_duration(chip, ordinal);
                else
-                       dur = tpm_calc_ordinal_duration(chip, ordinal);
+                       dur = tpm1_calc_ordinal_duration(chip, ordinal);

                if (wait_for_tpm_stat
                    (chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, dur,
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index b150f87f38f5..77097229bf49 100644
--- 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 = tpm_calc_ordinal_duration(chip, ordinal);
+       duration = tpm1_calc_ordinal_duration(chip, ordinal);

        if (wait_for_tpm_stat(chip, VTPM_STATUS_IDLE, duration,
                        &priv->read_queue, true) < 0) {