x86/apic changes for v3.12
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: 25aa2957973d361081ac6c8b6e5a0d9d7a83fef6 x86/ioapic: Check attr against the previous setting when programmed more than once
Smaller fixes.
Thanks,
Ingo
------------------>
Liu Ping Fan (1):
x86/ioapic: Check attr against the previous setting when programmed more than once
Tang Chen (1):
x86/acpi: Fix incorrect sanity check in acpi_register_lapic()
Yoshihiro YUNOMAE (1):
x86/ioapic/kcrash: Prevent crash_kexec() from deadlocking on ioapic_lock
arch/x86/include/asm/apic.h | 2 ++ arch/x86/kernel/acpi/boot.c | 7 +++++-- arch/x86/kernel/apic/io_apic.c | 14 +++++++++++--- arch/x86/kernel/crash.c | 4 +++- 4 files changed, 21 insertions(+), 6 deletions(-)
arch/x86/include/asm/apic.h +2 -0
@@ -715,4 +715,6 @@ static inline void exiting_ack_irq(void) ack_APIC_irq(); } +extern void ioapic_zap_locks (void ); +#endif /* _ASM_X86_APIC_H */
arch/x86/kernel/acpi/boot.c +5 -2
@@ -199,7 +199,7 @@ static void acpi_register_lapic(int id, u8 enabled) {unsigned int ver =0 ; -if (id >= (MAX_LOCAL_APIC -1 )) { +if (id >=MAX_LOCAL_APIC ) { printk(KERN_INFO PREFIX "skipped apicid that is too big\n");return ; }
@@ -1120,6 +1120,7 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)int ioapic;int ioapic_pin;struct io_apic_irq_attr irq_attr; +int ret;if (acpi_irq_model !=ACPI_IRQ_MODEL_IOAPIC )return gsi;
@@ -1149,7 +1150,9 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)set_io_apic_irq_attr (&irq_attr, ioapic, ioapic_pin, trigger ==ACPI_EDGE_SENSITIVE ?0 :1 , polarity ==ACPI_ACTIVE_HIGH ?0 :1 ); -io_apic_set_pci_routing (dev,gsi_to_irq (gsi), &irq_attr); + ret =io_apic_set_pci_routing (dev,gsi_to_irq (gsi), &irq_attr); +if (ret <0 ) + gsi =INT_MIN ;return gsi; }
arch/x86/kernel/apic/io_apic.c +11 -3
@@ -1534,6 +1534,11 @@ void intel_ir_io_apic_print_entries(unsigned int apic, } } +void ioapic_zap_locks (void ) +{ +raw_spin_lock_init (&ioapic_lock); +} +__apicdebuginit (void )print_IO_APIC (int ioapic_idx) {union IO_APIC_reg_00 reg_00;
@@ -3375,12 +3380,15 @@ int io_apic_setup_irq_pin_once(unsigned int irq, int node, {unsigned int ioapic_idx = attr->ioapic, pin = attr->ioapic_pin;int ret; +struct IO_APIC_route_entry orig_entry;/* Avoid redundant programming */ if (test_bit (pin, ioapics[ioapic_idx].pin_programmed)) { -pr_debug ("Pin %d-%d already programmed\n" , -mpc_ioapic_id (ioapic_idx), pin); -return 0 ; +pr_debug ("Pin %d-%d already programmed\n" ,mpc_ioapic_id (ioapic_idx), pin); + orig_entry =ioapic_read_entry (attr->ioapic, pin); +if (attr->trigger == orig_entry.trigger && attr->polarity == orig_entry.polarity) +return 0 ; +return -EBUSY ; } ret =io_apic_setup_irq_pin (irq, node, attr);if (!ret)
arch/x86/kernel/crash.c +3 -1
@@ -128,7 +128,9 @@ void native_machine_crash_shutdown(struct pt_regs *regs)cpu_emergency_svm_disable ();lapic_shutdown (); -#if defined(CONFIG_X86_IO_APIC ) +#ifdef CONFIG_X86_IO_APIC +/* Prevent crash_kexec() from deadlocking on ioapic_lock. */ +ioapic_zap_locks ();disable_IO_APIC ();#endif #ifdef CONFIG_HPET_TIMER