Skip to content

Commit

Permalink
tpm, tpm_tis: Claim locality before writing TPM_INT_ENABLE register
Browse files Browse the repository at this point in the history
[ Upstream commit 282657a ]

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: 955df4f ("tpm, tpm_tis: Claim locality when interrupts are reenabled on resume")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
linosanfilippo-kunbus authored and gregkh committed May 11, 2023
1 parent d7bace6 commit 3fa405c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/char/tpm/tpm_tis_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,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);
Expand Down

0 comments on commit 3fa405c

Please sign in to comment.