Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <822cad1aa73867ea36c5428cb929a00aa0e82bc9.camel@mniewoehner.de>
Subject: Re: [PATCH v6 9/9] tpm, tpm_tis: Enable interrupt test
From:   Michael =?ISO-8859-1?Q?Niew=F6hner?= <linux@mniewoehner.de>
To:     Lino Sanfilippo <LinoSanfilippo@gmx.de>, peterhuewe@gmx.de,
        jarkko@kernel.org, jgg@ziepe.ca
Cc:     stefanb@linux.vnet.ibm.com, linux-integrity@vger.kernel.org,
        linux-kernel@vger.kernel.org, l.sanfilippo@kunbus.com,
        lukas@wunner.de, p.rosenberger@kunbus.com
In-Reply-To: <20220621132447.16281-10-LinoSanfilippo@gmx.de>
References: <20220621132447.16281-1-LinoSanfilippo@gmx.de>
         <20220621132447.16281-10-LinoSanfilippo@gmx.de>
Content-Type: text/plain; charset="UTF-8"
Date:   Wed, 22 Jun 2022 00:39:17 +0200
MIME-Version: 1.0
User-Agent: Evolution 3.42.2 
Content-Transfer-Encoding: 8BIT
Precedence: bulk

On Tue, 2022-06-21 at 15:24 +0200, Lino Sanfilippo wrote:
> From: Lino Sanfilippo <l.sanfilippo@kunbus.com>
> 
> 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 <l.sanfilippo@kunbus.com>
> ---
>  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 <linux@mniewoehner.de>