Re: [PATCH v5 10/10] tpm, tpm_tis: Enable interrupt test

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jun 16, 2022 at 03:04:30PM +0200, Michael Niewöhner wrote:
> On Wed, 2022-06-15 at 21:26 +0300, Jarkko Sakkinen wrote:
> > On Fri, Jun 10, 2022 at 01:08:46PM +0200, LinoSanfilippo@xxxxxx wrote:
> > > From: Lino Sanfilippo <l.sanfilippo@xxxxxxxxxx>
> > > 
> > > 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.
> > > 
> > > Signed-off-by: Lino Sanfilippo <l.sanfilippo@xxxxxxxxxx>
> > > ---
> > >  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 e5edf745fb23..be229c173f10 100644
> > > --- a/drivers/char/tpm/tpm_tis_core.c
> > > +++ b/drivers/char/tpm/tpm_tis_core.c
> > > @@ -774,11 +774,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;
> > > +
> > >         release_locality(chip, 0);
> > >  
> > >         return ret;
> > > -- 
> > > 2.36.1
> > > 
> > 
> > James, do you have a chance to test this on your side? Thanks.
> > 
> > BR, Jarkko
> 
> Tested-by: Michael Niewöhner <linux@xxxxxxxxxxxxxx>

Thank you.

BR, Jarkko



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux Kernel]     [Linux Kernel Hardening]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux