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 | b7fbeebf10e296ccd717dd18a1df2ef25631c136 (patch) | |
tree | 9208f68d284dc4f34beb17fc30a16482fd39d2f3 | |
parent | d01f579d9ced1a8cf3816a5087a09e3cb3475b3c (diff) | |
download | linux-yinghai-b7fbeebf10e296ccd717dd18a1df2ef25631c136.tar.gz |
x86, irq: Make mp_register_ioapic could handle hotadd ioapic
it will reserve irq block in allocated_irqs bit maps
and irq_base will be used to get right irq for ioapic/pin or gsi.
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 | 59 |
2 files changed, 46 insertions, 14 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 3e2f42a4b872a2..11bb6eadf47b55 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -96,6 +96,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); 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 0b1938f7aa7800..db207437b3fc86 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3986,7 +3986,7 @@ static __init int bad_ioapic_register(int idx) return 0; } -void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) +int __mp_register_ioapic(int id, u32 address, u32 gsi_base, bool hotadd) { int idx; int entries; @@ -3994,11 +3994,19 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) idx = __mp_find_ioapic(gsi_base, true); if (idx >= 0) - return; + return -EINVAL; idx = nr_ioapics; + if (hotadd) { + /* find free spot */ + for (idx = 0; idx < nr_ioapics; idx++) + if (!ioapics[idx].nr_registers && + ioapics[idx].mp_config.apicid == 0xff) + break; + } + if (bad_ioapic(idx, address)) - return; + return -EINVAL; ioapics[idx].mp_config.type = MP_IOAPIC; ioapics[idx].mp_config.flags = MPC_APIC_USABLE; @@ -4006,10 +4014,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address); - if (bad_ioapic_register(idx)) { - clear_fixmap(FIX_IO_APIC_BASE_0 + idx); - return; - } + if (bad_ioapic_register(idx)) + goto failed; ioapics[idx].mp_config.apicid = io_apic_unique_id(id); ioapics[idx].mp_config.apicver = io_apic_get_version(idx); @@ -4020,10 +4026,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) */ entries = io_apic_get_redir_entries(idx); - if (!entries || entries > MP_MAX_IOAPIC_PIN) { - clear_fixmap(FIX_IO_APIC_BASE_0 + idx); - return; - } + if (!entries || entries > MP_MAX_IOAPIC_PIN) + goto failed; gsi_cfg = mp_ioapic_gsi_routing(idx); gsi_cfg->gsi_base = gsi_base; @@ -4034,15 +4038,42 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) */ ioapics[idx].nr_registers = entries; - if (gsi_cfg->gsi_end >= gsi_top) - gsi_top = gsi_cfg->gsi_end + 1; + if (!hotadd) { + /* + * irqs will be reserved in arch_early_irq_init() + * don't need to update gsi_top for hot add case + */ + if (gsi_cfg->gsi_end >= gsi_top) + gsi_top = gsi_cfg->gsi_end + 1; + } else { + int irq = reserve_ioapic_gsi_irq_base(idx); + + if (irq < 0) + goto failed; + + alloc_ioapic_saved_registers(idx); + } pr_info("IOAPIC[%d]: apic_id %d, version %d, address 0x%x, GSI %d-%d\n", idx, mpc_ioapic_id(idx), mpc_ioapic_ver(idx), mpc_ioapic_addr(idx), gsi_cfg->gsi_base, gsi_cfg->gsi_end); - nr_ioapics++; + if (idx == nr_ioapics) + nr_ioapics++; + + return 0; + +failed: + clear_fixmap(FIX_IO_APIC_BASE_0 + idx); + memset(&ioapics[idx], 0, sizeof(struct ioapic)); + ioapics[idx].mp_config.apicid = 0xff; + return -EINVAL; +} + +void mp_register_ioapic(int id, u32 address, u32 gsi_base) +{ + __mp_register_ioapic(id, address, gsi_base, false); } /* Enable IOAPIC early just for system timer */ |