Commit 0d294c8c authored by Saurabh Sengar's avatar Saurabh Sengar Committed by Ingo Molnar
Browse files

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: default avatarSaurabh Sengar <ssengar@linux.microsoft.com>
Signed-off-by: default avatarIngo 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
parent 24775700

arch/x86/include/asm/prom.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ static inline void x86_dtb_init(void) { } 
#define of_ioapic 0

#endif



#ifdef CONFIG_OF_EARLY_FLATTREE

void x86_flattree_get_config(void);

#else

static inline void x86_flattree_get_config(void) { }

#endif

extern char cmd_line[COMMAND_LINE_SIZE];



#endif /* __ASSEMBLY__ */

arch/x86/kernel/devicetree.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,8 @@ void __init setup_arch(char **cmdline_p) 


	early_acpi_boot_init();



	x86_flattree_get_config();



	initmem_init();

	dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT);