From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D58BECDE3D for ; Sat, 20 Oct 2018 01:08:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5001E214C2 for ; Sat, 20 Oct 2018 01:08:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5001E214C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727270AbeJTJQd (ORCPT ); Sat, 20 Oct 2018 05:16:33 -0400 Received: from mga05.intel.com ([192.55.52.43]:19469 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726513AbeJTJQd (ORCPT ); Sat, 20 Oct 2018 05:16:33 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Oct 2018 18:06:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,402,1534834800"; d="scan'208";a="272868436" Received: from kskibin-mobl.ger.corp.intel.com ([10.249.254.29]) by fmsmga005.fm.intel.com with ESMTP; 19 Oct 2018 18:06:54 -0700 Date: Sat, 20 Oct 2018 04:06:54 +0300 (EEST) From: Jarkko Sakkinen X-X-Sender: jsakkine@jsakkine-mobl1 To: Tomas Winkler cc: Jarkko Sakkinen , Jason Gunthorpe , Nayna Jain , Alexander Usyskin , Tadeusz Struk , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 12/21] tpm: factor out tpm_startup function In-Reply-To: <20181019182307.17745-13-tomas.winkler@intel.com> Message-ID: References: <20181019182307.17745-1-tomas.winkler@intel.com> <20181019182307.17745-13-tomas.winkler@intel.com> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 19 Oct 2018, Tomas Winkler wrote: > TPM manual startup is used only from within TPM 1.x or TPM 2.x > 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 > Tested-by: Jarkko Sakkinen > --- > V2-V2: Resend. > V4: Fix the commit message. > V5: 1. A small fix in the kdoc. > 2. Fixed Jarkko's name in Tested-by. > V6: Rebase. > V7: Resend. > > 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 e7f220f691f9..54b81700561b 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -414,47 +414,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 754f7bcb15fa..2eb73f6966c3 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 3bd9f1fa77ce..8a84db315676 100644 > --- a/drivers/char/tpm/tpm1-cmd.c > +++ b/drivers/char/tpm/tpm1-cmd.c > @@ -308,6 +308,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; > @@ -317,7 +351,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, > @@ -727,3 +761,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 dd2e98f4de08..6ca4fc0a0d6f 100644 > --- a/drivers/char/tpm/tpm2-cmd.c > +++ b/drivers/char/tpm/tpm2-cmd.c > @@ -948,6 +948,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 > @@ -959,7 +989,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; > > @@ -968,7 +998,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 > > Reviewed-by: Jarkko Sakkinen /Jarkko