From patchwork Wed Sep 7 11:32:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Winkler, Tomas" X-Patchwork-Id: 9319059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 61454601C0 for ; Wed, 7 Sep 2016 11:34:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 477EA2910A for ; Wed, 7 Sep 2016 11:34:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BD6D2923E; Wed, 7 Sep 2016 11:34:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD1F8291DB for ; Wed, 7 Sep 2016 11:34:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bhb7v-0004Ms-17; Wed, 07 Sep 2016 11:34:47 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bhb7u-0004Mf-1d for tpmdd-devel@lists.sourceforge.net; Wed, 07 Sep 2016 11:34:46 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; envelope-from=tomas.winkler@intel.com; helo=mga02.intel.com; Received: from mga02.intel.com ([134.134.136.20]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1bhb7t-0004wd-6G for tpmdd-devel@lists.sourceforge.net; Wed, 07 Sep 2016 11:34:46 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 07 Sep 2016 04:34:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.30,296,1470726000"; d="scan'208"; a="1046753348" Received: from twinkler-lnx.jer.intel.com ([10.12.87.167]) by orsmga002.jf.intel.com with ESMTP; 07 Sep 2016 04:34:38 -0700 From: Tomas Winkler To: tpmdd-devel@lists.sourceforge.net, Jarkko Sakkinen Date: Wed, 7 Sep 2016 14:32:33 +0300 Message-Id: <1473247953-24617-4-git-send-email-tomas.winkler@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473247953-24617-1-git-send-email-tomas.winkler@intel.com> References: <1473247953-24617-1-git-send-email-tomas.winkler@intel.com> X-Headers-End: 1bhb7t-0004wd-6G Subject: [tpmdd-devel] [PATCH 3/3] tpm/tpm_crb: cache cmd_size register value. X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Virus-Scanned: ClamAV using ClamSMTP Instead of expensive register access on retrieving cmd_size on each send, save the value during initialization in the private context. The value doesn't change. Signed-off-by: Tomas Winkler Reviewed-by: Jarkko Sakkinen Tested-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_crb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index cf9aab698dfe..f8c9d587029b 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -81,6 +81,7 @@ struct crb_priv { struct crb_control_area __iomem *cca; u8 __iomem *cmd; u8 __iomem *rsp; + u32 cmd_size; }; /** @@ -217,11 +218,9 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len) struct crb_priv *priv = dev_get_drvdata(&chip->dev); int rc = 0; - if (len > ioread32(&priv->cca->cmd_size)) { - dev_err(&chip->dev, - "invalid command count value %x %zx\n", - (unsigned int) len, - (size_t) ioread32(&priv->cca->cmd_size)); + if (len > priv->cmd_size) { + dev_err(&chip->dev, "invalid command count value %zd %d\n", + len, priv->cmd_size); return -E2BIG; } @@ -374,6 +373,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, ret = PTR_ERR(priv->cmd); goto out; } + priv->cmd_size = cmd_size; memcpy_fromio(&rsp_pa, &priv->cca->rsp_pa, 8); rsp_pa = le64_to_cpu(rsp_pa);