On Wed, Feb 26, 2020 at 07:26:53PM -0500, Stefan Berger wrote:
> From: Stefan Berger <stefanb@xxxxxxxxxxxxx>
>
> The IBM vTPM device driver will not use TPM_OPS_AUTO_STARTUP since we
> assume the firmware has initialized the TPM 2 and TPM2_Startup() need
> not be sent. Therefore, tpm2_auto_startup() will not be called. To cover
> the tpm_chip's initialization of timeouts, command durations, and
> command attributes we implement tpm2_init_commands() function that will
> be called instead of tpm2_auto_startup().
>
> Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
> ---
> drivers/char/tpm/tpm-interface.c | 5 ++++-
> drivers/char/tpm/tpm.h | 1 +
> drivers/char/tpm/tpm2-cmd.c | 14 ++++++++++++++
> 3 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index a438b1206fcb..30d80b94db33 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -371,8 +371,11 @@ int tpm_auto_startup(struct tpm_chip *chip)
> {
> int rc;
>
> - if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP))
> + if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP)) {
> + if (chip->flags & TPM_CHIP_FLAG_TPM2)
> + return tpm2_init_commands(chip);
> return 0;
> + }
>
> if (chip->flags & TPM_CHIP_FLAG_TPM2)
> rc = tpm2_auto_startup(chip);
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 5620747da0cf..30da942d714a 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -222,6 +222,7 @@ ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id,
> u32 *value, const char *desc);
>
> ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip);
> +int tpm2_init_commands(struct tpm_chip *chip);
> int tpm2_auto_startup(struct tpm_chip *chip);
> void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type);
> unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);
> diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
> index 13696deceae8..2d0c5a3b65c0 100644
> --- a/drivers/char/tpm/tpm2-cmd.c
> +++ b/drivers/char/tpm/tpm2-cmd.c
> @@ -709,6 +709,20 @@ static int tpm2_startup(struct tpm_chip *chip)
> return rc;
> }
>
> +/**
> + * tpm2_init_commands - Get timeouts, durations and command code attributes
> + * in case tpm2_auto_startup is not used.
> + * @chip: TPM chip to use
> + *
> + * Return 0 on success, < 0 in case of fatal error.
> + */
> +int tpm2_init_commands(struct tpm_chip *chip)
> +{
> + tpm2_get_timeouts(chip);
> +
> + return tpm2_get_cc_attrs_tbl(chip);
Call * locally in vtpm instead of adding quirks to the TPM driver.
/Jarkko
