Re: [PATCH 3/3] tpm: ibmvtpm: Add support for TPM 2

[Stefan Berger]

On 2/13/20 12:53 PM, Nayna wrote:
> On 2/4/20 8:27 AM, Stefan Berger wrote:
> > From: Stefan Berger <stefanb@xxxxxxxxxxxxx>
> >
> > Support TPM 2 in the IBM vTPM driver. The hypervisor tells us what
> > version of TPM is connected through the vio_device_id.
> >
> > In case a TPM 2 is found, we set the TPM_OPS_AUTO_STARTUP flag to
> > have properly initialize the TPM and driver.
> >
> > Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
> > ---
> > Â drivers/char/tpm/tpm_ibmvtpm.c | 8 +++++++-
> > Â 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c 
> > b/drivers/char/tpm/tpm_ibmvtpm.c
> > index eee566eddb35..d479d64a65aa 100644
> > --- a/drivers/char/tpm/tpm_ibmvtpm.c
> > +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> > @@ -29,6 +29,7 @@ static const char tpm_ibmvtpm_driver_name[] = 
> > "tpm_ibmvtpm";
> >
> > Â static const struct vio_device_id tpm_ibmvtpm_device_table[] = {
> > ÂÂÂÂÂ { "IBM,vtpm", "IBM,vtpm"},
> > +ÂÂÂ { "IBM,vtpm", "IBM,vtpm20"},
> > ÂÂÂÂÂ { "", "" }
> > Â };
> > Â MODULE_DEVICE_TABLE(vio, tpm_ibmvtpm_device_table);
> > @@ -443,7 +444,7 @@ static bool tpm_ibmvtpm_req_canceled(struct 
> > tpm_chip *chip, u8 status)
> > ÂÂÂÂÂ return (status == 0);
> > Â }
> >
> > -static const struct tpm_class_ops tpm_ibmvtpm = {
> > +static struct tpm_class_ops tpm_ibmvtpm = {
> > ÂÂÂÂÂ .recv = tpm_ibmvtpm_recv,
> > ÂÂÂÂÂ .send = tpm_ibmvtpm_send,
> > ÂÂÂÂÂ .cancel = tpm_ibmvtpm_cancel,
> > @@ -672,6 +673,11 @@ static int tpm_ibmvtpm_probe(struct vio_dev 
> > *vio_dev,
> > ÂÂÂÂÂ if (rc)
> > ÂÂÂÂÂÂÂÂÂ goto init_irq_cleanup;
> >
> > +ÂÂÂ if (!strcmp(id->compat, "IBM,vtpm20")) {
> > +ÂÂÂÂÂÂÂ chip->flags |= TPM_CHIP_FLAG_TPM2;
> > +ÂÂÂÂÂÂÂ tpm_ibmvtpm.flags = TPM_OPS_AUTO_STARTUP;
>
> TPM_OPS_AUTO_STARTUP flag isn't set for vTPM 1.2. What is different in 
> case of vTPM 2.0 ?


I don't want side effects for the TPM 1.2 case here, so I am only 
modifying the flag for the case where the new TPM 2 is being used. 
Here's the code where it shows the effect.

int tpm_auto_startup(struct tpm_chip *chip)
{
ÂÂÂ int rc;

ÂÂÂ if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP))
ÂÂÂ ÂÂÂ return 0;

ÂÂÂ if (chip->flags & TPM_CHIP_FLAG_TPM2)
ÂÂÂ ÂÂÂ rc = tpm2_auto_startup(chip);
ÂÂÂ else
ÂÂÂ ÂÂÂ rc = tpm1_auto_startup(chip);

ÂÂÂ return rc;
}

In the TPM 2 case we then get timeouts, do the TPM self test, send 
TPM2_STARTUP if necessary and get attributes of the TPM 2 command from 
the device. All necessary to start it up.


https://elixir.bootlin.com/linux/latest/source/drivers/char/tpm/tpm2-cmd.c#L719

Does this answer your question ?


ÂÂ Stefan




> Thanks & Regards,
>
> ÂÂÂÂ - Nayna