From patchwork Fri Jun 7 22:31:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 249868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1C8832C0209 for ; Sat, 8 Jun 2013 08:34:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757784Ab3FGWdq (ORCPT ); Fri, 7 Jun 2013 18:33:46 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:51894 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757775Ab3FGWdo (ORCPT ); Fri, 7 Jun 2013 18:33:44 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r57MVL10018086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Jun 2013 22:31:21 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r57MVMFm006719 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 Jun 2013 22:31:22 GMT Received: from abhmt103.oracle.com (abhmt103.oracle.com [141.146.116.55]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r57MVMoQ019536; Fri, 7 Jun 2013 22:31:22 GMT Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 07 Jun 2013 15:31:21 -0700 From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , Paul Gortmaker , Joerg Roedel , Konrad Rzeszutek Wilk , Sebastian Andrzej Siewior Subject: [PATCH v3 19/27] x86, irq: Make mp_register_ioapic handle hot-added ioapic Date: Fri, 7 Jun 2013 15:31:05 -0700 Message-Id: <1370644273-10495-20-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370644273-10495-1-git-send-email-yinghai@kernel.org> References: <1370644273-10495-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org It needs to reserve irq range in allocated_irqs bitmaps and irq_base will be used to get right irq for ioapic/pin or gsi. Signed-off-by: Yinghai Lu Cc: Paul Gortmaker 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 | 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 3e2f42a..11bb6ea 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 850d8e99..c581c4c 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3890,7 +3890,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; @@ -3898,11 +3898,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; @@ -3910,10 +3918,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); @@ -3924,10 +3930,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; @@ -3938,15 +3942,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 */