* [PATCH][V2] of/address: check for invalid range.cpu_addr
@ 2020-08-13 11:43 ` Colin King
0 siblings, 0 replies; 4+ messages in thread
From: Colin King @ 2020-08-13 11:43 UTC (permalink / raw
To: Rob Herring, Frank Rowand, devicetree; +Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently invalid CPU addresses are not being sanity checked resulting in
SATA setup failure on a SynQuacer SC2A11 development machine. The original
check was removed by and earlier commit, so add a sanity check back in
to avoid this regression.
Fixes: 7a8b64d17e35 ("of/address: use range parser for of_dma_get_range")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/of/address.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 590493e04b01..6ffbf7b99e92 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -985,6 +985,10 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
/* Don't error out as we'd break some existing DTs */
continue;
}
+ if (range.cpu_addr == OF_BAD_ADDR) {
+ pr_err("Translation of CPU address failed on node (%pOF)\n", node);
+ continue;
+ }
dma_offset = range.cpu_addr - range.bus_addr;
/* Take lower and upper limits */
--
V2: print message using pr_err and don't print range.cpu_addr as it's always
going to be OF_BAD_ADDR so the information is pointless.
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH][V2] of/address: check for invalid range.cpu_addr
@ 2020-08-13 11:43 ` Colin King
0 siblings, 0 replies; 4+ messages in thread
From: Colin King @ 2020-08-13 11:43 UTC (permalink / raw
To: Rob Herring, Frank Rowand, devicetree; +Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently invalid CPU addresses are not being sanity checked resulting in
SATA setup failure on a SynQuacer SC2A11 development machine. The original
check was removed by and earlier commit, so add a sanity check back in
to avoid this regression.
Fixes: 7a8b64d17e35 ("of/address: use range parser for of_dma_get_range")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/of/address.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 590493e04b01..6ffbf7b99e92 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -985,6 +985,10 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
/* Don't error out as we'd break some existing DTs */
continue;
}
+ if (range.cpu_addr = OF_BAD_ADDR) {
+ pr_err("Translation of CPU address failed on node (%pOF)\n", node);
+ continue;
+ }
dma_offset = range.cpu_addr - range.bus_addr;
/* Take lower and upper limits */
--
V2: print message using pr_err and don't print range.cpu_addr as it's always
going to be OF_BAD_ADDR so the information is pointless.
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH][V2] of/address: check for invalid range.cpu_addr
2020-08-13 11:43 ` Colin King
@ 2020-08-14 19:48 ` Rob Herring
-1 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2020-08-14 19:48 UTC (permalink / raw
To: Colin King
Cc: Frank Rowand, devicetree, kernel-janitors,
linux-kernel@vger.kernel.org
On Thu, Aug 13, 2020 at 5:43 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently invalid CPU addresses are not being sanity checked resulting in
> SATA setup failure on a SynQuacer SC2A11 development machine. The original
> check was removed by and earlier commit, so add a sanity check back in
> to avoid this regression.
>
> Fixes: 7a8b64d17e35 ("of/address: use range parser for of_dma_get_range")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/of/address.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 590493e04b01..6ffbf7b99e92 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -985,6 +985,10 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
> /* Don't error out as we'd break some existing DTs */
> continue;
> }
> + if (range.cpu_addr == OF_BAD_ADDR) {
> + pr_err("Translation of CPU address failed on node (%pOF)\n", node);
> + continue;
> + }
> dma_offset = range.cpu_addr - range.bus_addr;
>
> /* Take lower and upper limits */
> --
>
> V2: print message using pr_err and don't print range.cpu_addr as it's always
> going to be OF_BAD_ADDR so the information is pointless.
Shouldn't we print the bus_addr like the original message did?
Otherwise, we don't really know what entry is problematic.
Rob
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][V2] of/address: check for invalid range.cpu_addr
@ 2020-08-14 19:48 ` Rob Herring
0 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2020-08-14 19:48 UTC (permalink / raw
To: Colin King
Cc: Frank Rowand, devicetree, kernel-janitors,
linux-kernel@vger.kernel.org
On Thu, Aug 13, 2020 at 5:43 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently invalid CPU addresses are not being sanity checked resulting in
> SATA setup failure on a SynQuacer SC2A11 development machine. The original
> check was removed by and earlier commit, so add a sanity check back in
> to avoid this regression.
>
> Fixes: 7a8b64d17e35 ("of/address: use range parser for of_dma_get_range")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/of/address.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 590493e04b01..6ffbf7b99e92 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -985,6 +985,10 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
> /* Don't error out as we'd break some existing DTs */
> continue;
> }
> + if (range.cpu_addr = OF_BAD_ADDR) {
> + pr_err("Translation of CPU address failed on node (%pOF)\n", node);
> + continue;
> + }
> dma_offset = range.cpu_addr - range.bus_addr;
>
> /* Take lower and upper limits */
> --
>
> V2: print message using pr_err and don't print range.cpu_addr as it's always
> going to be OF_BAD_ADDR so the information is pointless.
Shouldn't we print the bus_addr like the original message did?
Otherwise, we don't really know what entry is problematic.
Rob
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-14 19:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-13 11:43 [PATCH][V2] of/address: check for invalid range.cpu_addr Colin King
2020-08-13 11:43 ` Colin King
2020-08-14 19:48 ` Rob Herring
2020-08-14 19:48 ` Rob Herring
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.