diff mbox series

[4/4] Revert "tpm: Revert "tpm_tis_core: Turn on the TPM before probing IRQ's""

Message ID 20200929223216.22584-5-James.Bottomley@HansenPartnership.com (mailing list archive)
State New, archived
Headers show
Series tpm_tis: fix interrupts (again) | expand

Commit Message

James Bottomley Sept. 29, 2020, 10:32 p.m. UTC
Revert the patch aa4a63dd9816 which stops interrupt probing from
working, now that it should be safe to allow interrupt probing on all
systems without incurring interrupt storms.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
 drivers/char/tpm/tpm_tis_core.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jarkko Sakkinen Sept. 30, 2020, 2:40 a.m. UTC | #1
On Tue, Sep 29, 2020 at 03:32:16PM -0700, James Bottomley wrote:
> Revert the patch aa4a63dd9816 which stops interrupt probing from
> working, now that it should be safe to allow interrupt probing on all
> systems without incurring interrupt storms.
> 
> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

I will give this the review tag once the 1-3 have it.

/Jarkko
diff mbox series

Patch

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index b8ab26077cb1..0a86cf392466 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -1116,6 +1116,7 @@  int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 			goto out_err;
 		}
 
+		tpm_chip_start(chip);
 		if (irq) {
 			tpm_tis_probe_irq_single(chip, IRQF_SHARED, irq);
 			if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
@@ -1127,6 +1128,7 @@  int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 		} else {
 			tpm_tis_probe_irq(chip);
 		}
+		tpm_chip_stop(chip);
 	}
 
 	rc = tpm_chip_register(chip);