* [PATCH 1/2] x86, acpi: merge two register_lapic_address() [not found] ` <m1eiee86jg.fsf_-_@fess.ebiederm.org> @ 2010-08-04 21:58 ` Yinghai Lu 2010-08-04 22:00 ` [PATCH 2/2] x86: remove early_init_lapic_mapping Yinghai Lu 0 siblings, 1 reply; 2+ messages in thread From: Yinghai Lu @ 2010-08-04 21:58 UTC (permalink / raw) To: Ingo Molnar, Thomas Renninger, H. Peter Anvin, Len Brown Cc: Eric W. Biederman, linux-kernel@vger.kernel.org, ACPI Devel Maling List They are the same, move it to apic.c Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/include/asm/apic.h | 1 + arch/x86/kernel/acpi/boot.c | 16 ++-------------- arch/x86/kernel/apic/apic.c | 12 ++++++++++++ arch/x86/kernel/mpparse.c | 12 ------------ 4 files changed, 15 insertions(+), 26 deletions(-) Index: linux-2.6/arch/x86/include/asm/apic.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/apic.h +++ linux-2.6/arch/x86/include/asm/apic.h @@ -234,6 +234,7 @@ extern void init_bsp_APIC(void); extern void setup_local_APIC(void); extern void end_local_APIC_setup(void); extern void init_apic_mappings(void); +void smp_register_lapic_address(unsigned long address); extern void setup_boot_APIC_clock(void); extern void setup_secondary_APIC_clock(void); extern int APIC_init_uniprocessor(void); Index: linux-2.6/arch/x86/kernel/acpi/boot.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +++ linux-2.6/arch/x86/kernel/acpi/boot.c @@ -820,18 +820,6 @@ static int __init acpi_parse_fadt(struct * returns 0 on success, < 0 on error */ -static void __init acpi_register_lapic_address(unsigned long address) -{ - mp_lapic_addr = address; - - set_fixmap_nocache(FIX_APIC_BASE, address); - if (boot_cpu_physical_apicid == -1U) { - boot_cpu_physical_apicid = read_apic_id(); - apic_version[boot_cpu_physical_apicid] = - GET_APIC_VERSION(apic_read(APIC_LVR)); - } -} - static int __init early_acpi_parse_madt_lapic_addr_ovr(void) { int count; @@ -853,7 +841,7 @@ static int __init early_acpi_parse_madt_ return count; } - acpi_register_lapic_address(acpi_lapic_addr); + smp_register_lapic_address(acpi_lapic_addr); return count; } @@ -880,7 +868,7 @@ static int __init acpi_parse_madt_lapic_ return count; } - acpi_register_lapic_address(acpi_lapic_addr); + smp_register_lapic_address(acpi_lapic_addr); count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC, acpi_parse_sapic, MAX_APICS); Index: linux-2.6/arch/x86/kernel/apic/apic.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/apic/apic.c +++ linux-2.6/arch/x86/kernel/apic/apic.c @@ -1632,6 +1632,18 @@ void __init init_apic_mappings(void) } } +void __init smp_register_lapic_address(unsigned long address) +{ + mp_lapic_addr = address; + + set_fixmap_nocache(FIX_APIC_BASE, address); + if (boot_cpu_physical_apicid == -1U) { + boot_cpu_physical_apicid = read_apic_id(); + apic_version[boot_cpu_physical_apicid] = + GET_APIC_VERSION(apic_read(APIC_LVR)); + } +} + /* * This initializes the IO-APIC and APIC hardware if this is * a UP kernel. Index: linux-2.6/arch/x86/kernel/mpparse.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/mpparse.c +++ linux-2.6/arch/x86/kernel/mpparse.c @@ -274,18 +274,6 @@ static void __init smp_dump_mptable(stru void __init default_smp_read_mpc_oem(struct mpc_table *mpc) { } -static void __init smp_register_lapic_address(unsigned long address) -{ - mp_lapic_addr = address; - - set_fixmap_nocache(FIX_APIC_BASE, address); - if (boot_cpu_physical_apicid == -1U) { - boot_cpu_physical_apicid = read_apic_id(); - apic_version[boot_cpu_physical_apicid] = - GET_APIC_VERSION(apic_read(APIC_LVR)); - } -} - static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) { char str[16]; ^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] x86: remove early_init_lapic_mapping 2010-08-04 21:58 ` [PATCH 1/2] x86, acpi: merge two register_lapic_address() Yinghai Lu @ 2010-08-04 22:00 ` Yinghai Lu 0 siblings, 0 replies; 2+ messages in thread From: Yinghai Lu @ 2010-08-04 22:00 UTC (permalink / raw) To: Ingo Molnar, Thomas Renninger, H. Peter Anvin, Len Brown Cc: Eric W. Biederman, linux-kernel@vger.kernel.org, ACPI Devel Maling List It is almost the same as smp_register_lapic_addr() Just need to make smp_read_mpc() call smp_register_lapic_addr when early==1. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/include/asm/apic.h | 1 - arch/x86/kernel/apic/apic.c | 24 ++---------------------- arch/x86/kernel/mpparse.c | 8 ++------ arch/x86/mm/k8topology_64.c | 1 - 4 files changed, 4 insertions(+), 30 deletions(-) Index: linux-2.6/arch/x86/mm/k8topology_64.c =================================================================== --- linux-2.6.orig/arch/x86/mm/k8topology_64.c +++ linux-2.6/arch/x86/mm/k8topology_64.c @@ -64,7 +64,6 @@ static __init void early_get_boot_cpu_id if (smp_found_config) early_get_smp_config(); #endif - early_init_lapic_mapping(); } int __init k8_get_nodes(struct bootnode *physnodes) Index: linux-2.6/arch/x86/kernel/apic/apic.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/apic/apic.c +++ linux-2.6/arch/x86/kernel/apic/apic.c @@ -1560,28 +1560,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 */ @@ -1637,6 +1615,8 @@ void __init smp_register_lapic_address(u 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] = Index: linux-2.6/arch/x86/kernel/mpparse.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/mpparse.c +++ linux-2.6/arch/x86/kernel/mpparse.c @@ -288,17 +288,13 @@ static int __init smp_read_mpc(struct mp #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; + smp_register_lapic_address(mpc->lapic); if (early) return 1; - /* Initialize the lapic mapping */ - if (!acpi_lapic) - smp_register_lapic_address(mpc->lapic); - if (mpc->oemptr) x86_init.mpparse.smp_read_mpc_oem(mpc); Index: linux-2.6/arch/x86/include/asm/apic.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/apic.h +++ linux-2.6/arch/x86/include/asm/apic.h @@ -244,7 +244,6 @@ extern void enable_NMI_through_LVT0(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) ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-04 22:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <201008031028.57263.tvrtko.ursulin@sophos.com>
[not found] ` <20100804093623.GE10499@redhat.com>
[not found] ` <m1fwyuacjs.fsf@fess.ebiederm.org>
[not found] ` <201008041146.56406.tvrtko.ursulin@sophos.com>
[not found] ` <m1eiee86jg.fsf_-_@fess.ebiederm.org>
2010-08-04 21:58 ` [PATCH 1/2] x86, acpi: merge two register_lapic_address() Yinghai Lu
2010-08-04 22:00 ` [PATCH 2/2] x86: remove early_init_lapic_mapping Yinghai Lu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).