Skip to contentSkip to conversation

tpm: add request_locality before write TPM_INT_ENABLE

PATCH In review Chen Jun 2 participants 3 messages Oct 13, 2021 – Oct 26, 2021

Subsystems (2)
Keys-trusted TPM device driver
lore
Share & tools
lore

Chen Jun

author
#0 lore raw

PATCH v2 1/1 tpm: add request_locality before write TPM_INT_ENABLE

Locality is not appropriately requested before writing the int mask. Add the missing boilerplate.

Fixes e6aef069b6e9 ("tpm_tis: convert to using locality callbacks")
Signed-off-by Chen Jun <[email protected]>

---

v2: rewrite the commit message.

 drivers/char/tpm/tpm_tis_core.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/char/tpm/tpm_tis_core.c +8 -0
index 69579efb247b..bea587301917 100644
@@ -978,7 +978,15 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 	intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT |
 		   TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT;
 	intmask &= ~TPM_GLOBAL_INT_ENABLE;
+
+	rc = request_locality(chip, 0);
+	if (rc < 0) {
+		rc = -ENODEV;
+		goto out_err;
+	}
+
 	tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask);
+	release_locality(chip, 0);
 
 	rc = tpm_chip_start(chip);
 	if (rc)
Signature · 1 line
2.17.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 27 lines · Chen Jun

Locality is not appropriately requested before writing the int mask. Add the missing boilerplate.

Fixes e6aef069b6e9 ("tpm_tis: convert to using locality callbacks")
Signed-off-by Chen Jun <[email protected]>

---

 v2: rewrite the commit message.

 drivers/char/tpm/tpm_tis_core.c | 8 ++++++++

 1 file changed, 8 insertions(+)
drivers/char/tpm/tpm_tis_core.c +0 -0
index 69579efb247b..bea587301917 100644
@@ -978,7 +978,15 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,

        intmask |= TPM_INTF_CMD_READY_INT | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT | TPM_INTF_STS_VALID_INT; intmask &= ~TPM_GLOBAL_INT_ENABLE;

drivers/char/tpm/tpm_tis_core.c +7 -0
+
+       rc = request_locality(chip, 0);
+       if (rc < 0) {
+               rc = -ENODEV;
+               goto out_err;
+       }
+
Quoted 5 lines

        tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask); +       release_locality(chip, 0);

        rc = tpm_chip_start(chip);
        if (rc)

Thank you.

Reviewed-by Jarkko Sakkinen <[email protected]>

/Jarkko