diff options
| author | Saurabh Sengar <ssengar@linux.microsoft.com> | 2023-08-25 00:47:36 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-02 21:30:09 +0200 |
| commit | 0d294c8c4efa5c0f283a6dfc82dc014a5dbd9308 (patch) | |
| tree | f37e5408ee0a3ad70c04f10c2bfd8759b68ba540 /arch/x86/kernel/devicetree.c | |
| parent | 24775700eaa93ff83b2a0f1e005879cdf186cdd9 (diff) | |
| download | lwn-0d294c8c4efa5c0f283a6dfc82dc014a5dbd9308.tar.gz lwn-0d294c8c4efa5c0f283a6dfc82dc014a5dbd9308.zip | |
x86/of: Move the x86_flattree_get_config() call out of x86_dtb_init()
Fetching the device tree configuration before initmem_init() is necessary
to allow the parsing of NUMA node information. However moving the entire
x86_dtb_init() call before initmem_init() is not correct as APIC/IO-APIC enumeration
has to be after initmem_init().
Thus, move the x86_flattree_get_config() call out of x86_dtb_init(),
into setup_arch(), to call it before initmem_init(), and
leave the ACPI/IOAPIC registration sequence as-is.
[ mingo: Updated the changelog for clarity. ]
Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lore.kernel.org/r/1692949657-16446-1-git-send-email-ssengar@linux.microsoft.com
Diffstat (limited to 'arch/x86/kernel/devicetree.c')
| -rw-r--r-- | arch/x86/kernel/devicetree.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 87d38f17ff5c..afd09924094e 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -278,7 +278,7 @@ static void __init dtb_apic_setup(void) } #ifdef CONFIG_OF_EARLY_FLATTREE -static void __init x86_flattree_get_config(void) +void __init x86_flattree_get_config(void) { u32 size, map_len; void *dt; @@ -300,14 +300,10 @@ static void __init x86_flattree_get_config(void) unflatten_and_copy_device_tree(); early_memunmap(dt, map_len); } -#else -static inline void x86_flattree_get_config(void) { } #endif void __init x86_dtb_init(void) { - x86_flattree_get_config(); - if (!of_have_populated_dt()) return; |