cb2ded37fd
Found one x2apic pre-enabled system, x2apic_mode suddenly get corrupted after register some cpus, when compiled CONFIG_NR_CPUS=255 instead of 512. It turns out that generic_processor_info() ==> phyid_set(apicid, phys_cpu_present_map) causes the problem. phys_cpu_present_map is sized by MAX_APICS bits, and pre-enabled system some cpus have an apic id > 255. The variable after phys_cpu_present_map may get corrupted silently: ffffffff828e8420 B phys_cpu_present_map ffffffff828e8440 B apic_verbosity ffffffff828e8444 B local_apic_timer_c2_ok ffffffff828e8448 B disable_apic ffffffff828e844c B x2apic_mode ffffffff828e8450 B x2apic_disabled ffffffff828e8454 B num_processors ... Actually phys_cpu_present_map is referenced via apic id, instead index. We should use MAX_LOCAL_APIC instead MAX_APICS. For 64-bit it will be 32768 in all cases. BSS will increase by 4k bytes on 64-bit: text data bss dec filename 21696943 4193748 12787712 38678403 vmlinux.before 21696943 4193748 12791808 38682499 vmlinux.after No change on 32bit. Finally we can remove MAX_APCIS that was rather confusing. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: H. Peter Anvin <hpa@linux.intel.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> LKML-Reference: <4D23BD9C.3070102@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
120 lines
3.1 KiB
C
120 lines
3.1 KiB
C
/*
|
|
* sfi.c - x86 architecture SFI support.
|
|
*
|
|
* Copyright (c) 2009, Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
*/
|
|
|
|
#define KMSG_COMPONENT "SFI"
|
|
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/init.h>
|
|
#include <linux/sfi.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/io_apic.h>
|
|
#include <asm/mpspec.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/apic.h>
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
|
|
|
|
static void __init mp_sfi_register_lapic_address(unsigned long address)
|
|
{
|
|
mp_lapic_addr = address;
|
|
|
|
set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
|
|
if (boot_cpu_physical_apicid == -1U)
|
|
boot_cpu_physical_apicid = read_apic_id();
|
|
|
|
pr_info("Boot CPU = %d\n", boot_cpu_physical_apicid);
|
|
}
|
|
|
|
/* All CPUs enumerated by SFI must be present and enabled */
|
|
static void __cpuinit mp_sfi_register_lapic(u8 id)
|
|
{
|
|
if (MAX_LOCAL_APIC - id <= 0) {
|
|
pr_warning("Processor #%d invalid (max %d)\n",
|
|
id, MAX_LOCAL_APIC);
|
|
return;
|
|
}
|
|
|
|
pr_info("registering lapic[%d]\n", id);
|
|
|
|
generic_processor_info(id, GET_APIC_VERSION(apic_read(APIC_LVR)));
|
|
}
|
|
|
|
static int __init sfi_parse_cpus(struct sfi_table_header *table)
|
|
{
|
|
struct sfi_table_simple *sb;
|
|
struct sfi_cpu_table_entry *pentry;
|
|
int i;
|
|
int cpu_num;
|
|
|
|
sb = (struct sfi_table_simple *)table;
|
|
cpu_num = SFI_GET_NUM_ENTRIES(sb, struct sfi_cpu_table_entry);
|
|
pentry = (struct sfi_cpu_table_entry *)sb->pentry;
|
|
|
|
for (i = 0; i < cpu_num; i++) {
|
|
mp_sfi_register_lapic(pentry->apic_id);
|
|
pentry++;
|
|
}
|
|
|
|
smp_found_config = 1;
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_X86_LOCAL_APIC */
|
|
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
|
|
static int __init sfi_parse_ioapic(struct sfi_table_header *table)
|
|
{
|
|
struct sfi_table_simple *sb;
|
|
struct sfi_apic_table_entry *pentry;
|
|
int i, num;
|
|
|
|
sb = (struct sfi_table_simple *)table;
|
|
num = SFI_GET_NUM_ENTRIES(sb, struct sfi_apic_table_entry);
|
|
pentry = (struct sfi_apic_table_entry *)sb->pentry;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
mp_register_ioapic(i, pentry->phys_addr, gsi_top);
|
|
pentry++;
|
|
}
|
|
|
|
WARN(pic_mode, KERN_WARNING
|
|
"SFI: pic_mod shouldn't be 1 when IOAPIC table is present\n");
|
|
pic_mode = 0;
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_X86_IO_APIC */
|
|
|
|
/*
|
|
* sfi_platform_init(): register lapics & io-apics
|
|
*/
|
|
int __init sfi_platform_init(void)
|
|
{
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
mp_sfi_register_lapic_address(sfi_lapic_addr);
|
|
sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus);
|
|
#endif
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
sfi_table_parse(SFI_SIG_APIC, NULL, NULL, sfi_parse_ioapic);
|
|
#endif
|
|
return 0;
|
|
}
|