All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
	Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
	Robin Murphy <robin.murphy@arm.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Stefan Wahren <wahrenst@gmx.net>,
	Frank Rowand <frowand.list@gmail.com>,
	Arnd Bergmann <arnd@arndb.de>,
	Marek Vasut <marek.vasut@gmail.com>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Simon Horman <horms+renesas@verge.net.au>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Oza Pawandeep <oza.oza@broadcom.com>
Subject: [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses
Date: Thu, 26 Sep 2019 19:24:55 -0500	[thread overview]
Message-ID: <20190927002455.13169-12-robh@kernel.org> (raw)
In-Reply-To: <20190927002455.13169-1-robh@kernel.org>

of_pci_range_parser_one() has a bug when parsing dma-ranges. When it
translates the parent address (aka cpu address in the code), 'ranges' is
always being used. This happens to work because most users are just 1:1
translation.

Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/of/address.c       | 15 ++++++++++++---
 include/linux/of_address.h |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 5b835d332709..54011a355b81 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -243,6 +243,7 @@ static int parser_init(struct of_pci_range_parser *parser,
 	parser->node = node;
 	parser->pna = of_n_addr_cells(node);
 	parser->np = parser->pna + na + ns;
+	parser->dma = !strcmp(name, "dma-ranges");
 
 	parser->range = of_get_property(node, name, &rlen);
 	if (parser->range == NULL)
@@ -281,7 +282,11 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 	range->pci_space = be32_to_cpup(parser->range);
 	range->flags = of_bus_pci_get_flags(parser->range);
 	range->pci_addr = of_read_number(parser->range + 1, ns);
-	range->cpu_addr = of_translate_address(parser->node,
+	if (parser->dma)
+		range->cpu_addr = of_translate_dma_address(parser->node,
+				parser->range + na);
+	else
+		range->cpu_addr = of_translate_address(parser->node,
 				parser->range + na);
 	range->size = of_read_number(parser->range + parser->pna + na, ns);
 
@@ -294,8 +299,12 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 
 		flags = of_bus_pci_get_flags(parser->range);
 		pci_addr = of_read_number(parser->range + 1, ns);
-		cpu_addr = of_translate_address(parser->node,
-				parser->range + na);
+		if (parser->dma)
+			cpu_addr = of_translate_dma_address(parser->node,
+					parser->range + na);
+		else
+			cpu_addr = of_translate_address(parser->node,
+					parser->range + na);
 		size = of_read_number(parser->range + parser->pna + na, ns);
 
 		if (flags != range->flags)
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index ddda3936039c..eac7ab109df4 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -12,6 +12,7 @@ struct of_pci_range_parser {
 	const __be32 *end;
 	int np;
 	int pna;
+	bool dma;
 };
 
 struct of_pci_range {
-- 
2.20.1


WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	Arnd Bergmann <arnd@arndb.de>,
	Frank Rowand <frowand.list@gmail.com>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Marek Vasut <marek.vasut@gmail.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Oza Pawandeep <oza.oza@broadcom.com>,
	Stefan Wahren <wahrenst@gmx.net>,
	Simon Horman <horms+renesas@verge.net.au>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Robin Murphy <robin.murphy@arm.com>,
	Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses
Date: Thu, 26 Sep 2019 19:24:55 -0500	[thread overview]
Message-ID: <20190927002455.13169-12-robh@kernel.org> (raw)
In-Reply-To: <20190927002455.13169-1-robh@kernel.org>

of_pci_range_parser_one() has a bug when parsing dma-ranges. When it
translates the parent address (aka cpu address in the code), 'ranges' is
always being used. This happens to work because most users are just 1:1
translation.

Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/of/address.c       | 15 ++++++++++++---
 include/linux/of_address.h |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 5b835d332709..54011a355b81 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -243,6 +243,7 @@ static int parser_init(struct of_pci_range_parser *parser,
 	parser->node = node;
 	parser->pna = of_n_addr_cells(node);
 	parser->np = parser->pna + na + ns;
+	parser->dma = !strcmp(name, "dma-ranges");
 
 	parser->range = of_get_property(node, name, &rlen);
 	if (parser->range == NULL)
@@ -281,7 +282,11 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 	range->pci_space = be32_to_cpup(parser->range);
 	range->flags = of_bus_pci_get_flags(parser->range);
 	range->pci_addr = of_read_number(parser->range + 1, ns);
-	range->cpu_addr = of_translate_address(parser->node,
+	if (parser->dma)
+		range->cpu_addr = of_translate_dma_address(parser->node,
+				parser->range + na);
+	else
+		range->cpu_addr = of_translate_address(parser->node,
 				parser->range + na);
 	range->size = of_read_number(parser->range + parser->pna + na, ns);
 
@@ -294,8 +299,12 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 
 		flags = of_bus_pci_get_flags(parser->range);
 		pci_addr = of_read_number(parser->range + 1, ns);
-		cpu_addr = of_translate_address(parser->node,
-				parser->range + na);
+		if (parser->dma)
+			cpu_addr = of_translate_dma_address(parser->node,
+					parser->range + na);
+		else
+			cpu_addr = of_translate_address(parser->node,
+					parser->range + na);
 		size = of_read_number(parser->range + parser->pna + na, ns);
 
 		if (flags != range->flags)
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index ddda3936039c..eac7ab109df4 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -12,6 +12,7 @@ struct of_pci_range_parser {
 	const __be32 *end;
 	int np;
 	int pna;
+	bool dma;
 };
 
 struct of_pci_range {
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-09-27  0:25 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-27  0:24 [PATCH 00/11] of: dma-ranges fixes and improvements Rob Herring
2019-09-27  0:24 ` Rob Herring
2019-09-27  0:24 ` [PATCH 01/11] of: Remove unused of_find_matching_node_by_address() Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  9:17   ` Geert Uytterhoeven
2019-09-27  9:17     ` Geert Uytterhoeven
2019-09-27  9:17     ` Geert Uytterhoeven
2019-09-30 12:49   ` Christoph Hellwig
2019-09-30 12:49     ` Christoph Hellwig
2019-09-27  0:24 ` [PATCH 02/11] of: Make of_dma_get_range() private Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  9:18   ` Geert Uytterhoeven
2019-09-27  9:18     ` Geert Uytterhoeven
2019-09-27  9:18     ` Geert Uytterhoeven
2019-09-30 12:53   ` Christoph Hellwig
2019-09-30 12:53     ` Christoph Hellwig
2019-09-27  0:24 ` [PATCH 03/11] of: address: Report of_dma_get_range() errors meaningfully Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  9:15   ` Geert Uytterhoeven
2019-09-27  9:15     ` Geert Uytterhoeven
2019-09-27  9:15     ` Geert Uytterhoeven
2019-09-30 12:54   ` Christoph Hellwig
2019-09-30 12:54     ` Christoph Hellwig
2019-09-27  0:24 ` [PATCH 04/11] of/unittest: Add dma-ranges address translation tests Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  0:24 ` [PATCH 05/11] of: Ratify of_dma_configure() interface Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-30 12:57   ` Christoph Hellwig
2019-09-30 12:57     ` Christoph Hellwig
2019-09-30 13:32     ` Nicolas Saenz Julienne
2019-09-30 13:32       ` Nicolas Saenz Julienne
2019-09-30 21:24       ` Rob Herring
2019-09-30 21:24         ` Rob Herring
2019-09-30 21:24         ` Rob Herring
2019-10-01 15:43         ` Nicolas Saenz Julienne
2019-10-01 15:43           ` Nicolas Saenz Julienne
2019-10-01 15:43           ` Nicolas Saenz Julienne
2019-10-04  1:53           ` Rob Herring
2019-10-04  1:53             ` Rob Herring
2019-10-04  1:53             ` Rob Herring
2019-10-07 17:51             ` Nicolas Saenz Julienne
2019-10-07 17:51               ` Nicolas Saenz Julienne
2019-10-07 17:51               ` Nicolas Saenz Julienne
2019-09-27  0:24 ` [PATCH 06/11] of/address: Introduce of_get_next_dma_parent() helper Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  9:24   ` Geert Uytterhoeven
2019-09-27  9:24     ` Geert Uytterhoeven
2019-09-27  9:24     ` Geert Uytterhoeven
2019-09-27  0:24 ` [PATCH 07/11] of: address: Follow DMA parent for "dma-coherent" Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  0:24 ` [PATCH 08/11] of: Factor out #{addr,size}-cells parsing Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  9:27   ` Geert Uytterhoeven
2019-09-27  9:27     ` Geert Uytterhoeven
2019-09-27  9:27     ` Geert Uytterhoeven
2019-09-27  0:24 ` [PATCH 09/11] of: Make of_dma_get_range() work on bus nodes Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  0:24 ` [PATCH 10/11] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' Rob Herring
2019-09-27  0:24   ` Rob Herring
2019-09-27  0:24 ` Rob Herring [this message]
2019-09-27  0:24   ` [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses Rob Herring
2019-09-29 11:16 ` [PATCH 00/11] of: dma-ranges fixes and improvements Arnd Bergmann
2019-09-29 11:16   ` Arnd Bergmann
2019-09-29 11:16   ` Arnd Bergmann
2019-09-30  8:20   ` Christoph Hellwig
2019-09-30  8:20     ` Christoph Hellwig
2019-09-30  8:56     ` Thierry Reding
2019-09-30  8:56       ` Thierry Reding
2019-09-30  9:55       ` Robin Murphy
2019-09-30  9:55         ` Robin Murphy
2019-09-30 13:35         ` Thierry Reding
2019-09-30 13:35           ` Thierry Reding
2019-09-30  9:20 ` Nicolas Saenz Julienne
2019-09-30  9:20   ` Nicolas Saenz Julienne
2019-09-30 12:40 ` Marek Vasut
2019-09-30 12:40   ` Marek Vasut
2019-09-30 12:52   ` Robin Murphy
2019-09-30 12:52     ` Robin Murphy
2019-09-30 12:54     ` Marek Vasut
2019-09-30 12:54       ` Marek Vasut
2019-09-30 13:05       ` Robin Murphy
2019-09-30 13:05         ` Robin Murphy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190927002455.13169-12-robh@kernel.org \
    --to=robh@kernel.org \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=frowand.list@gmail.com \
    --cc=geert+renesas@glider.be \
    --cc=horms+renesas@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=marek.vasut@gmail.com \
    --cc=nsaenzjulienne@suse.de \
    --cc=oza.oza@broadcom.com \
    --cc=robin.murphy@arm.com \
    --cc=wahrenst@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.