lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, ioapic: Allocate ioapic_saved_data early

Browse Source 
This allows re-using this buffer for enabling
interrupt-remapping during boot and resume. And thus allow for
consolidating the code between ioapic suspend/resume and
interrupt-remapping.

Tested-by: Daniel J Blueman <daniel.blueman@gmail.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Link: http://lkml.kernel.org/r/20110518233157.481404505@sbsiddha-MOBL3.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Suresh Siddha
2011-05-18 16:31:32 -07:00
committed by Ingo Molnar
parent b64ce24daf
commit 4c79185cdb
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,11 @@ int mp_irq_entries;
/* GSI interrupts */ /* GSI interrupts */
static int nr_irqs_gsi = NR_IRQS_LEGACY; static int nr_irqs_gsi = NR_IRQS_LEGACY;
/*
* Saved I/O APIC state during suspend/resume.
*/
static struct IO_APIC_route_entry *ioapic_saved_data[MAX_IO_APICS];
#if defined (CONFIG_MCA) || defined (CONFIG_EISA) #if defined (CONFIG_MCA) || defined (CONFIG_EISA)
int mp_bus_id_to_type[MAX_MP_BUSSES]; int mp_bus_id_to_type[MAX_MP_BUSSES];
#endif #endif
@@ -179,6 +184,14 @@ int __init arch_early_irq_init(void)
io_apic_irqs = ~0UL; io_apic_irqs = ~0UL;
} }
for (i = 0; i < nr_ioapics; i++) {
ioapic_saved_data[i] =
kzalloc(sizeof(struct IO_APIC_route_entry) *
nr_ioapic_registers[i], GFP_KERNEL);
if (!ioapic_saved_data[i])
pr_err("IOAPIC %d: suspend/resume impossible!\n", i);
}
cfg = irq_cfgx; cfg = irq_cfgx;
count = ARRAY_SIZE(irq_cfgx); count = ARRAY_SIZE(irq_cfgx);
node = cpu_to_node(0); node = cpu_to_node(0);
@@ -2918,8 +2931,6 @@ static int __init io_apic_bug_finalize(void)
late_initcall(io_apic_bug_finalize); late_initcall(io_apic_bug_finalize);
static struct IO_APIC_route_entry *ioapic_saved_data[MAX_IO_APICS];
static void suspend_ioapic(int ioapic_id) static void suspend_ioapic(int ioapic_id)
{ {
struct IO_APIC_route_entry *saved_data = ioapic_saved_data[ioapic_id]; struct IO_APIC_route_entry *saved_data = ioapic_saved_data[ioapic_id];
@@ -2978,18 +2989,6 @@ static struct syscore_ops ioapic_syscore_ops = {
static int __init ioapic_init_ops(void) static int __init ioapic_init_ops(void)
{ {
int i;
for (i = 0; i < nr_ioapics; i++) {
unsigned int size;
size = nr_ioapic_registers[i]
* sizeof(struct IO_APIC_route_entry);
ioapic_saved_data[i] = kzalloc(size, GFP_KERNEL);
if (!ioapic_saved_data[i])
pr_err("IOAPIC %d: suspend/resume impossible!\n", i);
}
register_syscore_ops(&ioapic_syscore_ops); register_syscore_ops(&ioapic_syscore_ops);
return 0; return 0;