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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 6F26FC169D4 for ; Wed, 14 Nov 2018 01:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29BCE2145D for ; Wed, 14 Nov 2018 01:47:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29BCE2145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.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 S1731883AbeKNLsw (ORCPT ); Wed, 14 Nov 2018 06:48:52 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:42208 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731703AbeKNLsw (ORCPT ); Wed, 14 Nov 2018 06:48:52 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wAE1hLEd061187 for ; Tue, 13 Nov 2018 20:47:52 -0500 Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) by mx0b-001b2d01.pphosted.com with ESMTP id 2nr7drp2vn-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Nov 2018 20:47:52 -0500 Received: from localhost by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Nov 2018 01:47:51 -0000 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 14 Nov 2018 01:47:46 -0000 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wAE1ljwd17760308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 14 Nov 2018 01:47:45 GMT Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 66267136059; Wed, 14 Nov 2018 01:47:45 +0000 (GMT) Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2BDDA136055; Wed, 14 Nov 2018 01:47:44 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP; Wed, 14 Nov 2018 01:47:43 +0000 (GMT) Subject: Re: [PATCH v7 15/17] tpm: introduce tpm_chip_start() and tpm_chip_stop() To: Jarkko Sakkinen , linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, James Bottomley , Tomas Winkler , Tadeusz Struk , Stefan Berger , Nayna Jain , Peter Huewe , Jason Gunthorpe , Arnd Bergmann , Greg Kroah-Hartman , open list References: <20181113183620.27447-1-jarkko.sakkinen@linux.intel.com> <20181113183620.27447-16-jarkko.sakkinen@linux.intel.com> From: Stefan Berger Date: Tue, 13 Nov 2018 20:47:43 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20181113183620.27447-16-jarkko.sakkinen@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-MW X-TM-AS-GCONF: 00 x-cbid: 18111401-0036-0000-0000-00000A5AE2C5 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010045; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000270; SDB=6.01117092; UDB=6.00579381; IPR=6.00897201; MB=3.00024149; MTD=3.00000008; XFM=3.00000015; UTC=2018-11-14 01:47:49 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18111401-0037-0000-0000-000049A0EC03 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-11-14_01:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=938 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1811140014 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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 > + * * -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 > + */ > +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; I think this should stay. > 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);