diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:22:31 -0700 |
|---|---|---|
| committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:22:31 -0700 |
| commit | 1beaca1d77291fa4e5cf09d64e43bbc8d6340bb9 (patch) | |
| tree | 62622b8384628b484204fb731343af995b9725d6 | |
| parent | b7fbeebf10e296ccd717dd18a1df2ef25631c136 (diff) | |
| download | linux-yinghai-1beaca1d77291fa4e5cf09d64e43bbc8d6340bb9.tar.gz | |
x86, irq: Add mp_unregister_ioapic could handle hotremove ioapic
it will free ioapic related irq_desc and also clear allocated_irqs bits.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
| -rw-r--r-- | arch/x86/include/asm/mpspec.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 11bb6eadf47b55..e70b7e5a6a82c2 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -97,6 +97,7 @@ static inline void early_reserve_e820_mpc_new(void) { } void __cpuinit generic_processor_info(int apicid, int version); #ifdef CONFIG_ACPI int __mp_register_ioapic(int id, u32 address, u32 gsi_base, bool hot); +int mp_unregister_ioapic(u32 gsi_base); 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); diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index db207437b3fc86..3e5788a96fd74b 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -273,6 +273,14 @@ static void free_irq_at(unsigned int at, struct irq_cfg *cfg) } +static void free_irqs(unsigned int from, int cnt) +{ + int i; + + for (i = from; i < from + cnt; i++) + free_irq_at(i, irq_get_chip_data(i)); +} + static struct irq_cfg *realloc_irq_and_cfg_at(unsigned int at, int node) { struct irq_desc *desc = irq_to_desc(at); @@ -346,6 +354,16 @@ static void __init reserve_ioapic_gsi_irq_extra(void) } } +static void free_ioapic_gsi_irq_base(int idx) +{ + struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(idx); + int irq_base = gsi_cfg->irq_base; + int irq_cnt = gsi_cfg->gsi_end - gsi_cfg->gsi_base + 1; + + if (irq_base > 0) + free_irqs(irq_base, irq_cnt); +} + static void alloc_ioapic_saved_registers(int idx) { if (ioapics[idx].saved_registers) @@ -359,6 +377,11 @@ static void alloc_ioapic_saved_registers(int idx) pr_err("IOAPIC %d: suspend/resume impossible!\n", idx); } +static void free_ioapic_saved_registers(int idx) +{ + kfree(ioapics[idx].saved_registers); +} + int __init arch_early_irq_init(void) { int node = cpu_to_node(0); @@ -4076,6 +4099,25 @@ void mp_register_ioapic(int id, u32 address, u32 gsi_base) __mp_register_ioapic(id, address, gsi_base, false); } +int mp_unregister_ioapic(u32 gsi_base) +{ + int idx; + + idx = mp_find_ioapic(gsi_base); + if (idx < 0) + return -EINVAL; + + free_ioapic_saved_registers(idx); + + free_ioapic_gsi_irq_base(idx); + + clear_fixmap(FIX_IO_APIC_BASE_0 + idx); + memset(&ioapics[idx], 0, sizeof(struct ioapic)); + ioapics[idx].mp_config.apicid = 0xff; + + return 0; +} + /* Enable IOAPIC early just for system timer */ void __init pre_init_apic_IRQ0(void) { |