Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1321522 > unrolled thread

[PATCH] tpm, tpm_crb: fix control area resource mapping

Started byJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
First post2016-01-29 08:20 +0100
Last post2016-01-29 23:30 +0100
Articles 6 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] tpm, tpm_crb: fix control area resource mapping Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-01-29 08:20 +0100
    Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource  mapping Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-01-29 21:50 +0100
      Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource  mapping Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-01-29 23:30 +0100
        Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource  mapping Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-01-29 23:40 +0100
        Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource  mapping Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-01-29 23:40 +0100
      Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource  mapping Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-01-29 23:30 +0100

#1321522 — [PATCH] tpm, tpm_crb: fix control area resource mapping

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-01-29 08:20 +0100
Subject[PATCH] tpm, tpm_crb: fix control area resource mapping
Message-ID<qWbvA-7JV-17@gated-at.bofh.it>
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 <jarkko.sakkinen@linux.intel.com>
---
 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);
 }
 
-- 
2.7.0.rc3

[toc] | [next] | [standalone]

#1322065 — Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping

FromJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Date2016-01-29 21:50 +0100
SubjectRe: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping
Message-ID<qWo9s-eo-7@gated-at.bofh.it>
In reply to#1321522
On Thu, Jan 28, 2016 at 11:13:59PM -0800, Jarkko Sakkinen wrote:

> -	struct resource tmp = {};
> -
> -	tmp.start = start;
> -	tmp.end = start + size - 1;
> -	tmp.flags = IORESOURCE_MEM;
> +	struct resource new_res = {
> +		.start	= start,
> +		.end	= size - 1,

That isn't right.

Jason

[toc] | [prev] | [next] | [standalone]

#1322130 — Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-01-29 23:30 +0100
SubjectRe: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping
Message-ID<qWpIe-1q3-9@gated-at.bofh.it>
In reply to#1322065
On Fri, Jan 29, 2016 at 02:21:08PM -0800, Jarkko Sakkinen wrote:
> On Fri, Jan 29, 2016 at 01:48:27PM -0700, Jason Gunthorpe wrote:
> > On Thu, Jan 28, 2016 at 11:13:59PM -0800, Jarkko Sakkinen wrote:
> > 
> > > -	struct resource tmp = {};
> > > -
> > > -	tmp.start = start;
> > > -	tmp.end = start + size - 1;
> > > -	tmp.flags = IORESOURCE_MEM;
> > > +	struct resource new_res = {
> > > +		.start	= start,
> > > +		.end	= size - 1,
> > 
> > That isn't right.
> 
> Whoops. Good catch, I'll update it before pull request. Thanks!

github.com/jsakkine/linux-tpmdd/commit/5012960093774c49d81c612eb32f92cfa1f619bc

struct resource new_res = {
	.start	= start,
	.end	= start + size - 1,
	.flags	= IORESOURCE_MEM,
};

Better?

/Jarkko

[toc] | [prev] | [next] | [standalone]

#1322135 — Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-01-29 23:40 +0100
SubjectRe: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping
Message-ID<qWpRT-1uc-7@gated-at.bofh.it>
In reply to#1322130
On Fri, Jan 29, 2016 at 03:33:34PM -0700, Jason Gunthorpe wrote:
> On Fri, Jan 29, 2016 at 02:26:54PM -0800, Jarkko Sakkinen wrote:
> > On Fri, Jan 29, 2016 at 02:21:08PM -0800, Jarkko Sakkinen wrote:
> > > On Fri, Jan 29, 2016 at 01:48:27PM -0700, Jason Gunthorpe wrote:
> > > > On Thu, Jan 28, 2016 at 11:13:59PM -0800, Jarkko Sakkinen wrote:
> > > > 
> > > > > -	struct resource tmp = {};
> > > > > -
> > > > > -	tmp.start = start;
> > > > > -	tmp.end = start + size - 1;
> > > > > -	tmp.flags = IORESOURCE_MEM;
> > > > > +	struct resource new_res = {
> > > > > +		.start	= start,
> > > > > +		.end	= size - 1,
> > > > 
> > > > That isn't right.
> > > 
> > > Whoops. Good catch, I'll update it before pull request. Thanks!
> > 
> > github.com/jsakkine/linux-tpmdd/commit/5012960093774c49d81c612eb32f92cfa1f619bc
> > 
> > struct resource new_res = {
> > 	.start	= start,
> > 	.end	= start + size - 1,
> > 	.flags	= IORESOURCE_MEM,
> > };
> > 
> > Better?
> 
> Yes that looks ok

Thanks. To be extra sure I'll run smoke test and inject prints.

Acked-by?

> Jason

/Jarkko

[toc] | [prev] | [next] | [standalone]

#1322145 — Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping

FromJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Date2016-01-29 23:40 +0100
SubjectRe: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping
Message-ID<qWpRT-1uc-9@gated-at.bofh.it>
In reply to#1322130
On Fri, Jan 29, 2016 at 02:26:54PM -0800, Jarkko Sakkinen wrote:
> On Fri, Jan 29, 2016 at 02:21:08PM -0800, Jarkko Sakkinen wrote:
> > On Fri, Jan 29, 2016 at 01:48:27PM -0700, Jason Gunthorpe wrote:
> > > On Thu, Jan 28, 2016 at 11:13:59PM -0800, Jarkko Sakkinen wrote:
> > > 
> > > > -	struct resource tmp = {};
> > > > -
> > > > -	tmp.start = start;
> > > > -	tmp.end = start + size - 1;
> > > > -	tmp.flags = IORESOURCE_MEM;
> > > > +	struct resource new_res = {
> > > > +		.start	= start,
> > > > +		.end	= size - 1,
> > > 
> > > That isn't right.
> > 
> > Whoops. Good catch, I'll update it before pull request. Thanks!
> 
> github.com/jsakkine/linux-tpmdd/commit/5012960093774c49d81c612eb32f92cfa1f619bc
> 
> struct resource new_res = {
> 	.start	= start,
> 	.end	= start + size - 1,
> 	.flags	= IORESOURCE_MEM,
> };
> 
> Better?

Yes that looks ok

Jason

[toc] | [prev] | [next] | [standalone]

#1322132 — Re: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping

FromJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date2016-01-29 23:30 +0100
SubjectRe: [tpmdd-devel] [PATCH] tpm, tpm_crb: fix control area resource mapping
Message-ID<qWpIe-1q3-11@gated-at.bofh.it>
In reply to#1322065
On Fri, Jan 29, 2016 at 01:48:27PM -0700, Jason Gunthorpe wrote:
> On Thu, Jan 28, 2016 at 11:13:59PM -0800, Jarkko Sakkinen wrote:
> 
> > -	struct resource tmp = {};
> > -
> > -	tmp.start = start;
> > -	tmp.end = start + size - 1;
> > -	tmp.flags = IORESOURCE_MEM;
> > +	struct resource new_res = {
> > +		.start	= start,
> > +		.end	= size - 1,
> 
> That isn't right.

Whoops. Good catch, I'll update it before pull request. Thanks!

> Jason

/Jarkko

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web