tpm: add tpm_auto_startup() into tpm-interface.c

Add wrapper tpm_auto_startup() to tpm-interface.c
instead of open coded decision between TPM 1.x and TPM 2.x
in tpm-chip.c

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

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 46caadca916a0a0d3e23b35ca53d3c87142dc97e..32db84683c40160c48c0962ecc63703f62899fd4 100644 (file)
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -451,14 +451,9 @@ int tpm_chip_register(struct tpm_chip *chip)
 {
        int rc;
 
-       if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {
-               if (chip->flags & TPM_CHIP_FLAG_TPM2)
-                       rc = tpm2_auto_startup(chip);
-               else
-                       rc = tpm1_auto_startup(chip);
-               if (rc)
-                       return rc;
-       }
+       rc = tpm_auto_startup(chip);
+       if (rc)
+               return rc;
 
        tpm_sysfs_add_device(chip);
 

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index d33060511a276689491ea4adfd3570097495fa14..96f60b63a6cb1c622ebbe723509d9b1c5f1159c6 100644 (file)
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -544,6 +544,21 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)
 }
 EXPORT_SYMBOL_GPL(tpm_send);
 
+int tpm_auto_startup(struct tpm_chip *chip)
+{
+       int rc;
+
+       if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP))
+               return 0;
+
+       if (chip->flags & TPM_CHIP_FLAG_TPM2)
+               rc = tpm2_auto_startup(chip);
+       else
+               rc = tpm1_auto_startup(chip);
+
+       return rc;
+}
+
 /*
  * We are about to suspend. Save the TPM state
  * so that it can be restored.

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 2eb73f6966c3f8ade2dd908ad1830e3247669699..daca1d0190b1774fdfba74aa31ad1172e5a93f46 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -541,6 +541,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
                         size_t min_rsp_body_length, unsigned int flags,
                         const char *desc);
 int tpm_get_timeouts(struct tpm_chip *);
+int tpm_auto_startup(struct tpm_chip *chip);
 
 int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr);
 int tpm1_auto_startup(struct tpm_chip *chip);