| Message ID | 20200817113208.523805-1-colin.king@canonical.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [V3] of/address: check for invalid range.cpu_addr | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 11 lines checked |
On Mon, 17 Aug 2020 12:32:08 +0100, 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> > --- > > 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. > V3: print the bus address to help diagnose issues > > --- > drivers/of/address.c | 5 +++++ > 1 file changed, 5 insertions(+) > Applied, thanks!
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 */