diff options
author | Hsin-Yi Wang <hsinyi@chromium.org> | 2019-08-23 14:24:50 +0800 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2019-08-23 16:39:16 +0100 |
commit | e112b032a72c78f15d0c803c5dc6be444c2e6c66 (patch) | |
tree | 1356af931f59efe60649b3ab929fe822ebfe3e5b /arch/arm64/mm | |
parent | e21a712a9685488f5ce80495b37b9fdbe96c230d (diff) | |
download | linux-e112b032a72c78f15d0c803c5dc6be444c2e6c66.tar.gz linux-e112b032a72c78f15d0c803c5dc6be444c2e6c66.tar.bz2 linux-e112b032a72c78f15d0c803c5dc6be444c2e6c66.zip |
arm64: map FDT as RW for early_init_dt_scan()
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.
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r-- | arch/arm64/mm/mmu.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 750a69dde39b..54e93583085c 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -876,7 +876,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; @@ -929,19 +929,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_p4d_supported(void) { return 0; |