From patchwork Fri Jan 29 07:13:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 575500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 8D59F140C37 for ; Fri, 29 Jan 2016 18:14:46 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1aP3GP-0006wy-VR; Fri, 29 Jan 2016 07:14:37 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1aP3GO-0006wp-SH for tpmdd-devel@lists.sourceforge.net; Fri, 29 Jan 2016 07:14:36 +0000 X-ACL-Warn: Received: from mga09.intel.com ([134.134.136.24]) by sog-mx-4.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1aP3GN-0002Tg-Oo for tpmdd-devel@lists.sourceforge.net; Fri, 29 Jan 2016 07:14:36 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 28 Jan 2016 23:14:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,362,1449561600"; d="scan'208";a="891679758" Received: from mkursul1-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.13.123]) by fmsmga001.fm.intel.com with ESMTP; 28 Jan 2016 23:14:21 -0800 From: Jarkko Sakkinen To: Peter Huewe Date: Thu, 28 Jan 2016 23:13:59 -0800 Message-Id: <1454051639-15961-1-git-send-email-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.7.0.rc3 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1aP3GN-0002Tg-Oo Cc: tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping 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 Control area does not always fall in the range of memory resource given by the ACPI object. This patch fixes the issue by ioremapping the buffers if this is the case. Fixes: bb76f9ba49 ("tpm_crb: Use devm_ioremap_resource") Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_crb.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 8e46e40..a9688c7 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -233,27 +233,23 @@ static int crb_check_resource(struct acpi_resource *ares, void *data) return 1; } -static void __iomem *crb_access(struct device *dev, struct crb_priv *priv, - u64 start, u32 size) +static void __iomem *crb_map_res(struct device *dev, struct crb_priv *priv, + u64 start, u32 size) { - struct resource tmp = {}; - - tmp.start = start; - tmp.end = start + size - 1; - tmp.flags = IORESOURCE_MEM; + struct resource new_res = { + .start = start, + .end = size - 1, + .flags = IORESOURCE_MEM, + }; /* Detect a 64 bit address on a 32 bit system */ - if (start != tmp.start) + if (start != new_res.start) return ERR_PTR(-EINVAL); - if (!resource_contains(&priv->res, &tmp)) { - dev_err(dev, - FW_BUG "TPM2 ACPI sub resource %pR is not in the device's region of %pR\n", - &tmp, &priv->res); - return ERR_PTR(-EINVAL); - } + if (!resource_contains(&priv->res, &new_res)) + return devm_ioremap_resource(dev, &new_res); - return priv->iobase + (tmp.start - priv->res.start); + return priv->iobase + (new_res.start - priv->res.start); } static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, @@ -281,19 +277,19 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, if (IS_ERR(priv->iobase)) return PTR_ERR(priv->iobase); - priv->cca = crb_access(dev, priv, buf->control_address, 0x1000); + priv->cca = crb_map_res(dev, priv, buf->control_address, 0x1000); if (IS_ERR(priv->cca)) return PTR_ERR(priv->cca); - pa = ((u64)ioread32(&priv->cca->cmd_pa_high) << 32) | - (u64)ioread32(&priv->cca->cmd_pa_low); - priv->cmd = crb_access(dev, priv, pa, ioread32(&priv->cca->cmd_size)); + pa = ((u64) ioread32(&priv->cca->cmd_pa_high) << 32) | + (u64) ioread32(&priv->cca->cmd_pa_low); + priv->cmd = crb_map_res(dev, priv, pa, ioread32(&priv->cca->cmd_size)); if (IS_ERR(priv->cmd)) return PTR_ERR(priv->cmd); memcpy_fromio(&pa, &priv->cca->rsp_pa, 8); pa = le64_to_cpu(pa); - priv->rsp = crb_access(dev, priv, pa, ioread32(&priv->cca->rsp_size)); + priv->rsp = crb_map_res(dev, priv, pa, ioread32(&priv->cca->rsp_size)); return PTR_ERR_OR_ZERO(priv->rsp); }