2022-06-10 11:19:14

by Lino Sanfilippo

Subject: [PATCH v5 03/10] tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed

From: Lino Sanfilippo <[email protected]>

Both functions tpm_tis_probe_irq_single() and tpm_tis_probe_irq() may setup
the interrupts and then return with an error. This case is indicated by a
missing TPM_CHIP_FLAG_IRQ flag in chips->flags.
Currently the interrupt setup is only undone if tpm_tis_probe_irq_single()
fails. Undo the setup also if tpm_tis_probe_irq() fails.

Signed-off-by: Lino Sanfilippo <[email protected]>
---
drivers/char/tpm/tpm_tis_core.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index ee6b48c55ac9..dee701609b80 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -1077,21 +1077,21 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
goto out_err;
}

- if (irq) {
+ if (irq)
tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
irq);
- if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
- dev_err(&chip->dev, FW_BUG
+ else
+ tpm_tis_probe_irq(chip, intmask);
+
+ if (!(chip->flags & TPM_CHIP_FLAG_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);
+ rc = request_locality(chip, 0);
+ if (rc < 0)
+ goto out_err;
+ disable_interrupts(chip);
+ release_locality(chip, 0);
}
}

--
2.36.1

2022-06-15 18:34:44

by Jarkko Sakkinen

Subject: Re: [PATCH v5 03/10] tpm, tpm_tis: Disable interrupts if tpm_tis_probe_irq() failed

On Fri, Jun 10, 2022 at 01:08:39PM +0200, [email protected] wrote:
> From: Lino Sanfilippo <[email protected]>
>
> Both functions tpm_tis_probe_irq_single() and tpm_tis_probe_irq() may setup
> the interrupts and then return with an error. This case is indicated by a
> missing TPM_CHIP_FLAG_IRQ flag in chips->flags.
> Currently the interrupt setup is only undone if tpm_tis_probe_irq_single()
> fails. Undo the setup also if tpm_tis_probe_irq() fails.
>
> Signed-off-by: Lino Sanfilippo <[email protected]>
> ---
> drivers/char/tpm/tpm_tis_core.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index ee6b48c55ac9..dee701609b80 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -1077,21 +1077,21 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
> goto out_err;
> }
>
> - if (irq) {
> + if (irq)
> tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
> irq);
> - if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {
> - dev_err(&chip->dev, FW_BUG
> + else
> + tpm_tis_probe_irq(chip, intmask);
> +
> + if (!(chip->flags & TPM_CHIP_FLAG_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);
> + rc = request_locality(chip, 0);
> + if (rc < 0)
> + goto out_err;
> + disable_interrupts(chip);
> + release_locality(chip, 0);
> }
> }
>
> --
> 2.36.1
>

Reviewed-by: Jarkko Sakkinen <[email protected]>

BR, Jarkko