Skip to content

Commit 68176d6

Browse files
Alexandre GhitiMikko Salomäki
authored andcommitted
riscv: Fix wrong usage of __pa() on a fixmap address
commit c796e187201242992d6d292bfeff41aadfdf3f29 upstream. riscv uses fixmap addresses to map the dtb so we can't use __pa() which is reserved for linear mapping addresses. Fixes: b2473a359763 ("of/fdt: add dt_phys arg to early_init_dt_scan and early_init_dt_verify") Signed-off-by: Alexandre Ghiti <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: [email protected] Signed-off-by: Palmer Dabbelt <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c679ca2 commit 68176d6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/riscv/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static void __init init_resources(void)
227227
static void __init parse_dtb(void)
228228
{
229229
/* Early scan of device tree from init memory */
230-
if (early_init_dt_scan(dtb_early_va, __pa(dtb_early_va))) {
230+
if (early_init_dt_scan(dtb_early_va, dtb_early_pa)) {
231231
const char *name = of_flat_dt_get_machine_name();
232232

233233
if (name) {

0 commit comments

Comments
 (0)