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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham 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 32201C433F4 for ; Wed, 19 Sep 2018 15:03:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC60320880 for ; Wed, 19 Sep 2018 15:03:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC60320880 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 S1732317AbeISUlm (ORCPT ); Wed, 19 Sep 2018 16:41:42 -0400 Received: from mga04.intel.com ([192.55.52.120]:45655 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732029AbeISUlm (ORCPT ); Wed, 19 Sep 2018 16:41:42 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Sep 2018 08:03:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,394,1531810800"; d="scan'208";a="84860700" Received: from pqueiros-mobl.ger.corp.intel.com (HELO localhost) ([10.249.37.13]) by orsmga003.jf.intel.com with ESMTP; 19 Sep 2018 08:03:17 -0700 Date: Wed, 19 Sep 2018 18:03:16 +0300 From: Jarkko Sakkinen To: Tomas Winkler Cc: Jason Gunthorpe , Alexander Usyskin , Tadeusz Struk , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 10/20] tpm: factor out tpm1 pm suspend flow into tpm1-cmd.c Message-ID: <20180919150316.GC31076@linux.intel.com> References: <20180918093459.19165-1-tomas.winkler@intel.com> <20180918093459.19165-11-tomas.winkler@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180918093459.19165-11-tomas.winkler@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 18, 2018 at 12:34:49PM +0300, Tomas Winkler wrote: > Factor out tpm1 suspend flow from tpm-interface.c into a new function > tpm1_pm_suspend in tpm1-cmd.c > > Signed-off-by: Tomas Winkler Use "TPM 1.x" in the short summary and long description instead of "tpm1" and add parentheses to the functions. > --- > V2-V3: Rebase > drivers/char/tpm/tpm-interface.c | 55 ++++------------------------------------ > drivers/char/tpm/tpm.h | 1 + > drivers/char/tpm/tpm1-cmd.c | 54 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 60 insertions(+), 50 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index 8396cf6735ec..1ddf9d7e2069 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -575,15 +575,6 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen) > } > EXPORT_SYMBOL_GPL(tpm_send); > > -#define TPM_ORD_SAVESTATE 152 > -#define SAVESTATE_RESULT_SIZE 10 > - > -static const struct tpm_input_header savestate_header = { > - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), > - .length = cpu_to_be32(10), > - .ordinal = cpu_to_be32(TPM_ORD_SAVESTATE) > -}; > - > /* > * We are about to suspend. Save the TPM state > * so that it can be restored. > @@ -591,54 +582,18 @@ static const struct tpm_input_header savestate_header = { > int tpm_pm_suspend(struct device *dev) > { > struct tpm_chip *chip = dev_get_drvdata(dev); > - struct tpm_cmd_t cmd; > - int rc, try; > - > - u8 dummy_hash[TPM_DIGEST_SIZE] = { 0 }; > + int rc = 0; > > - if (chip == NULL) > + if (!chip) > return -ENODEV; > > if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED) > return 0; > > - if (chip->flags & TPM_CHIP_FLAG_TPM2) { > + if (chip->flags & TPM_CHIP_FLAG_TPM2) > tpm2_shutdown(chip, TPM2_SU_STATE); > - return 0; > - } > - > - /* for buggy tpm, flush pcrs with extend to selected dummy */ > - if (tpm_suspend_pcr) > - rc = tpm1_pcr_extend(chip, tpm_suspend_pcr, dummy_hash, > - "extending dummy pcr before suspend"); > - > - /* now do the actual savestate */ > - for (try = 0; try < TPM_RETRY; try++) { > - cmd.header.in = savestate_header; > - rc = tpm_transmit_cmd(chip, NULL, &cmd, SAVESTATE_RESULT_SIZE, > - 0, 0, NULL); > - > - /* > - * If the TPM indicates that it is too busy to respond to > - * this command then retry before giving up. It can take > - * several seconds for this TPM to be ready. > - * > - * This can happen if the TPM has already been sent the > - * SaveState command before the driver has loaded. TCG 1.2 > - * specification states that any communication after SaveState > - * may cause the TPM to invalidate previously saved state. > - */ > - if (rc != TPM_WARN_RETRY) > - break; > - tpm_msleep(TPM_TIMEOUT_RETRY); > - } > - > - if (rc) > - dev_err(&chip->dev, > - "Error (%d) sending savestate before suspend\n", rc); > - else if (try > 0) > - dev_warn(&chip->dev, "TPM savestate took %dms\n", > - try * TPM_TIMEOUT_RETRY); > + else > + rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); > > return rc; > } > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index fd945fc828b6..862c9262e037 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -543,6 +543,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, > 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); > int tpm1_do_selftest(struct tpm_chip *chip); > int tpm1_auto_startup(struct tpm_chip *chip); > int tpm1_get_timeouts(struct tpm_chip *chip); > diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c > index 3f561736f066..5fdc44feea0f 100644 > --- a/drivers/char/tpm/tpm1-cmd.c > +++ b/drivers/char/tpm/tpm1-cmd.c > @@ -667,3 +667,57 @@ int tpm1_auto_startup(struct tpm_chip *chip) > rc = -ENODEV; > return rc; > } > + > +#define TPM_ORD_SAVESTATE 152 > +#define SAVESTATE_RESULT_SIZE 10 > +static const struct tpm_input_header savestate_header = { > + .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), > + .length = cpu_to_be32(10), > + .ordinal = cpu_to_be32(TPM_ORD_SAVESTATE) > +}; > + > +/* > + * We are about to suspend. Save the TPM state > + * so that it can be restored. > + */ Either remove this comment or do a proper kdoc. > +int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) > +{ > + u8 dummy_hash[TPM_DIGEST_SIZE] = { 0 }; > + struct tpm_cmd_t cmd; > + int rc, try; > + > + /* for buggy tpm, flush pcrs with extend to selected dummy */ > + if (tpm_suspend_pcr) > + rc = tpm1_pcr_extend(chip, tpm_suspend_pcr, dummy_hash, > + "extending dummy pcr before suspend"); > + > + /* now do the actual savestate */ > + for (try = 0; try < TPM_RETRY; try++) { > + cmd.header.in = savestate_header; > + rc = tpm_transmit_cmd(chip, NULL, &cmd, SAVESTATE_RESULT_SIZE, > + 0, 0, NULL); > + > + /* > + * If the TPM indicates that it is too busy to respond to > + * this command then retry before giving up. It can take > + * several seconds for this TPM to be ready. > + * > + * This can happen if the TPM has already been sent the > + * SaveState command before the driver has loaded. TCG 1.2 > + * specification states that any communication after SaveState > + * may cause the TPM to invalidate previously saved state. > + */ > + if (rc != TPM_WARN_RETRY) > + break; > + tpm_msleep(TPM_TIMEOUT_RETRY); > + } > + > + if (rc) > + dev_err(&chip->dev, > + "Error (%d) sending savestate before suspend\n", rc); > + else if (try > 0) > + dev_warn(&chip->dev, "TPM savestate took %dms\n", > + try * TPM_TIMEOUT_RETRY); > + > + return rc; > +} > -- > 2.14.4 > /Jarkko From mboxrd@z Thu Jan 1 00:00:00 1970 From: jarkko.sakkinen@linux.intel.com (Jarkko Sakkinen) Date: Wed, 19 Sep 2018 18:03:16 +0300 Subject: [PATCH v3 10/20] tpm: factor out tpm1 pm suspend flow into tpm1-cmd.c In-Reply-To: <20180918093459.19165-11-tomas.winkler@intel.com> References: <20180918093459.19165-1-tomas.winkler@intel.com> <20180918093459.19165-11-tomas.winkler@intel.com> Message-ID: <20180919150316.GC31076@linux.intel.com> To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Tue, Sep 18, 2018 at 12:34:49PM +0300, Tomas Winkler wrote: > Factor out tpm1 suspend flow from tpm-interface.c into a new function > tpm1_pm_suspend in tpm1-cmd.c > > Signed-off-by: Tomas Winkler Use "TPM 1.x" in the short summary and long description instead of "tpm1" and add parentheses to the functions. > --- > V2-V3: Rebase > drivers/char/tpm/tpm-interface.c | 55 ++++------------------------------------ > drivers/char/tpm/tpm.h | 1 + > drivers/char/tpm/tpm1-cmd.c | 54 +++++++++++++++++++++++++++++++++++++++ > 3 files changed, 60 insertions(+), 50 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index 8396cf6735ec..1ddf9d7e2069 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -575,15 +575,6 @@ int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen) > } > EXPORT_SYMBOL_GPL(tpm_send); > > -#define TPM_ORD_SAVESTATE 152 > -#define SAVESTATE_RESULT_SIZE 10 > - > -static const struct tpm_input_header savestate_header = { > - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), > - .length = cpu_to_be32(10), > - .ordinal = cpu_to_be32(TPM_ORD_SAVESTATE) > -}; > - > /* > * We are about to suspend. Save the TPM state > * so that it can be restored. > @@ -591,54 +582,18 @@ static const struct tpm_input_header savestate_header = { > int tpm_pm_suspend(struct device *dev) > { > struct tpm_chip *chip = dev_get_drvdata(dev); > - struct tpm_cmd_t cmd; > - int rc, try; > - > - u8 dummy_hash[TPM_DIGEST_SIZE] = { 0 }; > + int rc = 0; > > - if (chip == NULL) > + if (!chip) > return -ENODEV; > > if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED) > return 0; > > - if (chip->flags & TPM_CHIP_FLAG_TPM2) { > + if (chip->flags & TPM_CHIP_FLAG_TPM2) > tpm2_shutdown(chip, TPM2_SU_STATE); > - return 0; > - } > - > - /* for buggy tpm, flush pcrs with extend to selected dummy */ > - if (tpm_suspend_pcr) > - rc = tpm1_pcr_extend(chip, tpm_suspend_pcr, dummy_hash, > - "extending dummy pcr before suspend"); > - > - /* now do the actual savestate */ > - for (try = 0; try < TPM_RETRY; try++) { > - cmd.header.in = savestate_header; > - rc = tpm_transmit_cmd(chip, NULL, &cmd, SAVESTATE_RESULT_SIZE, > - 0, 0, NULL); > - > - /* > - * If the TPM indicates that it is too busy to respond to > - * this command then retry before giving up. It can take > - * several seconds for this TPM to be ready. > - * > - * This can happen if the TPM has already been sent the > - * SaveState command before the driver has loaded. TCG 1.2 > - * specification states that any communication after SaveState > - * may cause the TPM to invalidate previously saved state. > - */ > - if (rc != TPM_WARN_RETRY) > - break; > - tpm_msleep(TPM_TIMEOUT_RETRY); > - } > - > - if (rc) > - dev_err(&chip->dev, > - "Error (%d) sending savestate before suspend\n", rc); > - else if (try > 0) > - dev_warn(&chip->dev, "TPM savestate took %dms\n", > - try * TPM_TIMEOUT_RETRY); > + else > + rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); > > return rc; > } > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index fd945fc828b6..862c9262e037 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -543,6 +543,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space, > 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); > int tpm1_do_selftest(struct tpm_chip *chip); > int tpm1_auto_startup(struct tpm_chip *chip); > int tpm1_get_timeouts(struct tpm_chip *chip); > diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c > index 3f561736f066..5fdc44feea0f 100644 > --- a/drivers/char/tpm/tpm1-cmd.c > +++ b/drivers/char/tpm/tpm1-cmd.c > @@ -667,3 +667,57 @@ int tpm1_auto_startup(struct tpm_chip *chip) > rc = -ENODEV; > return rc; > } > + > +#define TPM_ORD_SAVESTATE 152 > +#define SAVESTATE_RESULT_SIZE 10 > +static const struct tpm_input_header savestate_header = { > + .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), > + .length = cpu_to_be32(10), > + .ordinal = cpu_to_be32(TPM_ORD_SAVESTATE) > +}; > + > +/* > + * We are about to suspend. Save the TPM state > + * so that it can be restored. > + */ Either remove this comment or do a proper kdoc. > +int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) > +{ > + u8 dummy_hash[TPM_DIGEST_SIZE] = { 0 }; > + struct tpm_cmd_t cmd; > + int rc, try; > + > + /* for buggy tpm, flush pcrs with extend to selected dummy */ > + if (tpm_suspend_pcr) > + rc = tpm1_pcr_extend(chip, tpm_suspend_pcr, dummy_hash, > + "extending dummy pcr before suspend"); > + > + /* now do the actual savestate */ > + for (try = 0; try < TPM_RETRY; try++) { > + cmd.header.in = savestate_header; > + rc = tpm_transmit_cmd(chip, NULL, &cmd, SAVESTATE_RESULT_SIZE, > + 0, 0, NULL); > + > + /* > + * If the TPM indicates that it is too busy to respond to > + * this command then retry before giving up. It can take > + * several seconds for this TPM to be ready. > + * > + * This can happen if the TPM has already been sent the > + * SaveState command before the driver has loaded. TCG 1.2 > + * specification states that any communication after SaveState > + * may cause the TPM to invalidate previously saved state. > + */ > + if (rc != TPM_WARN_RETRY) > + break; > + tpm_msleep(TPM_TIMEOUT_RETRY); > + } > + > + if (rc) > + dev_err(&chip->dev, > + "Error (%d) sending savestate before suspend\n", rc); > + else if (try > 0) > + dev_warn(&chip->dev, "TPM savestate took %dms\n", > + try * TPM_TIMEOUT_RETRY); > + > + return rc; > +} > -- > 2.14.4 > /Jarkko