summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-08-17 14:32:08 +0300
committerRob Herring <robh@kernel.org>2020-08-17 22:30:09 +0300
commitf49c7faf776f16607c948d852a03b04a88c3b583 (patch)
tree79ea9f28d5988d017147c7d74da1f4aafc3a7e6f /drivers/of
parent9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 (diff)
downloadlinux-f49c7faf776f16607c948d852a03b04a88c3b583.tar.xz
of/address: check for invalid range.cpu_addr
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>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/address.c5
1 files changed, 5 insertions, 0 deletions
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 */