From patchwork Fri Jun 7 22:31:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 249879 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 3364B2C01FC for ; Sat, 8 Jun 2013 08:37:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757477Ab3FGWgu (ORCPT ); Fri, 7 Jun 2013 18:36:50 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:51685 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757352Ab3FGWdG (ORCPT ); Fri, 7 Jun 2013 18:33:06 -0400 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r57MVMPH018111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Jun 2013 22:31:23 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r57MVOMl019575 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 Jun 2013 22:31:24 GMT Received: from abhmt103.oracle.com (abhmt103.oracle.com [141.146.116.55]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r57MVNLt006761; Fri, 7 Jun 2013 22:31:23 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:23 -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 21/27] x86, irq: Make ioapics loop skip blank slots Date: Fri, 7 Jun 2013 15:31:07 -0700 Message-Id: <1370644273-10495-22-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: acsinet21.oracle.com [141.146.126.237] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org When multiple ioapics get added and removed, we could have blank slots in middle of ioapics array. Add skip code for this case by checking nr_registers. Signed-off-by: Yinghai Lu Cc: Paul Gortmaker Cc: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: Sebastian Andrzej Siewior --- arch/x86/kernel/apic/io_apic.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 8a3fedf..970c4fd 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -793,7 +793,8 @@ int save_ioapic_entries(void) int err = 0; for (apic = 0; apic < nr_ioapics; apic++) { - if (!ioapics[apic].saved_registers) { + if (!ioapics[apic].saved_registers && + ioapics[apic].nr_registers) { err = -ENOMEM; continue; } @@ -899,9 +900,12 @@ static int __init find_isa_irq_apic(int irq, int type) if (i < mp_irq_entries) { int ioapic_idx; - for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) + for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) { + if (!ioapics[ioapic_idx].nr_registers) + continue; if (mpc_ioapic_id(ioapic_idx) == mp_irqs[i].dstapic) return ioapic_idx; + } } return -1; @@ -1121,10 +1125,13 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, for (i = 0; i < mp_irq_entries; i++) { int lbus = mp_irqs[i].srcbus; - for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) + for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) { + if (!ioapics[ioapic_idx].nr_registers) + continue; if (mpc_ioapic_id(ioapic_idx) == mp_irqs[i].dstapic || mp_irqs[i].dstapic == MP_APIC_ALL) break; + } if (!test_bit(lbus, mp_bus_not_pci) && !mp_irqs[i].irqtype && @@ -2084,6 +2091,9 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void) * Set the IOAPIC ID to the value stored in the MPC table. */ for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) { + if (!ioapics[ioapic_idx].nr_registers) + continue; + /* Read the register 0 value */ raw_spin_lock_irqsave(&ioapic_lock, flags); reg_00.raw = io_apic_read(ioapic_idx, 0); @@ -3013,8 +3023,12 @@ static void ioapic_resume(void) { int ioapic_idx; - for (ioapic_idx = nr_ioapics - 1; ioapic_idx >= 0; ioapic_idx--) + for (ioapic_idx = nr_ioapics - 1; ioapic_idx >= 0; ioapic_idx--) { + if (!ioapics[ioapic_idx].nr_registers) + continue; + resume_ioapic_id(ioapic_idx); + } restore_ioapic_entries(); } @@ -3851,8 +3865,11 @@ static int __mp_find_ioapic(u32 gsi, bool quiet) /* Find the IOAPIC that manages this GSI. */ for (i = 0; i < nr_ioapics; i++) { struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(i); - if ((gsi >= gsi_cfg->gsi_base) - && (gsi <= gsi_cfg->gsi_end)) + + if (!ioapics[i].nr_registers) + continue; + + if ((gsi >= gsi_cfg->gsi_base) && (gsi <= gsi_cfg->gsi_end)) return i; }