| Message ID | 20200819072220.46649-2-colin.king@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix SATA DMA config issues on Synquacer ARM64 platform | expand |
On 19.08.20 09:22, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1892138 > > 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> > Link: https://lore.kernel.org/r/20200817113208.523805-1-colin.king@canonical.com > Signed-off-by: Rob Herring <robh@kernel.org> > (cherry picked from commit f49c7faf776f16607c948d852a03b04a88c3b583 linux-next) Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- You may add your name again here, even though you originally fixed it. ;) -Stefan > drivers/of/address.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 590493e04b01..945b3d785f44 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_err("translation of DMA address(%llx) to CPU address failed node(%pOF)\n", > + range.bus_addr, node); > + continue; > + } > dma_offset = range.cpu_addr - range.bus_addr; > > /* Take lower and upper limits */ >
diff --git a/drivers/of/address.c b/drivers/of/address.c index 590493e04b01..945b3d785f44 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_err("translation of DMA address(%llx) to CPU address failed node(%pOF)\n", + range.bus_addr, node); + continue; + } dma_offset = range.cpu_addr - range.bus_addr; /* Take lower and upper limits */