tpm, tpm_tis: startup chip before testing for interrupts

In tpm_tis_gen_interrupt() a request for a property value is sent to the
TPM to test if interrupts are generated. However after a power cycle the
TPM responds with TPM_RC_INITIALIZE which indicates that the TPM is not
yet properly initialized.
Fix this by first starting the TPM up before the request is sent. For this
the startup implementation is removed from tpm_chip_register() and put
into the new function tpm_chip_startup() which is called before the
interrupts are tested.

Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Tested-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 0601e6e5e326312696c0313038394f23fba87737..33319a78767fbae6fcf00feb37a4ba03d45042af 100644 (file)
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -605,6 +605,30 @@ static int tpm_get_pcr_allocation(struct tpm_chip *chip)
        return rc;
 }
 
+/*
+ * tpm_chip_startup() - performs auto startup and allocates the PCRs
+ * @chip: TPM chip to use.
+ */
+int tpm_chip_startup(struct tpm_chip *chip)
+{
+       int rc;
+
+       rc = tpm_chip_start(chip);
+       if (rc)
+               return rc;
+
+       rc = tpm_auto_startup(chip);
+       if (rc)
+               goto stop;
+
+       rc = tpm_get_pcr_allocation(chip);
+stop:
+       tpm_chip_stop(chip);
+
+       return rc;
+}
+EXPORT_SYMBOL_GPL(tpm_chip_startup);
+
 /*
  * tpm_chip_register() - create a character device for the TPM chip
  * @chip: TPM chip to use.
@@ -620,20 +644,6 @@ int tpm_chip_register(struct tpm_chip *chip)
 {
        int rc;
 
-       rc = tpm_chip_start(chip);
-       if (rc)
-               return rc;
-       rc = tpm_auto_startup(chip);
-       if (rc) {
-               tpm_chip_stop(chip);
-               return rc;
-       }
-
-       rc = tpm_get_pcr_allocation(chip);
-       tpm_chip_stop(chip);
-       if (rc)
-               return rc;
-
        tpm_sysfs_add_device(chip);
 
        tpm_bios_log_setup(chip);

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 830014a266090868a6123ed2b3b8043e0ddcc548..88d3bd76e0760dbaabe4f038d06f5ea103835b9c 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -263,6 +263,7 @@ static inline void tpm_msleep(unsigned int delay_msec)
                     delay_msec * 1000);
 };
 
+int tpm_chip_startup(struct tpm_chip *chip);
 int tpm_chip_start(struct tpm_chip *chip);
 void tpm_chip_stop(struct tpm_chip *chip);
 struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip);

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index dfb622a1b6f7d91a5e4de050cf404d45f8175779..5b01a3df65a61fac12531bf2565ddff34a40a182 100644 (file)
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -1133,6 +1133,11 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
        /* INTERRUPT Setup */
        init_waitqueue_head(&priv->read_queue);
        init_waitqueue_head(&priv->int_queue);
+
+       rc = tpm_chip_startup(chip);
+       if (rc)
+               goto out_err;
+
        if (irq != -1) {
                /*
                 * Before doing irq testing issue a command to the TPM in polling mode