xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, io_apic: Move irq_remapping_enabled checks out of check_timer()

Browse Source 
Move these checks to IRQ remapping code by introducing the
panic_on_irq_remap() function.

Signed-off-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Joerg Roedel
2012-09-26 12:44:41 +02:00
parent a6a25dd327
commit 6a9f5de272
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/apic/io_apic.c
View File

@@ -2777,8 +2777,7 @@ static inline void __init check_timer(void)
* 8259A.
*/
if (pin1 == -1) {
if (irq_remapping_enabled)
panic("BIOS bug: timer not connected to IO-APIC");
panic_if_irq_remap("BIOS bug: timer not connected to IO-APIC");
pin1 = pin2;
apic1 = apic2;
no_pin1 = 1;
@@ -2810,8 +2809,7 @@ static inline void __init check_timer(void)
clear_IO_APIC_pin(0, pin1);
goto out;
}
if (irq_remapping_enabled)
panic("timer doesn't work through Interrupt-remapped IO-APIC");
panic_if_irq_remap("timer doesn't work through Interrupt-remapped IO-APIC");
local_irq_disable();
clear_IO_APIC_pin(apic1, pin1);
if (!no_pin1)