Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 746942d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: remove unneeded includes
  sfi: Remove unused code
  SFI: Hook PCI MMCONFIG
  x86: add arch-specific SFI support
  SFI: add capability to parse ACPI tables
  SFI: add platform-independent core support
  SFI: create linux/sfi.h
  SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
parents c11f6c82 c602c65b

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -4669,6 +4669,18 @@ L: linux-pci@vger.kernel.org 
S:	Supported

F:	drivers/pci/hotplug/shpchp*



SIMPLE FIRMWARE INTERFACE (SFI)

P:	Len Brown

M:	lenb@kernel.org

L:	sfi-devel@simplefirmware.org

W:	http://simplefirmware.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git

S:	Supported

F:	arch/x86/kernel/*sfi*

F:	drivers/sfi/

F:	include/linux/sfi*.h





SIMTEC EB110ATX (Chalice CATS)

P:	Ben Dooks

M:	Vincent Sanders <support@simtec.co.uk>

arch/x86/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -1666,6 +1666,8 @@ source "kernel/power/Kconfig" 


source "drivers/acpi/Kconfig"



source "drivers/sfi/Kconfig"



config X86_APM_BOOT

	bool

	default y
@@ -1861,7 +1863,7 @@ config PCI_DIRECT 


config PCI_MMCONFIG

	def_bool y

	depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)

	depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)



config PCI_OLPC

	def_bool y

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ obj-$(CONFIG_INTEL_TXT) += tboot.o 
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

arch/x86/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -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>
@@ -985,6 +986,8 @@ void __init setup_arch(char **cmdline_p) 
	 */

	acpi_boot_init();



	sfi_init();



	/*

	 * get boot-time SMP configuration:

	 */

arch/x86/kernel/sfi.c

0 → 100644
+122 −0
Original line number Diff line number Diff line 
/*

 * 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 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;

}