Skip to content

Commit 6d51bf8

Browse files
Gu Zitaoopsiff
authored andcommitted
sw64: adapt to the upstream changes in early_init_dt_(scan/verify)
Fix it according to upstream commit b2473a3 ("of/fdt: add dt_phys arg to early_init_dt_scan and early_init_dt_verify"). Signed-off-by: Gu Zitao <guzitao@wxiat.com> Reviewed-by: He Sheng <hesheng@wxiat.com> Signed-off-by: Gu Zitao <guzitao@wxiat.com> (cherry picked from commit e985389)
1 parent a885a9d commit 6d51bf8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/sw_64/kernel/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ static void __init setup_firmware_fdt(void)
483483
memblock_reserve(__boot_pa(dt_virt), fdt_totalsize(dt_virt));
484484

485485
if (!arch_dtb_verify(dt_virt, true) ||
486-
!early_init_dt_scan(dt_virt)) {
486+
!early_init_dt_scan(dt_virt, __boot_pa(dt_virt))) {
487487
pr_crit("Invalid DTB(from firmware) at virtual address 0x%lx\n",
488488
(unsigned long)dt_virt);
489489

@@ -578,7 +578,7 @@ static void __init setup_builtin_fdt(void)
578578

579579
dt_virt = (void *)__dtb_start;
580580
if (!arch_dtb_verify(dt_virt, false) ||
581-
!early_init_dt_verify(dt_virt)) {
581+
!early_init_dt_verify(dt_virt, __boot_pa(dt_virt))) {
582582
pr_crit("Invalid DTB(built-in) at virtual address 0x%lx\n",
583583
(unsigned long)dt_virt);
584584
while (true)

0 commit comments

Comments
 (0)