x86/apic changes for v3.17
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus
# HEAD: 5e3bf215f4f2efc0af89e6dbc5da789744aeb5d7 x86/apic/vsmp: Make is_vsmp_box() static
The main changes in this cycle are:
* Remove obsolete APIC driver abstractions. (David Rientjes)
* Use the irqdomain facilities to dynamically allocate IRQs for IOAPICs. This is a prerequisite to enable IOAPIC hotplug support, and it also frees up wasted vectors. (Jiang Liu)
* Misc fixlets.
out-of-topic modifications in x86-apic-for-linus:
---------------------------------------------------
drivers/acpi/pci_irq.c # 6a38fa0: x86, irq, ACPI: Release IOAPIC pi include/linux/irqdomain.h # 43a7759: genirq: Export irq_domain_disasso kernel/irq/irqdomain.c # 43a7759: genirq: Export irq_domain_disasso
Thanks,
Ingo
------------------>
David Rientjes (9):
x86, apic: Remove x86_32_numa_cpu_node callback x86, apic: Replace trampoline physical addresses with defaults x86, apic: Remove smp_callin_clear_local_apic callback x86, apic: Remove mps_oem_check callback
x86, apic: Remove check_apicid_present callback x86, apic: Replace noop_check_apicid_used
x86, apic: Remove multi_timer_check callback
x86, apic: Remove setup_portio_remap callback
x86, apic: Remove enable_apic_mode callback
H. Peter Anvin (1):
x86/apic/vsmp: Make is_vsmp_box() static
Jiang Liu (42):
genirq: Export irq_domain_disassociate() to architecture interrupt drivers x86, mpparse: Use pr_lvl() helper utilities to replace printk(KERN_LVL) x86, mpparse: Simplify arch/x86/include/asm/mpspec.h
x86, acpi: Reorganize code to avoid forward declaration in boot.c x86, PCI, ACPI: Use kmalloc_node() to optimize for performance
x86, acpi, irq: Kill static function irq_to_gsi()
x86, ACPI, trivial: Minor improvements to arch/x86/kernel/acpi/boot.c x86, ACPI, irq: Enhance error handling in function acpi_register_gsi() x86, ACPI, irq: Fix possible eror in GSI to IRQ mapping for legacy IRQ x86, irq, trivial: Minor improvements of IRQ related code
x86, ioapic: Kill unused global variable timer_through_8259
x86, ioapic: Kill static variable nr_irqs_gsi
x86, ioapic: Introduce helper utilities to walk ioapics and pins
x86, ioapic: Use irq_cfg() instead of irq_get_chip_data() for better readability x86, irq: Reorganize IO_APIC_get_PCI_irq_vector() to prepare for irqdomain x86, irq: Introduce some helper utilities to improve readability
x86: ce4100, irq: Make CE4100 depend on CONFIG_X86_IO_APIC
x86: ce4100, irq: Do not set legacy_pic to null_legacy_pic
x86, irq: Count legacy IRQs by legacy_pic->nr_legacy_irqs instead of NR_IRQS_LEGACY x86, irq: Simplify arch_early_irq_init()
x86, ACPI, irq: Consolidate algorithm of mapping (ioapic, pin) to IRQ number x86, irq, ACPI: Change __acpi_register_gsi to return IRQ number instead of GSI x86, irq: Introduce mechanisms to support dynamically allocate IRQ for IOAPIC x86, irq: Enhance mp_register_ioapic() to support irqdomain
x86, ACPI, irq: Provide basic irqdomain support
x86, mpparse, irq: Provide basic irqdomain support
x86, SFI, irq: Provide basic irqdomain support
x86, devicetree, irq: Use common mechanism to support irqdomain
x86, irq: Introduce two helper functions to support irqdomain map operation x86, irq, ACPI: Use common irqdomain map interface to program IOAPIC pins x86, irq, mpparse: Use common irqdomain map interface to program IOAPIC pins x86, irq, SFI: Use common irqdomain map interface to program IOAPIC pins x86, irq, devicetree: Use common irqdomain map interface to program IOAPIC pins x86, irq: Clean up unused IOAPIC interface
x86, irq: Simplify the way to handle ISA IRQ
x86, irq: Introduce helper functions to release IOAPIC pin
x86, irq, ACPI: Release IOAPIC pin when PCI device is disabled
x86, irq, mpparse: Release IOAPIC pin when PCI device is disabled x86, irq, SFI: Release IOAPIC pin when PCI device is disabled
x86, irq, devicetree: Release IOAPIC pin when PCI device is disabled x86, irq: Clean up irqdomain transition code
x86: intel-mid: Use the new io_apic interfaces
Oren Twaig (1):
x86, vsmp: Remove is_vsmp_box() from apic_is_clustered_box()
arch/x86/Kconfig | 2 + arch/x86/include/asm/apic.h | 46 +- arch/x86/include/asm/hardirq.h | 3 - arch/x86/include/asm/i8259.h | 5 + arch/x86/include/asm/io_apic.h | 56 +- arch/x86/include/asm/mpspec.h | 15 - arch/x86/include/asm/prom.h | 2 - arch/x86/include/asm/smpboot_hooks.h | 10 +- arch/x86/kernel/acpi/boot.c | 400 ++++++----- arch/x86/kernel/apic/apic.c | 75 +- arch/x86/kernel/apic/apic_flat_64.c | 16 - arch/x86/kernel/apic/apic_noop.c | 23 +- arch/x86/kernel/apic/apic_numachip.c | 8 - arch/x86/kernel/apic/bigsmp_32.c | 14 - arch/x86/kernel/apic/io_apic.c | 759 +++++++++++++-------- arch/x86/kernel/apic/probe_32.c | 33 +- arch/x86/kernel/apic/x2apic_cluster.c | 8 - arch/x86/kernel/apic/x2apic_phys.c | 8 - arch/x86/kernel/apic/x2apic_uv_x.c | 8 - arch/x86/kernel/devicetree.c | 207 ++---- arch/x86/kernel/irqinit.c | 12 +- arch/x86/kernel/mpparse.c | 111 +-- arch/x86/kernel/smpboot.c | 8 - arch/x86/kernel/vsmp_64.c | 4 +- arch/x86/pci/acpi.c | 6 +- arch/x86/pci/intel_mid_pci.c | 27 +- arch/x86/pci/irq.c | 15 +- arch/x86/pci/xen.c | 7 +- arch/x86/platform/ce4100/ce4100.c | 11 +- .../platform/intel-mid/device_libs/platform_wdt.c | 22 +- arch/x86/platform/intel-mid/sfi.c | 56 +- arch/x86/platform/sfi/sfi.c | 10 +- drivers/acpi/pci_irq.c | 3 +- include/linux/irqdomain.h | 2 + kernel/irq/irqdomain.c | 2 +- 35 files changed, 916 insertions(+), 1078 deletions(-)
arch/x86/Kconfig +2 -0
@@ -429,6 +429,7 @@ config X86_INTEL_CE bool "CE4100 TV platform" depends on PCI depends on PCI_GODIRECT + depends on X86_IO_APIC depends on X86_32 depends on X86_EXTENDED_PLATFORM select X86_REBOOTFIXUPS
@@ -835,6 +836,7 @@ config X86_IO_APIC def_bool y depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ + select IRQ_DOMAIN config X86_REROUTE_FOR_BROKEN_BOOT_IRQS bool "Reroute for broken boot IRQs"
arch/x86/include/asm/apic.h +5 -41
103 lines not on this page · raw message
arch/x86/include/asm/hardirq.h +0 -3
@@ -40,9 +40,6 @@ typedef struct {DECLARE_PER_CPU_SHARED_ALIGNED (irq_cpustat_t, irq_stat); -/* We can have at most NR_VECTORS irqs routed to a cpu at a time */ -#define MAX_HARDIRQS_PER_CPU NR_VECTORS -#define __ARCH_IRQ_STAT#define inc_irq_stat (member) this_cpu_inc(irq_stat.member)
arch/x86/include/asm/i8259.h +5 -0
@@ -67,4 +67,9 @@ struct legacy_pic {extern struct legacy_pic *legacy_pic;extern struct legacy_pic null_legacy_pic; +static inline int nr_legacy_irqs (void ) +{ +return legacy_pic->nr_legacy_irqs; +} +#endif /* _ASM_X86_I8259_H */
arch/x86/include/asm/io_apic.h +34 -22
111 lines not on this page · raw message
arch/x86/include/asm/mpspec.h +0 -15
@@ -40,8 +40,6 @@ extern int mp_bus_id_to_type[MAX_MP_BUSSES]; extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);extern unsigned int boot_cpu_physical_apicid; -extern unsigned int max_physical_apicid; -extern int mpc_default_type;extern unsigned long mp_lapic_addr;#ifdef CONFIG_X86_LOCAL_APIC
@@ -88,15 +86,6 @@ static inline void early_reserve_e820_mpc_new(void) { }#endif int generic_processor_info (int apicid,int version); -#ifdef CONFIG_ACPI -extern void mp_register_ioapic (int id,u32 address,u32 gsi_base); -extern void mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger, -u32 gsi); -extern void mp_config_acpi_legacy_irqs (void ); -struct device ; -extern int mp_register_gsi (struct device *dev,u32 gsi,int edge_level, -int active_high_low); -#endif /* CONFIG_ACPI */ #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC)
@@ -161,8 +150,4 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)extern physid_mask_t phys_cpu_present_map; -extern int generic_mps_oem_check (struct mpc_table *,char *,char *); - -extern int default_acpi_madt_oem_check (char *,char *); -#endif /* _ASM_X86_MPSPEC_H */
arch/x86/include/asm/prom.h +0 -2
@@ -26,12 +26,10 @@extern int of_ioapic;extern u64 initial_dtb;extern void add_dtb (u64 data); -extern void x86_add_irq_domains (void );void x86_of_pci_init (void );void x86_dtb_init (void );#else static inline void add_dtb (u64 data) { } -static inline void x86_add_irq_domains (void ) { }static inline void x86_of_pci_init (void ) { }static inline void x86_dtb_init (void ) { }#define of_ioapic 0
arch/x86/include/asm/smpboot_hooks.h +5 -5
@@ -17,11 +17,11 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)spin_unlock_irqrestore (&rtc_lock, flags);local_flush_tlb ();pr_debug ("1.\n" ); - *((volatile unsigned short *)phys_to_virt (apic->trampoline_phys_high)) = - start_eip >>4 ; + *((volatile unsigned short *)phys_to_virt (TRAMPOLINE_PHYS_HIGH )) = + start_eip >>4 ;pr_debug ("2.\n" ); - *((volatile unsigned short *)phys_to_virt (apic->trampoline_phys_low)) = - start_eip &0xf ; + *((volatile unsigned short *)phys_to_virt (TRAMPOLINE_PHYS_LOW )) = + start_eip &0xf ;pr_debug ("3.\n" ); }
@@ -42,7 +42,7 @@ static inline void smpboot_restore_warm_reset_vector(void)CMOS_WRITE (0 ,0xf );spin_unlock_irqrestore (&rtc_lock, flags); - *((volatile u32 *)phys_to_virt (apic->trampoline_phys_low)) =0 ; + *((volatile u32 *)phys_to_virt (TRAMPOLINE_PHYS_LOW )) =0 ; }static inline void __init smpboot_setup_io_apic (void )
arch/x86/kernel/acpi/boot.c +190 -210
539 lines not on this page · raw message
arch/x86/kernel/apic/apic.c +2 -73
105 lines not on this page · raw message
arch/x86/kernel/apic/apic_flat_64.c +0 -16
@@ -168,21 +168,16 @@ static struct apic apic_flat = { .disable_esr = 0, .dest_logical = APIC_DEST_LOGICAL, .check_apicid_used = NULL, - .check_apicid_present = NULL, .vector_allocation_domain = flat_vector_allocation_domain, .init_apic_ldr = flat_init_apic_ldr, .ioapic_phys_id_map = NULL, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = NULL, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = flat_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = flat_get_apic_id, .set_apic_id = set_apic_id,
@@ -196,10 +191,7 @@ static struct apic apic_flat = { .send_IPI_all = flat_send_IPI_all, .send_IPI_self = apic_send_IPI_self, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = default_inquire_remote_apic, .read = native_apic_mem_read,
@@ -283,7 +275,6 @@ static struct apic apic_physflat = { .disable_esr = 0, .dest_logical = 0, .check_apicid_used = NULL, - .check_apicid_present = NULL, .vector_allocation_domain = default_vector_allocation_domain,/* not needed, but shouldn't hurt: */
@@ -291,14 +282,10 @@ static struct apic apic_physflat = { .ioapic_phys_id_map = NULL, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = NULL, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = flat_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = flat_get_apic_id, .set_apic_id = set_apic_id,
@@ -312,10 +299,7 @@ static struct apic apic_physflat = { .send_IPI_all = physflat_send_IPI_all, .send_IPI_self = apic_send_IPI_self, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = default_inquire_remote_apic, .read = native_apic_mem_read,
arch/x86/kernel/apic/apic_noop.c +1 -22
@@ -89,16 +89,6 @@ static const struct cpumask *noop_target_cpus(void)return cpumask_of (0 ); } -static unsigned long noop_check_apicid_used (physid_mask_t *map,int apicid) -{ -return physid_isset (apicid, *map); -} - -static unsigned long noop_check_apicid_present (int bit) -{ -return physid_isset (bit, phys_cpu_present_map); -} -static void noop_vector_allocation_domain (int cpu,struct cpumask *retmask,const struct cpumask *mask) {
@@ -133,27 +123,21 @@ struct apic apic_noop = { .target_cpus = noop_target_cpus, .disable_esr = 0, .dest_logical = APIC_DEST_LOGICAL, - .check_apicid_used = noop_check_apicid_used, - .check_apicid_present = noop_check_apicid_present, + .check_apicid_used = default_check_apicid_used, .vector_allocation_domain = noop_vector_allocation_domain, .init_apic_ldr = noop_init_apic_ldr, .ioapic_phys_id_map = default_ioapic_phys_id_map, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = physid_set_mask_of_physid, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = noop_phys_pkg_id, - .mps_oem_check = NULL, - .get_apic_id = noop_get_apic_id, .set_apic_id = NULL, .apic_id_mask = 0x0F << 24,
@@ -168,12 +152,7 @@ struct apic apic_noop = { .wakeup_secondary_cpu = noop_wakeup_secondary_cpu, -/* should be safe */ - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, - .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = NULL, .read = noop_apic_read,
arch/x86/kernel/apic/apic_numachip.c +0 -8
@@ -217,21 +217,16 @@ static const struct apic apic_numachip __refconst = { .disable_esr = 0, .dest_logical = 0, .check_apicid_used = NULL, - .check_apicid_present = NULL, .vector_allocation_domain = default_vector_allocation_domain, .init_apic_ldr = flat_init_apic_ldr, .ioapic_phys_id_map = NULL, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = NULL, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = numachip_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = get_apic_id, .set_apic_id = set_apic_id,
@@ -246,10 +241,7 @@ static const struct apic apic_numachip __refconst = { .send_IPI_self = numachip_send_IPI_self, .wakeup_secondary_cpu = numachip_wakeup_secondary, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = NULL, /* REMRD not supported */ .read = native_apic_mem_read,
arch/x86/kernel/apic/bigsmp_32.c +0 -14
@@ -31,11 +31,6 @@ static unsigned long bigsmp_check_apicid_used(physid_mask_t *map, int apicid)return 0 ; } -static unsigned long bigsmp_check_apicid_present (int bit) -{ -return 1 ; -} -static int bigsmp_early_logical_apicid (int cpu) {/* on bigsmp, logical apicid is the same as physical */
@@ -168,21 +163,16 @@ static struct apic apic_bigsmp = { .disable_esr = 1, .dest_logical = 0, .check_apicid_used = bigsmp_check_apicid_used, - .check_apicid_present = bigsmp_check_apicid_present, .vector_allocation_domain = default_vector_allocation_domain, .init_apic_ldr = bigsmp_init_apic_ldr, .ioapic_phys_id_map = bigsmp_ioapic_phys_id_map, .setup_apic_routing = bigsmp_setup_apic_routing, - .multi_timer_check = NULL, .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid, .apicid_to_cpu_present = physid_set_mask_of_physid, - .setup_portio_remap = NULL, .check_phys_apicid_present = bigsmp_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = bigsmp_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = bigsmp_get_apic_id, .set_apic_id = NULL,
@@ -196,11 +186,7 @@ static struct apic apic_bigsmp = { .send_IPI_all = bigsmp_send_IPI_all, .send_IPI_self = default_send_IPI_self, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, - .wait_for_init_deassert = true, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = default_inquire_remote_apic, .read = native_apic_mem_read,
arch/x86/kernel/apic/io_apic.c +463 -296
1,224 lines not on this page · raw message
arch/x86/kernel/apic/probe_32.c +1 -32
@@ -88,21 +88,16 @@ static struct apic apic_default = { .disable_esr = 0, .dest_logical = APIC_DEST_LOGICAL, .check_apicid_used = default_check_apicid_used, - .check_apicid_present = default_check_apicid_present, .vector_allocation_domain = flat_vector_allocation_domain, .init_apic_ldr = default_init_apic_ldr, .ioapic_phys_id_map = default_ioapic_phys_id_map, .setup_apic_routing = setup_apic_flat_routing, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = physid_set_mask_of_physid, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = default_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = default_get_apic_id, .set_apic_id = NULL,
@@ -116,11 +111,7 @@ static struct apic apic_default = { .send_IPI_all = default_send_IPI_all, .send_IPI_self = default_send_IPI_self, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, - .wait_for_init_deassert = true, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = default_inquire_remote_apic, .read = native_apic_mem_read,
@@ -214,29 +205,7 @@ void __init generic_apic_probe(void)printk (KERN_INFO "Using APIC driver %s\n" , apic->name); } -/* These functions can switch the APIC even after the initial ->probe() */ - -int __init -generic_mps_oem_check (struct mpc_table *mpc,char *oem,char *productid) -{ -struct apic **drv; - -for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) { -if (!((*drv)->mps_oem_check)) -continue ; -if (!(*drv)->mps_oem_check (mpc, oem, productid)) -continue ; - -if (!cmdline_apic) { - apic = *drv; -printk (KERN_INFO "Switched to APIC driver `%s'.\n" , - apic->name); - } -return 1 ; - } -return 0 ; -} - +/* This function can switch the APIC even after the initial ->probe() */ int __init default_acpi_madt_oem_check (char *oem_id,char *oem_table_id) {struct apic **drv;
arch/x86/kernel/apic/x2apic_cluster.c +0 -8
@@ -249,21 +249,16 @@ static struct apic apic_x2apic_cluster = { .disable_esr = 0, .dest_logical = APIC_DEST_LOGICAL, .check_apicid_used = NULL, - .check_apicid_present = NULL, .vector_allocation_domain = cluster_vector_allocation_domain, .init_apic_ldr = init_x2apic_ldr, .ioapic_phys_id_map = NULL, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = NULL, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = x2apic_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = x2apic_get_apic_id, .set_apic_id = x2apic_set_apic_id,
@@ -277,10 +272,7 @@ static struct apic apic_x2apic_cluster = { .send_IPI_all = x2apic_send_IPI_all, .send_IPI_self = x2apic_send_IPI_self, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = NULL, .read = native_apic_msr_read,
arch/x86/kernel/apic/x2apic_phys.c +0 -8
@@ -103,21 +103,16 @@ static struct apic apic_x2apic_phys = { .disable_esr = 0, .dest_logical = 0, .check_apicid_used = NULL, - .check_apicid_present = NULL, .vector_allocation_domain = default_vector_allocation_domain, .init_apic_ldr = init_x2apic_ldr, .ioapic_phys_id_map = NULL, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = NULL, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = x2apic_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = x2apic_get_apic_id, .set_apic_id = x2apic_set_apic_id,
@@ -131,10 +126,7 @@ static struct apic apic_x2apic_phys = { .send_IPI_all = x2apic_send_IPI_all, .send_IPI_self = x2apic_send_IPI_self, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = NULL, .read = native_apic_msr_read,
arch/x86/kernel/apic/x2apic_uv_x.c +0 -8
@@ -365,21 +365,16 @@ static struct apic __refdata apic_x2apic_uv_x = { .disable_esr = 0, .dest_logical = APIC_DEST_LOGICAL, .check_apicid_used = NULL, - .check_apicid_present = NULL, .vector_allocation_domain = default_vector_allocation_domain, .init_apic_ldr = uv_init_apic_ldr, .ioapic_phys_id_map = NULL, .setup_apic_routing = NULL, - .multi_timer_check = NULL, .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = NULL, - .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, - .enable_apic_mode = NULL, .phys_pkg_id = uv_phys_pkg_id, - .mps_oem_check = NULL, .get_apic_id = x2apic_get_apic_id, .set_apic_id = set_apic_id,
@@ -394,10 +389,7 @@ static struct apic __refdata apic_x2apic_uv_x = { .send_IPI_self = uv_send_IPI_self, .wakeup_secondary_cpu = uv_wakeup_secondary, - .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, - .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, .wait_for_init_deassert = false, - .smp_callin_clear_local_apic = NULL, .inquire_remote_apic = NULL, .read = native_apic_msr_read,
arch/x86/kernel/devicetree.c +66 -141
258 lines not on this page · raw message
arch/x86/kernel/irqinit.c +3 -9
@@ -78,7 +78,7 @@ void __init init_ISA_irqs(void)#endif legacy_pic->init (0 ); -for (i =0 ; i < legacy_pic->nr_legacy_irqs; i++) +for (i =0 ; i <nr_legacy_irqs (); i++)irq_set_chip_and_handler_name (i, chip, handle_level_irq, name); }
@@ -87,12 +87,6 @@ void __init init_IRQ(void)int i;/* -* We probably need a better place for this, but it works for -* now ... -*/ -x86_add_irq_domains (); - -/* * On cpu 0, Assign IRQ0_VECTOR..IRQ15_VECTOR's to IRQ 0..15. * If these IRQ's are handled by legacy interrupt-controllers like PIC, * then this configuration will likely be static after the boot. If
@@ -100,7 +94,7 @@ void __init init_IRQ(void)* then this vector space can be freed and re-used dynamically as the * irq's migrate etc. */ -for (i =0 ; i < legacy_pic->nr_legacy_irqs; i++) +for (i =0 ; i <nr_legacy_irqs (); i++)per_cpu (vector_irq,0 )[IRQ0_VECTOR + i] = i; x86_init.irqs.intr_init ();
@@ -121,7 +115,7 @@ void setup_vector_irq(int cpu)* legacy PIC, for the new cpu that is coming online, setup the static * legacy vector to irq mapping: */ -for (irq =0 ; irq < legacy_pic->nr_legacy_irqs; irq++) +for (irq =0 ; irq <nr_legacy_irqs (); irq++)per_cpu (vector_irq, cpu)[IRQ0_VECTOR + irq] = irq;#endif
arch/x86/kernel/mpparse.c +56 -55
179 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_wdt.c +6 -16
Lines of this file are not shown. View the raw message.
arch/x86/platform/intel-mid/sfi.c +25 -31
56 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 11 lines · Ingo Molnar
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus # HEAD: 5e3bf215f4f2efc0af89e6dbc5da789744aeb5d7 x86/apic/vsmp: Make is_vsmp_box() staticThe main changes in this cycle are:
Quoted 7 lines
* Remove obsolete APIC driver abstractions. (David Rientjes)
* Use the irqdomain facilities to dynamically allocate IRQs for IOAPICs. This is a prerequisite to enable IOAPIC hotplug support, and it also frees up wasted vectors. (Jiang Liu)
* Misc fixlets.
Linus, please hold off on pulling this tree for the time being - I thought it's regression free, but Boris just told me that he is still seeing unsolved regressions with it.
Sorry about this, I will resend it once it's all known-good.
Thanks,
Ingo