arm64: map FDT as RW for early_init_dt_scan()
Subsystems (2)
PATCH 1/1 arm64: map FDT as RW for early_init_dt_scan()
From: Hsin-Yi Wang <[email protected]>
commit e112b032a72c78f15d0c803c5dc6be444c2e6c66 upstream.
Currently in arm64, FDT is mapped to RO before it's passed to early_init_dt_scan(). However, there might be some codes (eg. commit "fdt: add support for rng-seed") that need to modify FDT during init. Map FDT to RO after early fixups are done.
--- arch/arm64/include/asm/mmu.h | 2 +- arch/arm64/kernel/kaslr.c | 5 +---- arch/arm64/kernel/setup.c | 9 ++++++++- arch/arm64/mm/mmu.c | 15 +-------------- 4 files changed, 11 insertions(+), 20 deletions(-)
arch/arm64/include/asm/mmu.h +1 -1
@@ -91,7 +91,7 @@ extern void init_mem_pgprot(void);extern void create_pgd_mapping (struct mm_struct *mm,phys_addr_t phys,unsigned long virt,phys_addr_t size,pgprot_t prot,bool page_mappings_only); -extern void *fixmap_remap_fdt (phys_addr_t dt_phys); +extern void *fixmap_remap_fdt (phys_addr_t dt_phys,int *size,pgprot_t prot);extern void mark_linear_text_alias_ro (void );#endif /* !__ASSEMBLY__ */
arch/arm64/kernel/kaslr.c +1 -4
@@ -65,9 +65,6 @@ static __init const u8 *kaslr_get_cmdline(void *fdt)return default_cmdline; } -extern void *__init __fixmap_remap_fdt (phys_addr_t dt_phys,int *size, -pgprot_t prot); -/* * This routine will be executed with the kernel mapped at its default virtual * address, and if it returns successfully, the kernel will be remapped, and
@@ -96,7 +93,7 @@ u64 __init kaslr_early_init(u64 dt_phys)* attempt at mapping the FDT in setup_machine() */ early_fixmap_init (); - fdt =__fixmap_remap_fdt (dt_phys, &size,PAGE_KERNEL ); + fdt =fixmap_remap_fdt (dt_phys, &size,PAGE_KERNEL );if (!fdt)return 0 ;
arch/arm64/kernel/setup.c +8 -1
@@ -179,9 +179,13 @@ static void __init smp_build_mpidr_hash(void)static void __init setup_machine_fdt (phys_addr_t dt_phys) { -void *dt_virt =fixmap_remap_fdt (dt_phys); +int size; +void *dt_virt =fixmap_remap_fdt (dt_phys, &size,PAGE_KERNEL );const char *name; +if (dt_virt) +memblock_reserve (dt_phys, size); +if (!dt_virt || !early_init_dt_scan (dt_virt)) {pr_crit ("\n" "Error: invalid device tree blob at physical address %pa (virtual address 0x%p)\n"
@@ -193,6 +197,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)cpu_relax (); } +/* Early fixups are done, map the FDT as read-only now */ +fixmap_remap_fdt (dt_phys, &size,PAGE_KERNEL_RO ); + name =of_flat_dt_get_machine_name ();if (!name)return ;
arch/arm64/mm/mmu.c +1 -14
@@ -836,7 +836,7 @@ void __set_fixmap(enum fixed_addresses idx, } } -void *__init __fixmap_remap_fdt (phys_addr_t dt_phys,int *size,pgprot_t prot) +void *__init fixmap_remap_fdt (phys_addr_t dt_phys,int *size,pgprot_t prot) {const u64 dt_virt_base =__fix_to_virt (FIX_FDT );int offset;
@@ -889,19 +889,6 @@ void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot)return dt_virt; } -void *__init fixmap_remap_fdt (phys_addr_t dt_phys) -{ -void *dt_virt; -int size; - - dt_virt =__fixmap_remap_fdt (dt_phys, &size,PAGE_KERNEL_RO ); -if (!dt_virt) -return NULL ; - -memblock_reserve (dt_phys, size); -return dt_virt; -} -int __init arch_ioremap_pud_supported (void ) {/*
Signature · 1 line
2.37.3
Greg KH
maintainerQuoted 16 lines · Michael Bestas
From: Hsin-Yi Wang <[email protected]>
commit
e112b032a72c78f15d0c803c5dc6be444c2e6c66upstream.Currently in arm64, FDT is mapped to RO before it's passed to
early_init_dt_scan(). However, there might be some codes (eg. commit "fdt: add support for rng-seed") that need to modify FDT during init. Map FDT to RO after early fixups are done.Cc [email protected] # 4.14Signed-off-by Hsin-Yi Wang <[email protected]>Reviewed-by Stephen Boyd <[email protected]>Reviewed-by Mike Rapoport <[email protected]>Signed-off-by Will Deacon <[email protected]>[mkbestas: fixed trivial conflicts for 4.14 backport]Signed-off-by Michael Bestas <[email protected]>
Quoted 7 lines
--- arch/arm64/include/asm/mmu.h | 2 +- arch/arm64/kernel/kaslr.c | 5 +---- arch/arm64/kernel/setup.c | 9 ++++++++- arch/arm64/mm/mmu.c | 15 +-------------- 4 files changed, 11 insertions(+), 20 deletions(-)
Both now queued up, thanks.
greg k-h
Quoted 3 lines · On Thu, 1 Sep 2022 11:57:55 +0200 Greg KH <[email protected]> wrote:
Both now queued up, thanks.
greg k-h
Could you also queue the 4.9 patch or I need to send it again?
https://lore.kernel.org/all/[email protected]/
Thanks,
Michael Bestas
Greg KH
maintainerQuoted 9 lines · Michael Bestas
Quoted 3 lines · On Thu, 1 Sep 2022 11:57:55 +0200 Greg KH <[email protected]> wrote:
Both now queued up, thanks.
greg k-h
Could you also queue the 4.9 patch or I need to send it again?
https://lore.kernel.org/all/[email protected]/
Ah, thanks for pointing that out, it was long-gone from my queue. Now added.
greg k-h