* [PATCH] of/address: check for invalid range.cpu_addr
@ 2020-08-10 14:06 Colin King
2020-08-12 7:32 ` Colin Ian King
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2020-08-10 14:06 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 | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 590493e04b01..764c8b94ec35 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -985,6 +985,11 @@ 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_warn("Translation of DMA address (%llx) to CPU address failed on node (%pOF)\n",
+ range.cpu_addr, node);
+ continue;
+ }
dma_offset = range.cpu_addr - range.bus_addr;
/* Take lower and upper limits */
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] of/address: check for invalid range.cpu_addr
2020-08-10 14:06 [PATCH] of/address: check for invalid range.cpu_addr Colin King
@ 2020-08-12 7:32 ` Colin Ian King
2020-08-12 16:23 ` Rob Herring
0 siblings, 1 reply; 3+ messages in thread
From: Colin Ian King @ 2020-08-12 7:32 UTC (permalink / raw)
To: Rob Herring, Frank Rowand, devicetree; +Cc: linux-kernel
On 10/08/2020 15:06, Colin King 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 | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 590493e04b01..764c8b94ec35 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -985,6 +985,11 @@ 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_warn("Translation of DMA address (%llx) to CPU address failed on node (%pOF)\n",
> + range.cpu_addr, node);
> + continue;
> + }
> dma_offset = range.cpu_addr - range.bus_addr;
>
> /* Take lower and upper limits */
>
Hi there, any follow up on this fix? (reviews. etc?)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] of/address: check for invalid range.cpu_addr
2020-08-12 7:32 ` Colin Ian King
@ 2020-08-12 16:23 ` Rob Herring
0 siblings, 0 replies; 3+ messages in thread
From: Rob Herring @ 2020-08-12 16:23 UTC (permalink / raw)
To: Colin Ian King; +Cc: Frank Rowand, devicetree, linux-kernel
On Wed, Aug 12, 2020 at 1:32 AM Colin Ian King <colin.king@canonical.com> wrote:
>
> On 10/08/2020 15:06, Colin King 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 | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/of/address.c b/drivers/of/address.c
> > index 590493e04b01..764c8b94ec35 100644
> > --- a/drivers/of/address.c
> > +++ b/drivers/of/address.c
> > @@ -985,6 +985,11 @@ 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_warn("Translation of DMA address (%llx) to CPU address failed on node (%pOF)\n",
The original was pr_err, and this is an error which shouldn't happen.
> > + range.cpu_addr, node);
text says DMA addr, but this is the CPU addr.
> > + continue;
> > + }
> > dma_offset = range.cpu_addr - range.bus_addr;
> >
> > /* Take lower and upper limits */
> >
>
> Hi there, any follow up on this fix? (reviews. etc?)
It's been 2 days and it's the middle of the merge window...
Also, is the DT in question upstream and fixed?
Rob
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-12 16:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-10 14:06 [PATCH] of/address: check for invalid range.cpu_addr Colin King
2020-08-12 7:32 ` Colin Ian King
2020-08-12 16:23 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).