Skip to content

Commit 7f05e20

Browse files
Andrea della Portarobherring
authored andcommitted
of: address: Preserve the flags portion on 1:1 dma-ranges mapping
A missing or empty dma-ranges in a DT node implies a 1:1 mapping for dma translations. In this specific case, the current behaviour is to zero out the entire specifier so that the translation could be carried on as an offset from zero. This includes address specifier that has flags (e.g. PCI ranges). Once the flags portion has been zeroed, the translation chain is broken since the mapping functions will check the upcoming address specifier against mismatching flags, always failing the 1:1 mapping and its entire purpose of always succeeding. Set to zero only the address portion while passing the flags through. Fixes: dbbdee9 ("of/address: Merge all of the bus translation code") Cc: stable@vger.kernel.org Signed-off-by: Andrea della Porta <andrea.porta@suse.com> Tested-by: Herve Codina <herve.codina@bootlin.com> Link: https://lore.kernel.org/r/e51ae57874e58a9b349c35e2e877425ebc075d7a.1732441813.git.andrea.porta@suse.com Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
1 parent 1a75e81 commit 7f05e20

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/of/address.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,8 @@ static int of_translate_one(const struct device_node *parent, const struct of_bu
459459
}
460460
if (ranges == NULL || rlen == 0) {
461461
offset = of_read_number(addr, na);
462-
memset(addr, 0, pna * 4);
462+
/* set address to zero, pass flags through */
463+
memset(addr + pbus->flag_cells, 0, (pna - pbus->flag_cells) * 4);
463464
pr_debug("empty ranges; 1:1 translation\n");
464465
goto finish;
465466
}

0 commit comments

Comments
 (0)