Skip to content

Commit 7559d9f

Browse files
ardbiesheuvelwilldeacon
authored andcommitted
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: Ard Biesheuvel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent aacd149 commit 7559d9f

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

arch/arm64/include/asm/setup.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
#include <uapi/asm/setup.h>
77

8-
void *get_early_fdt_ptr(void);
9-
void early_fdt_map(u64 dt_phys);
10-
118
/*
129
* These two variables are used in the head.S file.
1310
*/

arch/arm64/kernel/head.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,6 @@ SYM_FUNC_START_LOCAL(__primary_switched)
446446
#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
447447
bl kasan_early_init
448448
#endif
449-
mov x0, x21 // pass FDT address in x0
450-
bl early_fdt_map // Try mapping the FDT early
451449
mov x0, x22 // pass FDT address in x0
452450
bl init_feature_override // Parse cpu feature overrides
453451
mov x0, x20

arch/arm64/kernel/setup.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,21 +163,6 @@ static void __init smp_build_mpidr_hash(void)
163163
pr_warn("Large number of MPIDR hash buckets detected\n");
164164
}
165165

166-
static void *early_fdt_ptr __initdata;
167-
168-
void __init *get_early_fdt_ptr(void)
169-
{
170-
return early_fdt_ptr;
171-
}
172-
173-
asmlinkage void __init early_fdt_map(u64 dt_phys)
174-
{
175-
int fdt_size;
176-
177-
early_fixmap_init();
178-
early_fdt_ptr = fixmap_remap_fdt(dt_phys, &fdt_size, PAGE_KERNEL);
179-
}
180-
181166
static void __init setup_machine_fdt(phys_addr_t dt_phys)
182167
{
183168
int size;

0 commit comments

Comments
 (0)