]> git.baikalelectronics.ru Git - kernel.git/commitdiff
of/address: check for invalid range.cpu_addr
authorColin Ian King <colin.king@canonical.com>
Mon, 17 Aug 2020 11:32:08 +0000 (12:32 +0100)
committerRob Herring <robh@kernel.org>
Mon, 17 Aug 2020 19:30:09 +0000 (13:30 -0600)
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: db9d36c5db4a ("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>
drivers/of/address.c

index 590493e04b012ac651ab6a520923e13a0088a496..945b3d785f440eeeeb0b60296e645b9e724b33cd 100644 (file)
@@ -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 */