From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Stefan Berger <stefanb@linux.vnet.ibm.com>
Cc: linux-integrity@vger.kernel.org, aik@ozlabs.ru,
david@gibson.dropbear.id.au, linux-kernel@vger.kernel.org,
nayna@linux.vnet.ibm.com, gcwilson@linux.ibm.com, jgg@ziepe.ca,
Stefan Berger <stefanb@linux.ibm.com>
Subject: Re: [PATCH v3 3/4] tpm: Implement tpm2_init_commands to use in non-auto startup case
Date: Thu, 27 Feb 2020 18:02:50 +0200 [thread overview]
Message-ID: <20200227160250.GB5140@linux.intel.com> (raw)
In-Reply-To: <20200227002654.7536-4-stefanb@linux.vnet.ibm.com>
On Wed, Feb 26, 2020 at 07:26:53PM -0500, Stefan Berger wrote:
> From: Stefan Berger <stefanb@linux.ibm.com>
>
> 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@linux.ibm.com>
> ---
> 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
next prev parent reply other threads:[~2020-02-27 16:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 0:26 [PATCH v3 0/4] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger
2020-02-27 0:26 ` [PATCH v3 1/4] tpm: of: Handle IBM,vtpm20 case when getting log parameters Stefan Berger
2020-02-27 0:26 ` [PATCH v3 2/4] tpm: ibmvtpm: Wait for buffer to be set before proceeding Stefan Berger
2020-02-27 16:00 ` Jarkko Sakkinen
2020-02-27 0:26 ` [PATCH v3 3/4] tpm: Implement tpm2_init_commands to use in non-auto startup case Stefan Berger
2020-02-27 16:02 ` Jarkko Sakkinen [this message]
2020-02-27 0:26 ` [PATCH v3 4/4] tpm: ibmvtpm: Add support for TPM 2 Stefan Berger
2020-02-27 16:04 ` Jarkko Sakkinen
-- strict thread matches above, loose matches on Subject: below --
2020-02-25 20:53 [PATCH v3 0/4] Enable vTPM 2.0 for the IBM vTPM driver Stefan Berger
2020-02-25 20:53 ` [PATCH v3 3/4] tpm: Implement tpm2_init_commands to use in non-auto startup case Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200227160250.GB5140@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=aik@ozlabs.ru \
--cc=david@gibson.dropbear.id.au \
--cc=gcwilson@linux.ibm.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nayna@linux.vnet.ibm.com \
--cc=stefanb@linux.ibm.com \
--cc=stefanb@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).