Skip to content

Commit ad9ec26

Browse files
Andrea della Portagregkh
authored andcommitted
of: address: Preserve the flags portion on 1:1 dma-ranges mapping
[ Upstream commit 7f05e20b989ac33c9c0f8c2028ec0a566493548f ] 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: [email protected] Signed-off-by: Andrea della Porta <[email protected]> Tested-by: Herve Codina <[email protected]> Link: https://lore.kernel.org/r/e51ae57874e58a9b349c35e2e877425ebc075d7a.1732441813.git.andrea.porta@suse.com Signed-off-by: Rob Herring (Arm) <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 007662f commit ad9ec26

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
@@ -466,7 +466,8 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
466466
}
467467
if (ranges == NULL || rlen == 0) {
468468
offset = of_read_number(addr, na);
469-
memset(addr, 0, pna * 4);
469+
/* set address to zero, pass flags through */
470+
memset(addr + pbus->flag_cells, 0, (pna - pbus->flag_cells) * 4);
470471
pr_debug("empty ranges; 1:1 translation\n");
471472
goto finish;
472473
}

0 commit comments

Comments
 (0)