tpm: factor out tpm_startup function

TPM manual startup is used only from within TPM 1.x or TPM 2.x
code, hence remove tpm_startup() function from tpm-interface.c
and add two static functions implementations tpm1_startup()
and tpm2_startup() into to tpm1-cmd.c and tpm2-cmd.c respectively.

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-interface.c b/drivers/char/tpm/tpm-interface.c
index 25242190a941e60562192c98f6e7a216b9c00435..d33060511a276689491ea4adfd3570097495fa14 100644 (file)
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -413,47 +413,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
 }
 EXPORT_SYMBOL_GPL(tpm_transmit_cmd);
 
-#define TPM_ORD_STARTUP 153
-#define TPM_ST_CLEAR 1
-
-/**
- * tpm_startup - turn on the TPM
- * @chip: TPM chip to use
- *
- * Normally the firmware should start the TPM. This function is provided as a
- * workaround if this does not happen. A legal case for this could be for
- * example when a TPM emulator is used.
- *
- * Return: same as tpm_transmit_cmd()
- */
-int tpm_startup(struct tpm_chip *chip)
-{
-       struct tpm_buf buf;
-       int rc;
-
-       dev_info(&chip->dev, "starting up the TPM manually\n");
-
-       if (chip->flags & TPM_CHIP_FLAG_TPM2) {
-               rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP);
-               if (rc < 0)
-                       return rc;
-
-               tpm_buf_append_u16(&buf, TPM2_SU_CLEAR);
-       } else {
-               rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP);
-               if (rc < 0)
-                       return rc;
-
-               tpm_buf_append_u16(&buf, TPM_ST_CLEAR);
-       }
-
-       rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0,
-                             "attempting to start the TPM");
-
-       tpm_buf_destroy(&buf);
-       return rc;
-}
-
 int tpm_get_timeouts(struct tpm_chip *chip)
 {
        if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 754f7bcb15fae38907973df45ce5e0c93b5676e5..2eb73f6966c3f8ade2dd908ad1830e3247669699 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -540,7 +540,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
                         void *buf, size_t bufsiz,
                         size_t min_rsp_body_length, unsigned int flags,
                         const char *desc);
-int tpm_startup(struct tpm_chip *chip);
 int tpm_get_timeouts(struct tpm_chip *);
 
 int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr);

diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c
index 3bd9f1fa77ce9449a1c5a8739012e66772f6ee0b..8a84db315676638da9def434e567cfe23edc29bb 100644 (file)
--- a/drivers/char/tpm/tpm1-cmd.c
+++ b/drivers/char/tpm/tpm1-cmd.c
@@ -308,6 +308,40 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
                return duration;
 }
 
+#define TPM_ORD_STARTUP 153
+#define TPM_ST_CLEAR 1
+
+/**
+ * tpm_startup() - turn on the TPM
+ * @chip: TPM chip to use
+ *
+ * Normally the firmware should start the TPM. This function is provided as a
+ * workaround if this does not happen. A legal case for this could be for
+ * example when a TPM emulator is used.
+ *
+ * Return: same as tpm_transmit_cmd()
+ */
+static int tpm1_startup(struct tpm_chip *chip)
+{
+       struct tpm_buf buf;
+       int rc;
+
+       dev_info(&chip->dev, "starting up the TPM manually\n");
+
+       rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP);
+       if (rc < 0)
+               return rc;
+
+       tpm_buf_append_u16(&buf, TPM_ST_CLEAR);
+
+       rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0,
+                             "attempting to start the TPM");
+
+       tpm_buf_destroy(&buf);
+
+       return rc;
+}
+
 int tpm1_get_timeouts(struct tpm_chip *chip)
 {
        cap_t cap;
@@ -317,7 +351,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip)
        rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL,
                         sizeof(cap.timeout));
        if (rc == TPM_ERR_INVALID_POSTINIT) {
-               if (tpm_startup(chip))
+               if (tpm1_startup(chip))
                        return rc;
 
                rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap,
@@ -727,3 +761,4 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr)
 
        return rc;
 }
+

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index dd2e98f4de08751b3efdb020f52853bd8c6c1451..6ca4fc0a0d6f78aa52ee241666dad1e7d6759c6f 100644 (file)
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -948,6 +948,36 @@ out:
        return rc;
 }
 
+/**
+ * tpm2_startup - turn on the TPM
+ * @chip: TPM chip to use
+ *
+ * Normally the firmware should start the TPM. This function is provided as a
+ * workaround if this does not happen. A legal case for this could be for
+ * example when a TPM emulator is used.
+ *
+ * Return: same as tpm_transmit_cmd()
+ */
+
+static int tpm2_startup(struct tpm_chip *chip)
+{
+       struct tpm_buf buf;
+       int rc;
+
+       dev_info(&chip->dev, "starting up the TPM manually\n");
+
+       rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP);
+       if (rc < 0)
+               return rc;
+
+       tpm_buf_append_u16(&buf, TPM2_SU_CLEAR);
+       rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0,
+                             "attempting to start the TPM");
+       tpm_buf_destroy(&buf);
+
+       return rc;
+}
+
 /**
  * tpm2_auto_startup - Perform the standard automatic TPM initialization
  *                     sequence
@@ -959,7 +989,7 @@ int tpm2_auto_startup(struct tpm_chip *chip)
 {
        int rc;
 
-       rc = tpm_get_timeouts(chip);
+       rc = tpm2_get_timeouts(chip);
        if (rc)
                goto out;
 
@@ -968,7 +998,7 @@ int tpm2_auto_startup(struct tpm_chip *chip)
                goto out;
 
        if (rc == TPM2_RC_INITIALIZE) {
-               rc = tpm_startup(chip);
+               rc = tpm2_startup(chip);
                if (rc)
                        goto out;