Commit a91bf718 authored Aug 12, 2016 by Baoquan He Committed by Ingo Molnar Aug 15, 2016

x86/mm/numa: Open code function early_get_boot_cpu_id()



Previously early_acpi_boot_init() was called in early_get_boot_cpu_id()
to get the value for boot_cpu_physical_apicid. Now early_acpi_boot_init()
has been taken out and moved to setup_arch(), the name of
early_get_boot_cpu_id() doesn't match its implementation anymore, and
only the getting boot-time SMP configuration code was left.

So in this patch we open code it.

Also move the smp_found_config check into default_get_smp_config to
simplify code, because both early_get_smp_config() and get_smp_config()
call x86_init.mpparse.get_smp_config().

Also remove the redundent CONFIG_X86_MPPARSE #ifdef check when we call
early_get_smp_config().

Signed-off-by: Baoquan He <bhe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-acpi@vger.kernel.org
Cc: rjw@rjwysocki.net
Link: http://lkml.kernel.org/r/1470985033-22493-1-git-send-email-bhe@redhat.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 118253a5

arch/x86/kernel/mpparse.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -499,6 +499,9 @@ void __init default_get_smp_config(unsigned int early)
		{
		struct mpf_intel *mpf = mpf_found;

		if (!smp_found_config)
		return;

		if (!mpf)
		return;

arch/x86/kernel/setup.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1221,7 +1221,6 @@ void __init setup_arch(char **cmdline_p)
		/*
		* get boot-time SMP configuration:
		*/
		if (smp_found_config)
		get_smp_config();

		prefill_possible_map();

arch/x86/mm/amdtopology.c

+5 −17

Original line number	Diff line number	Diff line
		@@ -52,21 +52,6 @@ static __init int find_northbridge(void)
		return -ENOENT;
		}

		static __init void early_get_boot_cpu_id(void)
		{
		/*
		* need to get the APIC ID of the BSP so can use that to
		* create apicid_to_node in amd_scan_nodes()
		*/
		#ifdef CONFIG_X86_MPPARSE
		/*
		* get boot-time SMP configuration:
		*/
		if (smp_found_config)
		early_get_smp_config();
		#endif
		}

		int __init amd_numa_init(void)
		{
		u64 start = PFN_PHYS(0);
		@@ -180,8 +165,11 @@ int __init amd_numa_init(void)
		cores = 1 << bits;
		apicid_base = 0;

		/* get the APIC ID of the BSP early for systems with apicid lifting */
		early_get_boot_cpu_id();
		/*
		* get boot-time SMP configuration:
		*/
		early_get_smp_config();

		if (boot_cpu_physical_apicid > 0) {
		pr_info("BSP APIC ID: %02x\n", boot_cpu_physical_apicid);
		apicid_base = boot_cpu_physical_apicid;

Admin message