From: Tomas Winkler <tomas.winkler@intel.com> To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: 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, Tomas Winkler <tomas.winkler@intel.com> Subject: [PATCH v3 11/20] tpm: factor out tpm_startup function Date: Tue, 18 Sep 2018 12:34:50 +0300 [thread overview] Message-ID: <20180918093459.19165-12-tomas.winkler@intel.com> (raw) In-Reply-To: <20180918093459.19165-1-tomas.winkler@intel.com> tpm manual startup is used only from within tpm1 or tpm2 code, hence remove tpm_startup function from tpm-interface.c and add two static functions implementations tpm1_startup and tpm2_startup into to tpm1-cmd.c and tpm2-cmd.c respectively. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- V2-V3: Rebase drivers/char/tpm/tpm-interface.c | 41 ---------------------------------------- drivers/char/tpm/tpm.h | 1 - drivers/char/tpm/tpm1-cmd.c | 37 +++++++++++++++++++++++++++++++++++- drivers/char/tpm/tpm2-cmd.c | 34 +++++++++++++++++++++++++++++++-- 4 files changed, 68 insertions(+), 45 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 1ddf9d7e2069..3a2eef9e8665 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -403,47 +403,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, } EXPORT_SYMBOL_GPL(tpm_transmit_cmd); -#define TPM_ORD_STARTUP 153 -#define TPM_ST_CLEAR 1 - -/** - * tpm_startup - turn on the TPM - * @chip: TPM chip to use - * - * Normally the firmware should start the TPM. This function is provided as a - * workaround if this does not happen. A legal case for this could be for - * example when a TPM emulator is used. - * - * Return: same as tpm_transmit_cmd() - */ -int tpm_startup(struct tpm_chip *chip) -{ - struct tpm_buf buf; - int rc; - - dev_info(&chip->dev, "starting up the TPM manually\n"); - - if (chip->flags & TPM_CHIP_FLAG_TPM2) { - rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP); - if (rc < 0) - return rc; - - tpm_buf_append_u16(&buf, TPM2_SU_CLEAR); - } else { - rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP); - if (rc < 0) - return rc; - - tpm_buf_append_u16(&buf, TPM_ST_CLEAR); - } - - rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, - "attempting to start the TPM"); - - tpm_buf_destroy(&buf); - return rc; -} - int tpm_get_timeouts(struct tpm_chip *chip) { if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 862c9262e037..fa88102a0cab 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -540,7 +540,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, void *buf, size_t bufsiz, size_t min_rsp_body_length, unsigned int flags, const char *desc); -int tpm_startup(struct tpm_chip *chip); int tpm_get_timeouts(struct tpm_chip *); int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr); diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 5fdc44feea0f..f93776621e49 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -307,6 +307,40 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) return duration; } +#define TPM_ORD_STARTUP 153 +#define TPM_ST_CLEAR 1 + +/** + * tpm_startup - turn on the TPM + * @chip: TPM chip to use + * + * Normally the firmware should start the TPM. This function is provided as a + * workaround if this does not happen. A legal case for this could be for + * example when a TPM emulator is used. + * + * Return: same as tpm_transmit_cmd() + */ +static int tpm1_startup(struct tpm_chip *chip) +{ + struct tpm_buf buf; + int rc; + + dev_info(&chip->dev, "starting up the TPM manually\n"); + + rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP); + if (rc < 0) + return rc; + + tpm_buf_append_u16(&buf, TPM_ST_CLEAR); + + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, + "attempting to start the TPM"); + + tpm_buf_destroy(&buf); + + return rc; +} + int tpm1_get_timeouts(struct tpm_chip *chip) { cap_t cap; @@ -316,7 +350,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip) rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL, sizeof(cap.timeout)); if (rc == TPM_ERR_INVALID_POSTINIT) { - if (tpm_startup(chip)) + if (tpm1_startup(chip)) return rc; rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, @@ -721,3 +755,4 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) return rc; } + diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 4ca0555f23c8..333631eab4c7 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -943,6 +943,36 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip) return rc; } +/** + * tpm2_startup - turn on the TPM + * @chip: TPM chip to use + * + * Normally the firmware should start the TPM. This function is provided as a + * workaround if this does not happen. A legal case for this could be for + * example when a TPM emulator is used. + * + * Return: same as tpm_transmit_cmd() + */ + +static int tpm2_startup(struct tpm_chip *chip) +{ + struct tpm_buf buf; + int rc; + + dev_info(&chip->dev, "starting up the TPM manually\n"); + + rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP); + if (rc < 0) + return rc; + + tpm_buf_append_u16(&buf, TPM2_SU_CLEAR); + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, + "attempting to start the TPM"); + tpm_buf_destroy(&buf); + + return rc; +} + /** * tpm2_auto_startup - Perform the standard automatic TPM initialization * sequence @@ -954,7 +984,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) { int rc; - rc = tpm_get_timeouts(chip); + rc = tpm2_get_timeouts(chip); if (rc) goto out; @@ -963,7 +993,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) goto out; if (rc == TPM2_RC_INITIALIZE) { - rc = tpm_startup(chip); + rc = tpm2_startup(chip); if (rc) goto out; -- 2.14.4
WARNING: multiple messages have this Message-ID (diff)
From: tomas.winkler@intel.com (Tomas Winkler) To: linux-security-module@vger.kernel.org Subject: [PATCH v3 11/20] tpm: factor out tpm_startup function Date: Tue, 18 Sep 2018 12:34:50 +0300 [thread overview] Message-ID: <20180918093459.19165-12-tomas.winkler@intel.com> (raw) In-Reply-To: <20180918093459.19165-1-tomas.winkler@intel.com> tpm manual startup is used only from within tpm1 or tpm2 code, hence remove tpm_startup function from tpm-interface.c and add two static functions implementations tpm1_startup and tpm2_startup into to tpm1-cmd.c and tpm2-cmd.c respectively. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- V2-V3: Rebase drivers/char/tpm/tpm-interface.c | 41 ---------------------------------------- drivers/char/tpm/tpm.h | 1 - drivers/char/tpm/tpm1-cmd.c | 37 +++++++++++++++++++++++++++++++++++- drivers/char/tpm/tpm2-cmd.c | 34 +++++++++++++++++++++++++++++++-- 4 files changed, 68 insertions(+), 45 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 1ddf9d7e2069..3a2eef9e8665 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -403,47 +403,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, } EXPORT_SYMBOL_GPL(tpm_transmit_cmd); -#define TPM_ORD_STARTUP 153 -#define TPM_ST_CLEAR 1 - -/** - * tpm_startup - turn on the TPM - * @chip: TPM chip to use - * - * Normally the firmware should start the TPM. This function is provided as a - * workaround if this does not happen. A legal case for this could be for - * example when a TPM emulator is used. - * - * Return: same as tpm_transmit_cmd() - */ -int tpm_startup(struct tpm_chip *chip) -{ - struct tpm_buf buf; - int rc; - - dev_info(&chip->dev, "starting up the TPM manually\n"); - - if (chip->flags & TPM_CHIP_FLAG_TPM2) { - rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP); - if (rc < 0) - return rc; - - tpm_buf_append_u16(&buf, TPM2_SU_CLEAR); - } else { - rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP); - if (rc < 0) - return rc; - - tpm_buf_append_u16(&buf, TPM_ST_CLEAR); - } - - rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, - "attempting to start the TPM"); - - tpm_buf_destroy(&buf); - return rc; -} - int tpm_get_timeouts(struct tpm_chip *chip) { if (chip->flags & TPM_CHIP_FLAG_HAVE_TIMEOUTS) diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 862c9262e037..fa88102a0cab 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -540,7 +540,6 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, void *buf, size_t bufsiz, size_t min_rsp_body_length, unsigned int flags, const char *desc); -int tpm_startup(struct tpm_chip *chip); int tpm_get_timeouts(struct tpm_chip *); int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr); diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 5fdc44feea0f..f93776621e49 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -307,6 +307,40 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) return duration; } +#define TPM_ORD_STARTUP 153 +#define TPM_ST_CLEAR 1 + +/** + * tpm_startup - turn on the TPM + * @chip: TPM chip to use + * + * Normally the firmware should start the TPM. This function is provided as a + * workaround if this does not happen. A legal case for this could be for + * example when a TPM emulator is used. + * + * Return: same as tpm_transmit_cmd() + */ +static int tpm1_startup(struct tpm_chip *chip) +{ + struct tpm_buf buf; + int rc; + + dev_info(&chip->dev, "starting up the TPM manually\n"); + + rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_STARTUP); + if (rc < 0) + return rc; + + tpm_buf_append_u16(&buf, TPM_ST_CLEAR); + + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, + "attempting to start the TPM"); + + tpm_buf_destroy(&buf); + + return rc; +} + int tpm1_get_timeouts(struct tpm_chip *chip) { cap_t cap; @@ -316,7 +350,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip) rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, NULL, sizeof(cap.timeout)); if (rc == TPM_ERR_INVALID_POSTINIT) { - if (tpm_startup(chip)) + if (tpm1_startup(chip)) return rc; rc = tpm1_getcap(chip, TPM_CAP_PROP_TIS_TIMEOUT, &cap, @@ -721,3 +755,4 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) return rc; } + diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 4ca0555f23c8..333631eab4c7 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -943,6 +943,36 @@ static int tpm2_get_cc_attrs_tbl(struct tpm_chip *chip) return rc; } +/** + * tpm2_startup - turn on the TPM + * @chip: TPM chip to use + * + * Normally the firmware should start the TPM. This function is provided as a + * workaround if this does not happen. A legal case for this could be for + * example when a TPM emulator is used. + * + * Return: same as tpm_transmit_cmd() + */ + +static int tpm2_startup(struct tpm_chip *chip) +{ + struct tpm_buf buf; + int rc; + + dev_info(&chip->dev, "starting up the TPM manually\n"); + + rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_STARTUP); + if (rc < 0) + return rc; + + tpm_buf_append_u16(&buf, TPM2_SU_CLEAR); + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, + "attempting to start the TPM"); + tpm_buf_destroy(&buf); + + return rc; +} + /** * tpm2_auto_startup - Perform the standard automatic TPM initialization * sequence @@ -954,7 +984,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) { int rc; - rc = tpm_get_timeouts(chip); + rc = tpm2_get_timeouts(chip); if (rc) goto out; @@ -963,7 +993,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) goto out; if (rc == TPM2_RC_INITIALIZE) { - rc = tpm_startup(chip); + rc = tpm2_startup(chip); if (rc) goto out; -- 2.14.4
next prev parent reply other threads:[~2018-09-18 9:39 UTC|newest] Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-18 9:34 [PATCH v3 00/20] tpm: separate tpm 1.x and tpm 2.x commands Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-18 9:34 ` [PATCH v3 01/20] tpm2: add new tpm2 commands according to TCG 1.36 Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler [not found] ` <20180919134627.GA26571@linux.intel.com> 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 02/20] tpm: sort objects in the Makefile Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 13:48 ` Jarkko Sakkinen 2018-09-19 13:48 ` Jarkko Sakkinen 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 03/20] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 13:55 ` Jarkko Sakkinen 2018-09-19 13:55 ` Jarkko Sakkinen 2018-09-19 14:00 ` Jarkko Sakkinen 2018-09-19 14:00 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 04/20] tpm: add tpm_calc_ordinal_duration wrapper Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:02 ` Jarkko Sakkinen 2018-09-19 14:02 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 05/20] tpm: factor out tpm_get_timeouts Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:04 ` Jarkko Sakkinen 2018-09-19 14:04 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 06/20] tpm: move tpm1_pcr_extend to tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:06 ` Jarkko Sakkinen 2018-09-19 14:06 ` Jarkko Sakkinen 2018-09-19 14:06 ` Jarkko Sakkinen 2018-09-25 16:25 ` Nayna Jain 2018-09-25 16:25 ` Nayna Jain 2018-09-25 16:25 ` Nayna Jain 2018-09-18 9:34 ` [PATCH v3 07/20] tpm: move tpm_getcap " Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:09 ` Jarkko Sakkinen 2018-09-19 14:09 ` Jarkko Sakkinen 2018-09-19 14:09 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 08/20] tpm: factor out tpm1_get_random into tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:56 ` Jarkko Sakkinen 2018-09-19 14:56 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 09/20] tpm: move tpm1 selftest code from tpm-interface tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:05 ` Jarkko Sakkinen 2018-09-19 15:05 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 10/20] tpm: factor out tpm1 pm suspend flow into tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:03 ` Jarkko Sakkinen 2018-09-19 15:03 ` Jarkko Sakkinen 2018-09-18 9:34 ` Tomas Winkler [this message] 2018-09-18 9:34 ` [PATCH v3 11/20] tpm: factor out tpm_startup function Tomas Winkler 2018-09-19 15:07 ` Jarkko Sakkinen 2018-09-19 15:07 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 12/20] tpm: move pcr extend code to tpm2-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:58 ` Jarkko Sakkinen 2018-09-19 14:58 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 13/20] tpm: add tpm_auto_startup into tpm-interface Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:09 ` Jarkko Sakkinen 2018-09-19 15:09 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 14/20] tpm: tpm-interface.c drop unused macros Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:10 ` Jarkko Sakkinen 2018-09-19 15:10 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 15/20] tpm: tpm-space.c remove unneeded semicolon Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 16/20] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 17/20] tpm1: implement tpm1_pcr_read_dev() " Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:13 ` Jarkko Sakkinen 2018-09-19 15:13 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 18/20] tpm: use u32 instead of int for pcr index Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:22 ` Jarkko Sakkinen 2018-09-19 15:22 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 19/20] tpm1: reimplement SAVESTATE using tpm_buf Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:23 ` Jarkko Sakkinen 2018-09-19 15:23 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 20/20] tpm1: reimplement tpm1_continue_selftest() " Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:24 ` Jarkko Sakkinen 2018-09-19 15:24 ` 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=20180918093459.19165-12-tomas.winkler@intel.com \ --to=tomas.winkler@intel.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=tadeusz.struk@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.