From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH v5 22/33] x86, irq: Add mp_unregister_ioapic to handle hot-remove ioapic Date: Thu, 2 Jan 2014 16:05:54 -0800 Message-ID: <1388707565-16535-23-git-send-email-yinghai@kernel.org> References: <1388707565-16535-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1388707565-16535-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Tony Luck , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu , Paul Gortmaker , Jiang Liu , Joerg Roedel , Konrad Rzeszutek Wilk , Sebastian Andrzej Siewior List-Id: linux-acpi@vger.kernel.org It will free ioapic related irq_desc and also clear allocated_irqs bits. Signed-off-by: Yinghai Lu Cc: Paul Gortmaker Cc: Jiang Liu Cc: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: Sebastian Andrzej Siewior --- arch/x86/include/asm/mpspec.h | 1 + arch/x86/kernel/apic/io_apic.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 59d8465..b98665f 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) { } int 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 0fdda49..af6cbcd 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -334,6 +334,20 @@ static void __init reserve_ioapic_gsi_irq_extra(void) } } +static void free_ioapic_gsi_irq_base(int idx) +{ + int i; + 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) + return; + + for (i = irq_base; i < irq_base + irq_cnt; i++) + free_irq_at(i, irq_get_chip_data(i)); +} + static void alloc_ioapic_saved_registers(int idx) { if (ioapics[idx].saved_registers) @@ -347,6 +361,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); @@ -3999,6 +4018,32 @@ 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; + + lock_ioapics(); + + idx = __mp_find_ioapic(gsi_base); + if (idx < 0) { + unlock_ioapics(); + return -EINVAL; + } + clear_bit(idx, ioapics_mask); + + 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)); + nr_ioapics = bitmap_weight(ioapics_mask, MAX_IO_APICS); + + unlock_ioapics(); + + return 0; +} + /* Enable IOAPIC early just for system timer */ void __init pre_init_apic_IRQ0(void) { -- 1.8.4