Call disable_interrupts() if we have to revert to polling in order not to
unnecessarily reserve the IRQ for the life-cycle of the driver.
Cc: [email protected] # 4.5.x
Reported-by: Hans de Goede <[email protected]>
Fixes: e3837e74a06d ("tpm_tis: Refactor the interrupt setup")
Signed-off-by: Jarkko Sakkinen <[email protected]>
---
drivers/char/tpm/tpm_tis_core.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 27c6ca031e23..2435216bd10a 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -433,6 +433,9 @@ static void disable_interrupts(struct tpm_chip *chip)
u32 intmask;
int rc;
+ if (priv->irq == 0)
+ return;
+
rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
if (rc < 0)
intmask = 0;
@@ -1062,9 +1065,12 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
if (irq) {
tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
irq);
- if (!(chip->flags & TPM_CHIP_FLAG_IRQ))
+ if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
dev_err(&chip->dev, FW_BUG
"TPM interrupt not working, polling instead\n");
+
+ disable_interrupts(chip);
+ }
} else {
tpm_tis_probe_irq(chip, intmask);
}
--
2.25.1
Hi,
On 4/16/20 6:07 PM, Jarkko Sakkinen wrote:
> Call disable_interrupts() if we have to revert to polling in order not to
> unnecessarily reserve the IRQ for the life-cycle of the driver.
>
> Cc: [email protected] # 4.5.x
> Reported-by: Hans de Goede <[email protected]>
> Fixes: e3837e74a06d ("tpm_tis: Refactor the interrupt setup")
> Signed-off-by: Jarkko Sakkinen <[email protected]>
I can confirm that this fixes the "irq 31 nobody cared" oops for me:
Tested-by: Hans de Goede <[email protected]>
Regards,
Hans
> ---
> drivers/char/tpm/tpm_tis_core.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 27c6ca031e23..2435216bd10a 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -433,6 +433,9 @@ static void disable_interrupts(struct tpm_chip *chip)
> u32 intmask;
> int rc;
>
> + if (priv->irq == 0)
> + return;
> +
> rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);
> if (rc < 0)
> intmask = 0;
> @@ -1062,9 +1065,12 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
> if (irq) {
> tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
> irq);
> - if (!(chip->flags & TPM_CHIP_FLAG_IRQ))
> + if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
> dev_err(&chip->dev, FW_BUG
> "TPM interrupt not working, polling instead\n");
> +
> + disable_interrupts(chip);
> + }
> } else {
> tpm_tis_probe_irq(chip, intmask);
> }
>
On Tue, Apr 21, 2020 at 03:23:19PM +0200, Hans de Goede wrote:
> Hi,
>
> On 4/16/20 6:07 PM, Jarkko Sakkinen wrote:
> > Call disable_interrupts() if we have to revert to polling in order not to
> > unnecessarily reserve the IRQ for the life-cycle of the driver.
> >
> > Cc: [email protected] # 4.5.x
> > Reported-by: Hans de Goede <[email protected]>
> > Fixes: e3837e74a06d ("tpm_tis: Refactor the interrupt setup")
> > Signed-off-by: Jarkko Sakkinen <[email protected]>
>
> I can confirm that this fixes the "irq 31 nobody cared" oops for me:
>
> Tested-by: Hans de Goede <[email protected]>
Hi, thanks a lot! Unfortunately I already put this out given the
criticality of the issue:
https://lkml.org/lkml/2020/4/20/1544
Sincere apologies that I couldn't include your tested-by but the most
important thing is to know that it works now.
/Jarkko
Hi,
On 4/21/20 9:54 PM, Jarkko Sakkinen wrote:
> On Tue, Apr 21, 2020 at 03:23:19PM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 4/16/20 6:07 PM, Jarkko Sakkinen wrote:
>>> Call disable_interrupts() if we have to revert to polling in order not to
>>> unnecessarily reserve the IRQ for the life-cycle of the driver.
>>>
>>> Cc: [email protected] # 4.5.x
>>> Reported-by: Hans de Goede <[email protected]>
>>> Fixes: e3837e74a06d ("tpm_tis: Refactor the interrupt setup")
>>> Signed-off-by: Jarkko Sakkinen <[email protected]>
>>
>> I can confirm that this fixes the "irq 31 nobody cared" oops for me:
>>
>> Tested-by: Hans de Goede <[email protected]>
>
> Hi, thanks a lot! Unfortunately I already put this out given the
> criticality of the issue:
>
> https://lkml.org/lkml/2020/4/20/1544
>
> Sincere apologies that I couldn't include your tested-by
No problem.
> but the most
> important thing is to know that it works now.
Agreed.
Regards,
Hans