x86: add arch-specific SFI support

arch/x86/kernel/sfi.c serves the dual-purpose of supporting the SFI core with arch specific code, as well as a home for the arch-specific code that uses SFI. analogous to ACPI, drivers/sfi/Kconfig is pulled in by arch/x86/Kconfig Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Cc: x86@kernel.org

x86: add arch-specific SFI support
arch/x86/kernel/sfi.c serves the dual-purpose of supporting the SFI core with arch specific code, as well as a home for the arch-specific code that uses SFI. analogous to ACPI, drivers/sfi/Kconfig is pulled in by arch/x86/Kconfig Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Cc: x86@kernel.org
Feng Tang · Len Brown
1 parent 13e82d023c
Showing 4 changed files with 139 additions and 0 deletions Side-by-side Diff
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/setup.c
arch/x86/kernel/sfi.c
@@ -1683,6 +1683,8 @@
  
 source "drivers/acpi/Kconfig"
  
+source "drivers/sfi/Kconfig"
+
 config X86_APM_BOOT
 	bool
 	default y
@@ -55,6 +55,7 @@
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
+obj-$(CONFIG_SFI)		+= sfi.o
 obj-y				+= reboot.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
@@ -27,6 +27,7 @@
 #include <linux/screen_info.h>
 #include <linux/ioport.h>
 #include <linux/acpi.h>
+#include <linux/sfi.h>
 #include <linux/apm_bios.h>
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
@@ -989,6 +990,8 @@
 	 * Read APIC and some other early information from ACPI tables.
 	 */
 	acpi_boot_init();
+
+	sfi_init();
  
 #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
 	/*
+/*
+ * 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/bootmem.h>
+#include <linux/cpumask.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/efi.h>
+#include <linux/irq.h>
+#include <linux/sfi.h>
+#include <linux/io.h>
+
+#include <asm/io_apic.h>
+#include <asm/pgtable.h>
+#include <asm/mpspec.h>
+#include <asm/setup.h>
+#include <asm/apic.h>
+#include <asm/e820.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)
+{
+	int boot_cpu = 0;
+
+	if (MAX_APICS - id <= 0) {
+		pr_warning("Processor #%d invalid (max %d)\n",
+			id, MAX_APICS);
+		return;
+	}
+
+	if (id == boot_cpu_physical_apicid)
+		boot_cpu = 1;
+	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 u32 gsi_base;
+
+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_base);
+		gsi_base += io_apic_get_redir_entries(i);
+		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;
+}
...	...	@@ -1683,6 +1683,8 @@
1683	1683
1684	1684	source "drivers/acpi/Kconfig"
1685	1685
	1686	+source "drivers/sfi/Kconfig"
	1687	+
1686	1688	config X86_APM_BOOT
1687	1689	bool
1688	1690	default y
...	...	@@ -55,6 +55,7 @@
55	55	obj-$(CONFIG_STACKTRACE) += stacktrace.o
56	56	obj-y += cpu/
57	57	obj-y += acpi/
	58	+obj-$(CONFIG_SFI) += sfi.o
58	59	obj-y += reboot.o
59	60	obj-$(CONFIG_MCA) += mca_32.o
60	61	obj-$(CONFIG_X86_MSR) += msr.o
...	...	@@ -27,6 +27,7 @@
27	27	#include <linux/screen_info.h>
28	28	#include <linux/ioport.h>
29	29	#include <linux/acpi.h>
	30	+#include <linux/sfi.h>
30	31	#include <linux/apm_bios.h>
31	32	#include <linux/initrd.h>
32	33	#include <linux/bootmem.h>
...	...	@@ -989,6 +990,8 @@
989	990	* Read APIC and some other early information from ACPI tables.
990	991	*/
991	992	acpi_boot_init();
	993	+
	994	+ sfi_init();
992	995
993	996	#if defined(CONFIG_X86_MPPARSE) \|\| defined(CONFIG_X86_VISWS)
994	997	/*
	1	+/*
	2	+ * sfi.c - x86 architecture SFI support.
	3	+ *
	4	+ * Copyright (c) 2009, Intel Corporation.
	5	+ *
	6	+ * This program is free software; you can redistribute it and/or modify it
	7	+ * under the terms and conditions of the GNU General Public License,
	8	+ * version 2, as published by the Free Software Foundation.
	9	+ *
	10	+ * This program is distributed in the hope it will be useful, but WITHOUT
	11	+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
	12	+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
	13	+ * more details.
	14	+ *
	15	+ * You should have received a copy of the GNU General Public License along with
	16	+ * this program; if not, write to the Free Software Foundation, Inc.,
	17	+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
	18	+ *
	19	+ */
	20	+
	21	+#define KMSG_COMPONENT "SFI"
	22	+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
	23	+
	24	+#include <linux/bootmem.h>
	25	+#include <linux/cpumask.h>
	26	+#include <linux/module.h>
	27	+#include <linux/acpi.h>
	28	+#include <linux/init.h>
	29	+#include <linux/efi.h>
	30	+#include <linux/irq.h>
	31	+#include <linux/sfi.h>
	32	+#include <linux/io.h>
	33	+
	34	+#include <asm/io_apic.h>
	35	+#include <asm/pgtable.h>
	36	+#include <asm/mpspec.h>
	37	+#include <asm/setup.h>
	38	+#include <asm/apic.h>
	39	+#include <asm/e820.h>
	40	+
	41	+#ifdef CONFIG_X86_LOCAL_APIC
	42	+static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
	43	+
	44	+void __init mp_sfi_register_lapic_address(unsigned long address)
	45	+{
	46	+ mp_lapic_addr = address;
	47	+
	48	+ set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
	49	+ if (boot_cpu_physical_apicid == -1U)
	50	+ boot_cpu_physical_apicid = read_apic_id();
	51	+
	52	+ pr_info("Boot CPU = %d\n", boot_cpu_physical_apicid);
	53	+}
	54	+
	55	+/* All CPUs enumerated by SFI must be present and enabled */
	56	+void __cpuinit mp_sfi_register_lapic(u8 id)
	57	+{
	58	+ int boot_cpu = 0;
	59	+
	60	+ if (MAX_APICS - id <= 0) {
	61	+ pr_warning("Processor #%d invalid (max %d)\n",
	62	+ id, MAX_APICS);
	63	+ return;
	64	+ }
	65	+
	66	+ if (id == boot_cpu_physical_apicid)
	67	+ boot_cpu = 1;
	68	+ pr_info("registering lapic[%d]\n", id);
	69	+
	70	+ generic_processor_info(id, GET_APIC_VERSION(apic_read(APIC_LVR)));
	71	+}
	72	+
	73	+static int __init sfi_parse_cpus(struct sfi_table_header *table)
	74	+{
	75	+ struct sfi_table_simple *sb;
	76	+ struct sfi_cpu_table_entry *pentry;
	77	+ int i;
	78	+ int cpu_num;
	79	+
	80	+ sb = (struct sfi_table_simple *)table;
	81	+ cpu_num = SFI_GET_NUM_ENTRIES(sb, struct sfi_cpu_table_entry);
	82	+ pentry = (struct sfi_cpu_table_entry *)sb->pentry;
	83	+
	84	+ for (i = 0; i < cpu_num; i++) {
	85	+ mp_sfi_register_lapic(pentry->apic_id);
	86	+ pentry++;
	87	+ }
	88	+
	89	+ smp_found_config = 1;
	90	+ return 0;
	91	+}
	92	+#endif /* CONFIG_X86_LOCAL_APIC */
	93	+
	94	+#ifdef CONFIG_X86_IO_APIC
	95	+static u32 gsi_base;
	96	+
	97	+static int __init sfi_parse_ioapic(struct sfi_table_header *table)
	98	+{
	99	+ struct sfi_table_simple *sb;
	100	+ struct sfi_apic_table_entry *pentry;
	101	+ int i, num;
	102	+
	103	+ sb = (struct sfi_table_simple *)table;
	104	+ num = SFI_GET_NUM_ENTRIES(sb, struct sfi_apic_table_entry);
	105	+ pentry = (struct sfi_apic_table_entry *)sb->pentry;
	106	+
	107	+ for (i = 0; i < num; i++) {
	108	+ mp_register_ioapic(i, pentry->phys_addr, gsi_base);
	109	+ gsi_base += io_apic_get_redir_entries(i);
	110	+ pentry++;
	111	+ }
	112	+
	113	+ WARN(pic_mode, KERN_WARNING
	114	+ "SFI: pic_mod shouldn't be 1 when IOAPIC table is present\n");
	115	+ pic_mode = 0;
	116	+ return 0;
	117	+}
	118	+#endif /* CONFIG_X86_IO_APIC */
	119	+
	120	+/*
	121	+ * sfi_platform_init(): register lapics & io-apics
	122	+ */
	123	+int __init sfi_platform_init(void)
	124	+{
	125	+#ifdef CONFIG_X86_LOCAL_APIC
	126	+ mp_sfi_register_lapic_address(sfi_lapic_addr);
	127	+ sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus);
	128	+#endif
	129	+#ifdef CONFIG_X86_IO_APIC
	130	+ sfi_table_parse(SFI_SIG_APIC, NULL, NULL, sfi_parse_ioapic);
	131	+#endif
	132	+ return 0;
	133	+}