mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
a4384df3e2
When I introduced the global variable gsi_end I thought gsi_end on io_apics was one past the end of the gsi range for the io_apic. After it was pointed out the the range on io_apics was inclusive I changed my global variable to match. That was a big mistake. Inclusive semantics without a range start cannot describe the case when no gsi's are allocated. Describing the case where no gsi's are allocated is important in sfi.c and mpparse.c so that we can assign gsi numbers instead of blindly copying the gsi assignments the BIOS has done as we do in the acpi case. To keep from getting the global variable confused with the gsi range end rename it gsi_top. To allow describing the case where no gsi's are allocated have gsi_top be one place the highest gsi number seen in the system. This fixes an off by one bug in sfi.c: Reported-by: jacob pan <jacob.jun.pan@linux.intel.com> This fixes the same off by one bug in mpparse.c: This fixes an off unreachable by one bug in acpi/boot.c:irq_to_gsi Reported-by: Yinghai <yinghai.lu@oracle.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> LKML-Reference: <m17hm9jre7.fsf_-_@fess.ebiederm.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
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;
|
|
|
|
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 */
|
|
void __cpuinit mp_sfi_register_lapic(u8 id)
|
|
{
|
|
if (MAX_APICS - id <= 0) {
|
|
pr_warning("Processor #%d invalid (max %d)\n",
|
|
id, MAX_APICS);
|
|
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;
|
|
}
|