Commit f1157141 authored by Yinghai Lu's avatar Yinghai Lu Committed by Thomas Gleixner
Browse files

x86, apic: Remove early_init_lapic_mapping() 



It is almost the same as smp_register_lapic_addr(). We just need to
let smp_read_mpc() call smp_register_lapic_addr() when early==1.

Add the apic_printk to smp_register_lapic_address()

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
LKML-Reference: <4CFDF681.3030509@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c0104d38

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ extern int apic_force_enable(void); 
 * On 32bit this is mach-xxx local

 */

#ifdef CONFIG_X86_64

extern void early_init_lapic_mapping(void);

extern int apic_is_clustered_box(void);

#else

static inline int apic_is_clustered_box(void)

arch/x86/kernel/apic/apic.c

+2 −22
Original line number Diff line number Diff line
@@ -1630,28 +1630,6 @@ no_apic: 
}

#endif



#ifdef CONFIG_X86_64

void __init early_init_lapic_mapping(void)

{

	/*

	 * If no local APIC can be found then go out

	 * : it means there is no mpatable and MADT

	 */

	if (!smp_found_config)

		return;



	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);

	apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",

		    APIC_BASE, mp_lapic_addr);



	/*

	 * Fetch the APIC ID of the BSP in case we have a

	 * default configuration (or the MP table is broken).

	 */

	boot_cpu_physical_apicid = read_apic_id();

}

#endif



/**

 * init_apic_mappings - initialize APIC mappings

 */
@@ -1707,6 +1685,8 @@ void __init register_lapic_address(unsigned long address) 
	mp_lapic_addr = address;



	set_fixmap_nocache(FIX_APIC_BASE, address);

	apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",

		    APIC_BASE, mp_lapic_addr);

	if (boot_cpu_physical_apicid == -1U) {

		boot_cpu_physical_apicid  = read_apic_id();

		apic_version[boot_cpu_physical_apicid] =

arch/x86/kernel/mpparse.c

+2 −6
Original line number Diff line number Diff line
@@ -289,17 +289,13 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) 
#ifdef CONFIG_X86_32

	generic_mps_oem_check(mpc, oem, str);

#endif

	/* save the local APIC address, it might be non-default */

	/* Initialize the lapic mapping */

	if (!acpi_lapic)

		mp_lapic_addr = mpc->lapic;

		register_lapic_address(mpc->lapic);



	if (early)

		return 1;



	/* Initialize the lapic mapping */

	if (!acpi_lapic)

		register_lapic_address(mpc->lapic);



	if (mpc->oemptr)

		x86_init.mpparse.smp_read_mpc_oem(mpc);

arch/x86/mm/amdtopology_64.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static __init void early_get_boot_cpu_id(void) 
	if (smp_found_config)

		early_get_smp_config();

#endif

	early_init_lapic_mapping();

}



int __init amd_get_nodes(struct bootnode *physnodes)

CRA Git | Maintained and supported by SUSTech CRA and CCSE