tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register

[ Upstream commit 282657a8bd ]

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>
Stable-dep-of: 955df4f877 ("tpm, tpm_tis: Claim locality when interrupts are reenabled on resume")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Lino Sanfilippo 2022-11-24 14:55:26 +01:00 коммит произвёл Greg Kroah-Hartman
Родитель 8c08c74de7
Коммит fd9b4b2bff
1 изменённых файлов: 4 добавлений и 0 удалений

Просмотреть файл

@ -1076,7 +1076,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);