mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 f7a0c78669
			
		
	
	
		f7a0c78669
		
	
	
	
	
		
			
			We have 3 identical copies of the ioapic domain ops for acpi, mpparse, and sfi. Have a global one in the io_apic code and be done with it. To avoid include hell in io_apic.h, create a private irqdomain header and include the generic irqdomain header from there. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: David Cohen <david.a.cohen@linux.intel.com> Cc: Sander Eikelenboom <linux@eikelenboom.it> Cc: David Vrabel <david.vrabel@citrix.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: sfi-devel@simplefirmware.org Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Dimitri Sivanich <sivanich@sgi.com> Cc: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <robh@kernel.org> Cc: x86@kernel.org Link: http://lkml.kernel.org/r/1428978610-28986-32-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
		
			
				
	
	
		
			115 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			115 lines
		
	
	
		
			2.9 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/irqdomain.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;
 | |
| 
 | |
| /* All CPUs enumerated by SFI must be present and enabled */
 | |
| static void __init 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;
 | |
| 	struct ioapic_domain_cfg cfg = {
 | |
| 		.type = IOAPIC_DOMAIN_STRICT,
 | |
| 		.ops = &mp_ioapic_irqdomain_ops,
 | |
| 	};
 | |
| 
 | |
| 	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, &cfg);
 | |
| 		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
 | |
| 	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;
 | |
| }
 |