2022-06-21 13:38:39

by Lino Sanfilippo

Subject: [PATCH v6 9/9] tpm, tpm_tis: Enable interrupt test

From: Lino Sanfilippo <[email protected]>

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]>
---
drivers/char/tpm/tpm_tis_core.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 1f7663ac1fc4..650c202d2f50 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -775,11 +775,16 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip)
if (ret < 0)
return 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;
+
tpm_tis_release_locality(chip, 0);

return ret;
--
2.36.1

2022-06-21 23:31:31

by Michael Niewöhner

Subject: Re: [PATCH v6 9/9] tpm, tpm_tis: Enable interrupt test

On Tue, 2022-06-21 at 15:24 +0200, Lino Sanfilippo wrote:
> From: Lino Sanfilippo <[email protected]>
>
> 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]>
> ---
>  drivers/char/tpm/tpm_tis_core.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
> index 1f7663ac1fc4..650c202d2f50 100644
> --- a/drivers/char/tpm/tpm_tis_core.c
> +++ b/drivers/char/tpm/tpm_tis_core.c
> @@ -775,11 +775,16 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip)
>         if (ret < 0)
>                 return 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;
> +
>         tpm_tis_release_locality(chip, 0);
>  
>         return ret;

Tested-by: Michael Niewöhner <[email protected]>

2022-06-22 10:14:31

by Lino Sanfilippo

Subject: Re: [PATCH v6 9/9] tpm, tpm_tis: Enable interrupt test

On 22.06.22 at 00:39, Michael Niewöhner wrote:
> On Tue, 2022-06-21 at 15:24 +0200, Lino Sanfilippo wrote:

>
> Tested-by: Michael Niewöhner <[email protected]>
>

Thanks Michael!

Regards,
Lino