tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register

In disable_interrupts() the TPM_GLOBAL_INT_ENABLE bit is unset in the
TPM_INT_ENABLE register to shut the interrupts off. However modifying the
register is only possible with a held locality. So claim the locality
before disable_interrupts() is called.

Signed-off-by: Lino Sanfilippo <l.sanfilippo@kunbus.com>
Tested-by: Michael Niewöhner <linux@mniewoehner.de>
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_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 57fd315a1d50834182512ff4a590ed949dd7ec9b..3371304df3344c4e7b287153806a774b8459d844 100644 (file)
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -1102,7 +1102,11 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
                                dev_err(&chip->dev, FW_BUG
                                        "TPM interrupt not working, polling instead\n");
 
+                               rc = request_locality(chip, 0);
+                               if (rc < 0)
+                                       goto out_err;
                                disable_interrupts(chip);
+                               release_locality(chip, 0);
                        }
                } else {
                        tpm_tis_probe_irq(chip, intmask);