aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLino Sanfilippo <[email protected]>2022-11-24 14:55:38 +0100
committerJarkko Sakkinen <[email protected]>2023-04-24 16:15:53 +0300
commite644b2f498d297a928efcb7ff6f900c27f8b788e (patch)
treeec857a64c508fb5c89a957130f964c5b68eb35d9
parent548eb516ec0f7a484a23a902835899341164b8ea (diff)
tpm, tpm_tis: Enable interrupt test
The test for interrupts in tpm_tis_send() is skipped if the flag TPM_CHIP_FLAG_IRQ is not set. Since the current code never sets the flag initially the test is never executed. Fix this by setting the flag in tpm_tis_gen_interrupt() right after interrupts have been enabled and before the test is executed. Signed-off-by: Lino Sanfilippo <[email protected]> Tested-by: Michael Niewöhner <[email protected]> Tested-by: Jarkko Sakkinen <[email protected]> Reviewed-by: Jarkko Sakkinen <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]>
-rw-r--r--drivers/char/tpm/tpm_tis_core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 5b01a3df65a6..c2421162cf34 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -793,10 +793,15 @@ static void tpm_tis_gen_interrupt(struct tpm_chip *chip)
cap_t cap;
int ret;
+ chip->flags |= TPM_CHIP_FLAG_IRQ;
+
if (chip->flags & TPM_CHIP_FLAG_TPM2)
ret = tpm2_get_tpm_pt(chip, 0x100, &cap2, desc);
else
ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0);
+
+ if (ret)
+ chip->flags &= ~TPM_CHIP_FLAG_IRQ;
}
/* Register the IRQ and issue a command that will cause an interrupt. If an