Skip to content

Commit e7ce1ec

Browse files
Alexandre Ghitismb49
authored andcommitted
riscv: Fix wrong usage of __pa() on a fixmap address
BugLink: https://bugs.launchpad.net/bugs/2101915 commit c796e18 upstream. riscv uses fixmap addresses to map the dtb so we can't use __pa() which is reserved for linear mapping addresses. Fixes: b2473a3 ("of/fdt: add dt_phys arg to early_init_dt_scan and early_init_dt_verify") Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com> Link: https://lore.kernel.org/r/20241209074508.53037-1-alexghiti@rivosinc.com Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit aa9b1d0d6a5b45dc16191e1b1c6851fe52e5a1db linux-6.6.y) [koichiroden: follow-up fix from v6.6.67] Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 498d812 commit e7ce1ec

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)