Interrupt remapping is decoupled from x2apic. Shouldn't check x2apic
before resume interrupt remapping. Otherwise, interrupt remapping won't
be resumed when x2apic is not enabled.
Signed-off-by: Weidong Han <[email protected]>
---
arch/x86/kernel/apic/apic.c | 47 ++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 30c857c..537b145 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1994,24 +1994,24 @@ static int lapic_resume(struct sys_device *dev)
return 0;
local_irq_save(flags);
- if (x2apic) {
- ioapic_entries = alloc_ioapic_entries();
- if (!ioapic_entries) {
- WARN(1, "Alloc ioapic_entries in lapic resume failed.");
- return -ENOMEM;
- }
+ ioapic_entries = alloc_ioapic_entries();
+ if (!ioapic_entries) {
+ WARN(1, "Alloc ioapic_entries in lapic resume failed.");
+ return -ENOMEM;
+ }
- ret = save_IO_APIC_setup(ioapic_entries);
- if (ret) {
- WARN(1, "Saving IO-APIC state failed: %d\n", ret);
- free_ioapic_entries(ioapic_entries);
- return ret;
- }
+ ret = save_IO_APIC_setup(ioapic_entries);
+ if (ret) {
+ WARN(1, "Saving IO-APIC state failed: %d\n", ret);
+ free_ioapic_entries(ioapic_entries);
+ return ret;
+ }
+
+ mask_IO_APIC_setup(ioapic_entries);
+ mask_8259A();
- mask_IO_APIC_setup(ioapic_entries);
- mask_8259A();
+ if (x2apic)
enable_x2apic();
- }
#else
if (!apic_pm_state.active)
return 0;
@@ -2059,19 +2059,20 @@ static int lapic_resume(struct sys_device *dev)
apic_read(APIC_ESR);
#ifdef CONFIG_INTR_REMAP
- if (intr_remapping_enabled)
- reenable_intr_remapping(EIM_32BIT_APIC_ID);
-
- if (x2apic) {
- unmask_8259A();
- restore_IO_APIC_setup(ioapic_entries);
- free_ioapic_entries(ioapic_entries);
+ if (intr_remapping_enabled) {
+ if (x2apic)
+ reenable_intr_remapping(EIM_32BIT_APIC_ID);
+ else
+ reenable_intr_remapping(EIM_8BIT_APIC_ID);
}
+
+ unmask_8259A();
+ restore_IO_APIC_setup(ioapic_entries);
+ free_ioapic_entries(ioapic_entries);
#endif
local_irq_restore(flags);
-
return 0;
}
--
1.6.0.4