From: Stefan Berger <stefanb@linux.ibm.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
linux-integrity@vger.kernel.org
Cc: linux-security-module@vger.kernel.org,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Tomas Winkler <tomas.winkler@intel.com>,
Tadeusz Struk <tadeusz.struk@intel.com>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
Nayna Jain <nayna@linux.ibm.com>, Peter Huewe <peterhuewe@gmx.de>,
Jason Gunthorpe <jgg@ziepe.ca>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v7 15/17] tpm: introduce tpm_chip_start() and tpm_chip_stop()
Date: Tue, 13 Nov 2018 18:02:27 -0500 [thread overview]
Message-ID: <d20eaac5-4da2-6322-ef18-23366027a060@linux.ibm.com> (raw)
In-Reply-To: <20181113183620.27447-16-jarkko.sakkinen@linux.intel.com>
On 11/13/18 1:36 PM, Jarkko Sakkinen wrote:
> Encapsulate power gating and locality functionality to tpm_chip_start()
> and tpm_chip_stop() in order to clean up the branching mess in
> tpm_transmit().
>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
> drivers/char/tpm/tpm-chip.c | 110 +++++++++++++++++++++++++++++++
> drivers/char/tpm/tpm-interface.c | 87 +-----------------------
> drivers/char/tpm/tpm.h | 2 +
> 3 files changed, 115 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 157505b0f755..65f1561eba81 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -37,6 +37,116 @@ struct class *tpm_class;
> struct class *tpmrm_class;
> dev_t tpm_devt;
>
> +static int tpm_request_locality(struct tpm_chip *chip, unsigned int flags)
> +{
> + int rc;
> +
> + if (flags & TPM_TRANSMIT_NESTED)
> + return 0;
> +
> + if (!chip->ops->request_locality)
> + return 0;
> +
> + rc = chip->ops->request_locality(chip, 0);
> + if (rc < 0)
> + return rc;
> +
> + chip->locality = rc;
> + return 0;
> +}
> +
> +static void tpm_relinquish_locality(struct tpm_chip *chip, unsigned int flags)
> +{
> + int rc;
> +
> + if (flags & TPM_TRANSMIT_NESTED)
> + return;
> +
> + if (!chip->ops->relinquish_locality)
> + return;
> +
> + rc = chip->ops->relinquish_locality(chip, chip->locality);
> + if (rc)
> + dev_err(&chip->dev, "%s: : error %d\n", __func__, rc);
> +
> + chip->locality = -1;
> +}
> +
> +static int tpm_cmd_ready(struct tpm_chip *chip, unsigned int flags)
> +{
> + if (flags & TPM_TRANSMIT_NESTED)
> + return 0;
> +
> + if (!chip->ops->cmd_ready)
> + return 0;
> +
> + return chip->ops->cmd_ready(chip);
> +}
> +
> +static int tpm_go_idle(struct tpm_chip *chip, unsigned int flags)
> +{
> + if (flags & TPM_TRANSMIT_NESTED)
> + return 0;
> +
> + if (!chip->ops->go_idle)
> + return 0;
> +
> + return chip->ops->go_idle(chip);
> +}
> +
> +/**
> + * tpm_chip_start() - power on the TPM
> + * @chip: a TPM chip to use
> + * @flags: TPM transmit flags
> + *
> + * Return:
> + * * The response length - OK
I don't think this is right. Have to withdraw my Reviewed-by on this one.
> + * * -errno - A system error
> + */
> +int tpm_chip_start(struct tpm_chip *chip, unsigned int flags)
> +{
> + int ret;
> +
> + if (chip->ops->clk_enable)
> + chip->ops->clk_enable(chip, true);
> +
> + if (chip->locality == -1) {
> + ret = tpm_request_locality(chip, flags);
> + if (ret) {
> + chip->ops->clk_enable(chip, false);
> + return ret;
> + }
> + }
> +
> + ret = tpm_cmd_ready(chip, flags);
> + if (ret) {
> + tpm_relinquish_locality(chip, flags);
> + if (chip->ops->clk_enable)
> + chip->ops->clk_enable(chip, false);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +/**
> + * tpm_chip_stop() - power off the TPM
> + * @chip: a TPM chip to use
> + * @flags: TPM transmit flags
> + *
> + * Return:
> + * * The response length - OK
> + * * -errno - A system error
This function doesn't return anything.
> + */
> +void tpm_chip_stop(struct tpm_chip *chip, unsigned int flags)
> +{
> + tpm_go_idle(chip, flags);
> + tpm_relinquish_locality(chip, flags);
> + if (chip->ops->clk_enable)
> + chip->ops->clk_enable(chip, false);
> +}
> +
> +
> /**
> * tpm_try_get_ops() - Get a ref to the tpm_chip
> * @chip: Chip to ref
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index 5865b9671d20..888c9923fca1 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -62,64 +62,6 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal)
> }
> EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
>
> -static int tpm_request_locality(struct tpm_chip *chip, unsigned int flags)
> -{
> - int rc;
> -
> - if (flags & TPM_TRANSMIT_NESTED)
> - return 0;
> -
> - if (!chip->ops->request_locality)
> - return 0;
> -
> - rc = chip->ops->request_locality(chip, 0);
> - if (rc < 0)
> - return rc;
> -
> - chip->locality = rc;
> -
> - return 0;
> -}
> -
> -static void tpm_relinquish_locality(struct tpm_chip *chip, unsigned int flags)
> -{
> - int rc;
> -
> - if (flags & TPM_TRANSMIT_NESTED)
> - return;
> -
> - if (!chip->ops->relinquish_locality)
> - return;
> -
> - rc = chip->ops->relinquish_locality(chip, chip->locality);
> - if (rc)
> - dev_err(&chip->dev, "%s: : error %d\n", __func__, rc);
> -
> - chip->locality = -1;
> -}
> -
> -static int tpm_cmd_ready(struct tpm_chip *chip, unsigned int flags)
> -{
> - if (flags & TPM_TRANSMIT_NESTED)
> - return 0;
> -
> - if (!chip->ops->cmd_ready)
> - return 0;
> -
> - return chip->ops->cmd_ready(chip);
> -}
> -
> -static int tpm_go_idle(struct tpm_chip *chip, unsigned int flags)
> -{
> - if (flags & TPM_TRANSMIT_NESTED)
> - return 0;
> -
> - if (!chip->ops->go_idle)
> - return 0;
> -
> - return chip->ops->go_idle(chip);
> -}
> -
> static ssize_t tpm_try_transmit(struct tpm_chip *chip, u8 *buf, size_t bufsiz,
> unsigned int flags)
> {
> @@ -212,7 +154,6 @@ ssize_t tpm_transmit(struct tpm_chip *chip, u8 *buf, size_t bufsiz,
> /* space for header and handles */
> u8 save[TPM_HEADER_SIZE + 3*sizeof(u32)];
> unsigned int delay_msec = TPM2_DURATION_SHORT;
> - bool has_locality = false;
> u32 rc = 0;
> ssize_t ret;
> const size_t save_size = min(sizeof(save), bufsiz);
> @@ -227,34 +168,12 @@ ssize_t tpm_transmit(struct tpm_chip *chip, u8 *buf, size_t bufsiz,
> memcpy(save, buf, save_size);
>
> for (;;) {
> - if (chip->ops->clk_enable != NULL)
> - chip->ops->clk_enable(chip, true);
> -
> - if (chip->locality == -1) {
> - ret = tpm_request_locality(chip, flags);
> - if (ret)
> - goto out_locality;
> - has_locality = true;
> - }
> -
> - ret = tpm_cmd_ready(chip, flags);
> + ret = tpm_chip_start(chip, flags);
> if (ret)
> - goto out_locality;
> -
> + return ret;
> ret = tpm_try_transmit(chip, buf, bufsiz, flags);
> + tpm_chip_stop(chip, flags);
>
> - /* This may fail but do not override ret. */
> - tpm_go_idle(chip, flags);
> -
> -out_locality:
> - if (has_locality)
> - tpm_relinquish_locality(chip, flags);
> -
> - if (chip->ops->clk_enable != NULL)
> - chip->ops->clk_enable(chip, false);
> -
> - if (ret < 0)
> - break;
> rc = be32_to_cpu(header->return_code);
> if (rc != TPM2_RC_RETRY && rc != TPM2_RC_TESTING)
> break;
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index c7c06de651a0..c42a75710b70 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -523,6 +523,8 @@ static inline void tpm_msleep(unsigned int delay_msec)
> delay_msec * 1000);
> };
>
> +int tpm_chip_start(struct tpm_chip *chip, unsigned int flags);
> +void tpm_chip_stop(struct tpm_chip *chip, unsigned int flags);
> struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip);
> __must_check int tpm_try_get_ops(struct tpm_chip *chip);
> void tpm_put_ops(struct tpm_chip *chip);
next prev parent reply other threads:[~2018-11-13 23:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 18:35 [PATCH v7 00/17] Removed nested TPM operations Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 01/17] tpm: use tpm_buf in tpm_transmit_cmd() as the IO parameter Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 02/17] tpm: fix invalid return value in pubek_show() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 03/17] tpm: return 0 from pcrs_show() when tpm1_pcr_read() fails Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 04/17] tpm: print tpm2_commit_space() error inside tpm2_commit_space() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 05/17] tpm: declare struct tpm_header Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 06/17] tpm: access command header through struct in tpm_try_transmit() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 07/17] tpm: encapsulate tpm_dev_transmit() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 08/17] tpm: call tpm2_flush_space() on error in tpm_try_transmit() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 09/17] tpm: clean up tpm_try_transmit() error handling flow Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 10/17] tpm: move tpm_validate_commmand() to tpm2-space.c Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 11/17] tpm: move TPM space code out of tpm_transmit() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 12/17] tpm: remove @space from tpm_transmit() Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 13/17] tpm: use tpm_try_get_ops() in tpm-sysfs.c Jarkko Sakkinen
2018-11-13 18:36 ` [PATCH v7 14/17] tpm: remove TPM_TRANSMIT_UNLOCKED flag Jarkko Sakkinen
2018-11-13 20:39 ` Stefan Berger
2018-11-13 18:36 ` [PATCH v7 15/17] tpm: introduce tpm_chip_start() and tpm_chip_stop() Jarkko Sakkinen
2018-11-13 21:17 ` Stefan Berger
2018-11-13 22:34 ` Stefan Berger
2018-11-14 1:56 ` Stefan Berger
2018-11-16 12:32 ` Jarkko Sakkinen
2018-11-15 20:26 ` Jarkko Sakkinen
2018-11-13 23:02 ` Stefan Berger [this message]
2018-11-14 1:47 ` Stefan Berger
2018-11-13 18:36 ` [PATCH v7 16/17] tpm: take TPM chip power gating out of tpm_transmit() Jarkko Sakkinen
2018-11-13 21:26 ` Stefan Berger
2018-11-13 18:36 ` [PATCH v7 17/17] tpm: remove @flags from tpm_transmit() Jarkko Sakkinen
2018-11-13 21:28 ` 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=d20eaac5-4da2-6322-ef18-23366027a060@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=nayna@linux.ibm.com \
--cc=peterhuewe@gmx.de \
--cc=stefanb@linux.vnet.ibm.com \
--cc=tadeusz.struk@intel.com \
--cc=tomas.winkler@intel.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).