| Message ID | 20210510122831.409608-1-jarkko@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] tpm, tpm_tis: Extend locality handling to TPM2 in tpm_tis_gen_interrupt() | expand |
Hi, On 10.05.21 at 14:28, Jarkko Sakkinen wrote: > The earlier fix (linked) only partially fixed the locality handling bug > in tpm_tis_gen_interrupt(), i.e. only for TPM 1.x. > > Extend the locality handling to cover TPM2. > > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: stable@vger.kernel.org > Link: https://lore.kernel.org/linux-integrity/20210220125534.20707-1-jarkko@kernel.org/ > Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()") > Reported-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > --- > > v1: > * Testing done with Intel NUC5i5MYHE with SLB9665 TPM2 chip. > > drivers/char/tpm/tpm_tis_core.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > index a2e0395cbe61..6fa150a3b75e 100644 > --- a/drivers/char/tpm/tpm_tis_core.c > +++ b/drivers/char/tpm/tpm_tis_core.c > @@ -709,16 +709,14 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) > cap_t cap; > int ret; > > - /* TPM 2.0 */ > - if (chip->flags & TPM_CHIP_FLAG_TPM2) > - return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc); > - > - /* TPM 1.2 */ > ret = request_locality(chip, 0); > if (ret < 0) > return ret; > > - ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0); > + 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); > > release_locality(chip, 0); > > This fix works for me. Tested on a SLB9670vq2.0 and the warning message is gone. Tested-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Regards, Lino
On Tue, May 11, 2021 at 01:09:35AM +0200, Lino Sanfilippo wrote: > Hi, > > On 10.05.21 at 14:28, Jarkko Sakkinen wrote: > > The earlier fix (linked) only partially fixed the locality handling bug > > in tpm_tis_gen_interrupt(), i.e. only for TPM 1.x. > > > > Extend the locality handling to cover TPM2. > > > > Cc: Hans de Goede <hdegoede@redhat.com> > > Cc: stable@vger.kernel.org > > Link: https://lore.kernel.org/linux-integrity/20210220125534.20707-1-jarkko@kernel.org/ > > Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()") > > Reported-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> > > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > > --- > > > > v1: > > * Testing done with Intel NUC5i5MYHE with SLB9665 TPM2 chip. > > > > drivers/char/tpm/tpm_tis_core.c | 10 ++++------ > > 1 file changed, 4 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > > index a2e0395cbe61..6fa150a3b75e 100644 > > --- a/drivers/char/tpm/tpm_tis_core.c > > +++ b/drivers/char/tpm/tpm_tis_core.c > > @@ -709,16 +709,14 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) > > cap_t cap; > > int ret; > > > > - /* TPM 2.0 */ > > - if (chip->flags & TPM_CHIP_FLAG_TPM2) > > - return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc); > > - > > - /* TPM 1.2 */ > > ret = request_locality(chip, 0); > > if (ret < 0) > > return ret; > > > > - ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0); > > + 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); > > > > release_locality(chip, 0); > > > > > > This fix works for me. Tested on a SLB9670vq2.0 and the warning message is gone. > > Tested-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> > > Regards, > Lino Thanks a lot, I'll add your tag. /Jarkko
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index a2e0395cbe61..6fa150a3b75e 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -709,16 +709,14 @@ static int tpm_tis_gen_interrupt(struct tpm_chip *chip) cap_t cap; int ret; - /* TPM 2.0 */ - if (chip->flags & TPM_CHIP_FLAG_TPM2) - return tpm2_get_tpm_pt(chip, 0x100, &cap2, desc); - - /* TPM 1.2 */ ret = request_locality(chip, 0); if (ret < 0) return ret; - ret = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, desc, 0); + 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); release_locality(chip, 0);
The earlier fix (linked) only partially fixed the locality handling bug in tpm_tis_gen_interrupt(), i.e. only for TPM 1.x. Extend the locality handling to cover TPM2. Cc: Hans de Goede <hdegoede@redhat.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/linux-integrity/20210220125534.20707-1-jarkko@kernel.org/ Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()") Reported-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> --- v1: * Testing done with Intel NUC5i5MYHE with SLB9665 TPM2 chip. drivers/char/tpm/tpm_tis_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)