Commit 7559d9f9 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon

arm64: setup: drop early FDT pointer helpers

We no longer need to call into the kernel to map the FDT before calling
into the kernel so let's drop the helpers we added for this.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220624150651.1358849-22-ardb@kernel.orgSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent aacd149b
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
#include <uapi/asm/setup.h> #include <uapi/asm/setup.h>
void *get_early_fdt_ptr(void);
void early_fdt_map(u64 dt_phys);
/* /*
* These two variables are used in the head.S file. * These two variables are used in the head.S file.
*/ */
......
...@@ -446,8 +446,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) ...@@ -446,8 +446,6 @@ SYM_FUNC_START_LOCAL(__primary_switched)
#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
bl kasan_early_init bl kasan_early_init
#endif #endif
mov x0, x21 // pass FDT address in x0
bl early_fdt_map // Try mapping the FDT early
mov x0, x22 // pass FDT address in x0 mov x0, x22 // pass FDT address in x0
bl init_feature_override // Parse cpu feature overrides bl init_feature_override // Parse cpu feature overrides
mov x0, x20 mov x0, x20
......
...@@ -163,21 +163,6 @@ static void __init smp_build_mpidr_hash(void) ...@@ -163,21 +163,6 @@ static void __init smp_build_mpidr_hash(void)
pr_warn("Large number of MPIDR hash buckets detected\n"); pr_warn("Large number of MPIDR hash buckets detected\n");
} }
static void *early_fdt_ptr __initdata;
void __init *get_early_fdt_ptr(void)
{
return early_fdt_ptr;
}
asmlinkage void __init early_fdt_map(u64 dt_phys)
{
int fdt_size;
early_fixmap_init();
early_fdt_ptr = fixmap_remap_fdt(dt_phys, &fdt_size, PAGE_KERNEL);
}
static void __init setup_machine_fdt(phys_addr_t dt_phys) static void __init setup_machine_fdt(phys_addr_t dt_phys)
{ {
int size; int size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment