From: Nayna Jain <nayna@linux.ibm.com> To: Tomas Winkler <tomas.winkler@intel.com>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: Nayna Jain <nayna@linux.vnet.ibm.com>, Alexander Usyskin <alexander.usyskin@intel.com>, Tadeusz Struk <tadeusz.struk@intel.com>, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Date: Thu, 11 Oct 2018 22:25:35 +0530 [thread overview] Message-ID: <9200c6f4-508c-a917-8462-fe50bb995971@linux.ibm.com> (raw) In-Reply-To: <20180928223035.14471-4-tomas.winkler@intel.com> On 09/29/2018 04:00 AM, Tomas Winkler wrote: > +unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) > +{ > + int duration_idx = TPM_UNDEFINED; > + int duration = 0; > + > + /* > + * We only have a duration table for protected commands, where the upper > + * 16 bits are 0. For the few other ordinals the fallback will be used. > + */ > + if (ordinal < TPM_MAX_ORDINAL) > + duration_idx = tpm1_ordinal_duration[ordinal]; > + > + if (duration_idx != TPM_UNDEFINED) > + duration = chip->duration[duration_idx]; > + if (duration <= 0) > + return 2 * 60 * HZ; > + else > + return duration; > +} > +EXPORT_SYMBOL_GPL(tpm1_calc_ordinal_duration); > diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c > index caa86b19c76d..5d20e98b844f 100644 > --- a/drivers/char/tpm/tpm_i2c_nuvoton.c > +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c > @@ -370,6 +370,7 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len) > struct i2c_client *client = to_i2c_client(dev); > u32 ordinal; > size_t count = 0; > + unsigned long duration; > int burst_count, bytes2write, retries, rc = -EIO; > > for (retries = 0; retries < TPM_RETRY; retries++) { > @@ -455,12 +456,11 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len) > return rc; > } > ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); > - rc = i2c_nuvoton_wait_for_data_avail(chip, > - tpm_calc_ordinal_duration(chip, > - ordinal), > - &priv->read_queue); > + duration = tpm1_calc_ordinal_duration(chip, ordinal); The original code in the nuvoton driver does not differentiate between TPM 1.2 and TPM 2.0 as it does in tpm_tis_core.c. Before making any changes, I would first fix it, so that it could easily be backported. Only then do the refactoring Thanks & Regards, - Nayna > + rc = i2c_nuvoton_wait_for_data_avail(chip, duration, &priv->read_queue); > if (rc) { > - dev_err(dev, "%s() timeout command duration\n", __func__); > + dev_err(dev, "%s() timeout command duration %ld\n", > + __func__, duration); > i2c_nuvoton_ready(chip); > return rc; > } > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > index d2345d9fd7b5..14c332104de4 100644 > --- a/drivers/char/tpm/tpm_tis_core.c > +++ b/drivers/char/tpm/tpm_tis_core.c > @@ -476,7 +476,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) > if (chip->flags & TPM_CHIP_FLAG_TPM2) > dur = tpm2_calc_ordinal_duration(chip, ordinal); > else > - dur = tpm_calc_ordinal_duration(chip, ordinal); > + dur = tpm1_calc_ordinal_duration(chip, ordinal); > > if (wait_for_tpm_stat > (chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, dur, > diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c > index b150f87f38f5..77097229bf49 100644 > --- a/drivers/char/tpm/xen-tpmfront.c > +++ b/drivers/char/tpm/xen-tpmfront.c > @@ -164,7 +164,7 @@ static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) > notify_remote_via_evtchn(priv->evtchn); > > ordinal = be32_to_cpu(((struct tpm_input_header*)buf)->ordinal); > - duration = tpm_calc_ordinal_duration(chip, ordinal); > + duration = tpm1_calc_ordinal_duration(chip, ordinal); > > if (wait_for_tpm_stat(chip, VTPM_STATUS_IDLE, duration, > &priv->read_queue, true) < 0) {
WARNING: multiple messages have this Message-ID (diff)
From: Nayna Jain <nayna@linux.ibm.com> To: Tomas Winkler <tomas.winkler@intel.com>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: Nayna Jain <nayna@linux.vnet.ibm.com>, Alexander Usyskin <alexander.usyskin@intel.com>, Tadeusz Struk <tadeusz.struk@intel.com>, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Date: Thu, 11 Oct 2018 22:25:35 +0530 [thread overview] Message-ID: <9200c6f4-508c-a917-8462-fe50bb995971@linux.ibm.com> (raw) In-Reply-To: <20180928223035.14471-4-tomas.winkler@intel.com> On 09/29/2018 04:00 AM, Tomas Winkler wrote: > +unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) > +{ > + int duration_idx = TPM_UNDEFINED; > + int duration = 0; > + > + /* > + * We only have a duration table for protected commands, where the upper > + * 16 bits are 0. For the few other ordinals the fallback will be used. > + */ > + if (ordinal < TPM_MAX_ORDINAL) > + duration_idx = tpm1_ordinal_duration[ordinal]; > + > + if (duration_idx != TPM_UNDEFINED) > + duration = chip->duration[duration_idx]; > + if (duration <= 0) > + return 2 * 60 * HZ; > + else > + return duration; > +} > +EXPORT_SYMBOL_GPL(tpm1_calc_ordinal_duration); > diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c > index caa86b19c76d..5d20e98b844f 100644 > --- a/drivers/char/tpm/tpm_i2c_nuvoton.c > +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c > @@ -370,6 +370,7 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len) > struct i2c_client *client = to_i2c_client(dev); > u32 ordinal; > size_t count = 0; > + unsigned long duration; > int burst_count, bytes2write, retries, rc = -EIO; > > for (retries = 0; retries < TPM_RETRY; retries++) { > @@ -455,12 +456,11 @@ static int i2c_nuvoton_send(struct tpm_chip *chip, u8 *buf, size_t len) > return rc; > } > ordinal = be32_to_cpu(*((__be32 *) (buf + 6))); > - rc = i2c_nuvoton_wait_for_data_avail(chip, > - tpm_calc_ordinal_duration(chip, > - ordinal), > - &priv->read_queue); > + duration = tpm1_calc_ordinal_duration(chip, ordinal); The original code in the nuvoton driver does not differentiate between TPM 1.2 and TPM 2.0 as it does in tpm_tis_core.c. Before making any changes, I would first fix it, so that it could easily be backported. Only then do the refactoring Thanks & Regards, - Nayna > + rc = i2c_nuvoton_wait_for_data_avail(chip, duration, &priv->read_queue); > if (rc) { > - dev_err(dev, "%s() timeout command duration\n", __func__); > + dev_err(dev, "%s() timeout command duration %ld\n", > + __func__, duration); > i2c_nuvoton_ready(chip); > return rc; > } > diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > index d2345d9fd7b5..14c332104de4 100644 > --- a/drivers/char/tpm/tpm_tis_core.c > +++ b/drivers/char/tpm/tpm_tis_core.c > @@ -476,7 +476,7 @@ static int tpm_tis_send_main(struct tpm_chip *chip, const u8 *buf, size_t len) > if (chip->flags & TPM_CHIP_FLAG_TPM2) > dur = tpm2_calc_ordinal_duration(chip, ordinal); > else > - dur = tpm_calc_ordinal_duration(chip, ordinal); > + dur = tpm1_calc_ordinal_duration(chip, ordinal); > > if (wait_for_tpm_stat > (chip, TPM_STS_DATA_AVAIL | TPM_STS_VALID, dur, > diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c > index b150f87f38f5..77097229bf49 100644 > --- a/drivers/char/tpm/xen-tpmfront.c > +++ b/drivers/char/tpm/xen-tpmfront.c > @@ -164,7 +164,7 @@ static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) > notify_remote_via_evtchn(priv->evtchn); > > ordinal = be32_to_cpu(((struct tpm_input_header*)buf)->ordinal); > - duration = tpm_calc_ordinal_duration(chip, ordinal); > + duration = tpm1_calc_ordinal_duration(chip, ordinal); > > if (wait_for_tpm_stat(chip, VTPM_STATUS_IDLE, duration, > &priv->read_queue, true) < 0) {
next prev parent reply other threads:[~2018-10-11 16:58 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-28 22:30 [PATCH v5 00/21] tpm: separate tpm 1.x and tpm 2.x commands Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 01/21] tpm2: add new tpm2 commands according to TCG 1.36 Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:38 ` Jarkko Sakkinen 2018-10-02 0:40 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 02/21] tpm: sort objects in the Makefile Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-11 16:55 ` Nayna Jain [this message] 2018-10-11 16:55 ` Nayna Jain 2018-09-28 22:30 ` [PATCH v5 04/21] tpm: add tpm_calc_ordinal_duration() wrapper Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 05/21] tpm: factor out tpm_get_timeouts() Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-11 17:00 ` Nayna Jain 2018-10-11 17:00 ` Nayna Jain 2018-10-11 20:16 ` Winkler, Tomas 2018-10-11 20:16 ` Winkler, Tomas 2018-09-28 22:30 ` [PATCH v5 06/21] tpm: move tpm1_pcr_extend to tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:42 ` Jarkko Sakkinen 2018-10-02 0:42 ` Jarkko Sakkinen 2018-10-02 9:28 ` Nayna Jain 2018-10-02 9:28 ` Nayna Jain 2018-10-03 12:02 ` Jarkko Sakkinen 2018-10-03 12:02 ` Jarkko Sakkinen 2018-10-12 9:31 ` Nayna Jain 2018-10-12 9:31 ` Nayna Jain 2018-10-16 16:48 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 07/21] tpm: move tpm_getcap " Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 08/21] tpm: factor out tpm1_get_random into tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:43 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 09/21] tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 10/21] tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:45 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 11/21] tpm: factor out tpm_startup function Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:46 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 12/21] tpm: move pcr extend code to tpm2-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:52 ` Jarkko Sakkinen 2018-10-02 4:58 ` Winkler, Tomas 2018-10-02 4:58 ` Winkler, Tomas 2018-10-03 12:01 ` Jarkko Sakkinen 2018-10-03 12:01 ` Jarkko Sakkinen 2018-10-03 22:24 ` Winkler, Tomas 2018-10-03 22:24 ` Winkler, Tomas 2018-10-04 11:35 ` Jarkko Sakkinen 2018-10-04 11:35 ` Jarkko Sakkinen 2018-10-04 11:36 ` Jarkko Sakkinen 2018-10-04 11:36 ` Jarkko Sakkinen 2018-10-04 11:45 ` Winkler, Tomas 2018-10-04 11:45 ` Winkler, Tomas 2018-10-04 12:20 ` Roberto Sassu 2018-10-04 12:20 ` Roberto Sassu 2018-10-04 13:46 ` Winkler, Tomas 2018-10-04 13:46 ` Winkler, Tomas 2018-10-04 14:10 ` Roberto Sassu 2018-10-04 14:10 ` Roberto Sassu 2018-10-05 11:31 ` Jarkko Sakkinen 2018-10-05 11:31 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 13/21] tpm: add tpm_auto_startup() into tpm-interface.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:56 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 14/21] tpm: tpm-interface.c drop unused macros Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 15/21] tpm: tpm-space.c remove unneeded semicolon Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 16/21] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 17/21] tpm1: implement tpm1_pcr_read_dev() " Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 18/21] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read() Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 19/21] tpm1: reimplement SAVESTATE using tpm_buf Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 20/21] tpm1: reimplement tpm1_continue_selftest() " Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-17 6:02 ` Nayna Jain 2018-10-17 6:02 ` Nayna Jain 2018-09-28 22:30 ` [PATCH v5 21/21] tpm: use u32 instead of int for PCR index Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:58 ` Jarkko Sakkinen 2018-10-02 0:44 ` [PATCH v5 00/21] tpm: separate tpm 1.x and tpm 2.x commands Jarkko Sakkinen
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=9200c6f4-508c-a917-8462-fe50bb995971@linux.ibm.com \ --to=nayna@linux.ibm.com \ --cc=alexander.usyskin@intel.com \ --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.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.