[PATCH 2/2] tpm: Implement tpm_auto_start() for TPMv1.2

[Simon Glass]

Hi Ilias,

On Tue, 21 Feb 2023 at 06:03, Ilias Apalodimas
<ilias.apalodimas at linaro.org> wrote:
>
> Hi Simon,
>
> On Mon, Feb 20, 2023 at 02:27:36PM -0700, Simon Glass wrote:
> > Add an implementation of this, moving the common call to tpm_init() up
> > into the common API implementation.
> >
> > Add a test.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> >  include/tpm-common.h |  2 +-
> >  include/tpm-v1.h     | 11 +++++++++++
> >  lib/tpm-v1.c         | 16 ++++++++++++++++
> >  lib/tpm-v2.c         |  8 --------
> >  lib/tpm_api.c        | 19 ++++++++++++++++---
> >  test/dm/tpm.c        | 45 ++++++++++++++++++++++++++++++++++++++++++++
> >  6 files changed, 89 insertions(+), 12 deletions(-)
> >
> > diff --git a/include/tpm-common.h b/include/tpm-common.h
> > index b2c5404430f..1ba81386ce1 100644
> > --- a/include/tpm-common.h
> > +++ b/include/tpm-common.h
> > @@ -94,7 +94,7 @@ struct tpm_ops {
> >        * close().
> >        *
> >        * @dev:        Device to open
> > -      * @return 0 ok OK, -ve on error
> > +      * @return 0 ok OK, -EBUSY if already opened, other -ve on other error
> >        */
> >       int (*open)(struct udevice *dev);
> >
> > diff --git a/include/tpm-v1.h b/include/tpm-v1.h
> > index 33d53fb695e..60b71e2a4b6 100644
> > --- a/include/tpm-v1.h
> > +++ b/include/tpm-v1.h
> > @@ -591,4 +591,15 @@ u32 tpm_set_global_lock(struct udevice *dev);
> >   */
> >  u32 tpm1_resume(struct udevice *dev);
> >
> > +/**
> > + * tpm1_auto_start() - start up the TPM
> > + *
> > + * This does not do a self test.
> > + *
> > + * @dev              TPM device
> > + * Return: TPM2_RC_SUCCESS, on success, or when the TPM returns
> > + * TPM_INVALID_POSTINIT; TPM_FAILEDSELFTEST, if the TPM is in failure state
> > + */
> > +u32 tpm1_auto_start(struct udevice *dev);
> > +
> >  #endif /* __TPM_V1_H */
> > diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
> > index d0e3ab1b21d..ea3833549bc 100644
> > --- a/lib/tpm-v1.c
> > +++ b/lib/tpm-v1.c
> > @@ -69,6 +69,22 @@ u32 tpm1_continue_self_test(struct udevice *dev)
> >       return tpm_sendrecv_command(dev, command, NULL, NULL);
> >  }
> >
> > +u32 tpm1_auto_start(struct udevice *dev)
> > +{
> > +     u32 rc;
> > +
> > +     rc = tpm1_startup(dev, TPM_ST_CLEAR);
> > +     /* continue on if the TPM is already inited */
> > +     if (rc && rc != TPM_INVALID_POSTINIT)
> > +             return rc;
> > +
> > +     rc = tpm1_self_test_full(dev);
> > +     if (rc)
> > +             return rc;
>
> Mind if I remove this if before merging?

Yes that's fine.

>
> > +
> > +     return rc;
> > +}
> > +
> >  {
>
> [...]
>
> > +
> > +     return 0;
> > +}
> > +DM_TEST(dm_test_tpm_autostart_reinit, UT_TESTF_SCAN_FDT);
> > --
> > 2.39.2.637.g21b0678d19-goog
> >
>
> Other than that
> Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
>

Regards,
Simon