aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-12-07 03:55:29 -0500
committerThomas Gleixner <tglx@linutronix.de>2010-12-09 15:52:04 -0500
commitf1157141636848f52c5f74040bed0ba355cf59b7 (patch)
tree2e2cde97fe616fea129935d2d2e8742e3fe63f3b
parentc0104d38a740b25662c592c71f6907676510289c (diff)
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: Yinghai 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: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/apic.h1
-rw-r--r--arch/x86/kernel/apic/apic.c24
-rw-r--r--arch/x86/kernel/mpparse.c8
-rw-r--r--arch/x86/mm/amdtopology_64.c1
4 files changed, 4 insertions, 30 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 1cc42cfa1372..5e3969c36d7f 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -245,7 +245,6 @@ extern int apic_force_enable(void);
245 * On 32bit this is mach-xxx local 245 * On 32bit this is mach-xxx local
246 */ 246 */
247#ifdef CONFIG_X86_64 247#ifdef CONFIG_X86_64
248extern void early_init_lapic_mapping(void);
249extern int apic_is_clustered_box(void); 248extern int apic_is_clustered_box(void);
250#else 249#else
251static inline int apic_is_clustered_box(void) 250static inline int apic_is_clustered_box(void)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index c02bf135de9d..f507f311d44d 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1630,28 +1630,6 @@ no_apic:
1630} 1630}
1631#endif 1631#endif
1632 1632
1633#ifdef CONFIG_X86_64
1634void __init early_init_lapic_mapping(void)
1635{
1636 /*
1637 * If no local APIC can be found then go out
1638 * : it means there is no mpatable and MADT
1639 */
1640 if (!smp_found_config)
1641 return;
1642
1643 set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
1644 apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
1645 APIC_BASE, mp_lapic_addr);
1646
1647 /*
1648 * Fetch the APIC ID of the BSP in case we have a
1649 * default configuration (or the MP table is broken).
1650 */
1651 boot_cpu_physical_apicid = read_apic_id();
1652}
1653#endif
1654
1655/** 1633/**
1656 * init_apic_mappings - initialize APIC mappings 1634 * init_apic_mappings - initialize APIC mappings
1657 */ 1635 */
@@ -1707,6 +1685,8 @@ void __init register_lapic_address(unsigned long address)
1707 mp_lapic_addr = address; 1685 mp_lapic_addr = address;
1708 1686
1709 set_fixmap_nocache(FIX_APIC_BASE, address); 1687 set_fixmap_nocache(FIX_APIC_BASE, address);
1688 apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
1689 APIC_BASE, mp_lapic_addr);
1710 if (boot_cpu_physical_apicid == -1U) { 1690 if (boot_cpu_physical_apicid == -1U) {
1711 boot_cpu_physical_apicid = read_apic_id(); 1691 boot_cpu_physical_apicid = read_apic_id();
1712 apic_version[boot_cpu_physical_apicid] = 1692 apic_version[boot_cpu_physical_apicid] =
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index db0b70317949..27ccb7075342 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -289,17 +289,13 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
289#ifdef CONFIG_X86_32 289#ifdef CONFIG_X86_32
290 generic_mps_oem_check(mpc, oem, str); 290 generic_mps_oem_check(mpc, oem, str);
291#endif 291#endif
292 /* save the local APIC address, it might be non-default */ 292 /* Initialize the lapic mapping */
293 if (!acpi_lapic) 293 if (!acpi_lapic)
294 mp_lapic_addr = mpc->lapic; 294 register_lapic_address(mpc->lapic);
295 295
296 if (early) 296 if (early)
297 return 1; 297 return 1;
298 298
299 /* Initialize the lapic mapping */
300 if (!acpi_lapic)
301 register_lapic_address(mpc->lapic);
302
303 if (mpc->oemptr) 299 if (mpc->oemptr)
304 x86_init.mpparse.smp_read_mpc_oem(mpc); 300 x86_init.mpparse.smp_read_mpc_oem(mpc);
305 301
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
index 51fae9cfdecb..08a0069b87a5 100644
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@ -66,7 +66,6 @@ static __init void early_get_boot_cpu_id(void)
66 if (smp_found_config) 66 if (smp_found_config)
67 early_get_smp_config(); 67 early_get_smp_config();
68#endif 68#endif
69 early_init_lapic_mapping();
70} 69}
71 70
72int __init amd_get_nodes(struct bootnode *physnodes) 71int __init amd_get_nodes(struct bootnode *physnodes)