From patchwork Fri Nov 6 22:35:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 541135 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 E49A1140291 for ; Sat, 7 Nov 2015 09:43:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757768AbbKFWmr (ORCPT ); Fri, 6 Nov 2015 17:42:47 -0500 Received: from mga02.intel.com ([134.134.136.20]:29742 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757699AbbKFWmC (ORCPT ); Fri, 6 Nov 2015 17:42:02 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 06 Nov 2015 14:42:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,254,1444719600"; d="scan'208";a="844569410" Received: from dcgshare.lm.intel.com ([10.232.118.254]) by orsmga002.jf.intel.com with ESMTP; 06 Nov 2015 14:42:00 -0800 Received: by dcgshare.lm.intel.com (Postfix, from userid 1017) id 5DEFFE0C6A; Fri, 6 Nov 2015 15:41:59 -0700 (MST) From: Keith Busch To: LKML , x86@kernel.org, linux-pci@vger.kernel.org Cc: Jiang Liu , Thomas Gleixner , Dan Williams , Bjorn Helgaas , Bryan Veal , Ingo Molnar , "H. Peter Anvin" , Martin Mares , Jon Derrick , Keith Busch Subject: [PATCHv4 2/6] pci: skip child bus with conflicting resources Date: Fri, 6 Nov 2015 15:35:42 -0700 Message-Id: <1446849346-8242-3-git-send-email-keith.busch@intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1446849346-8242-1-git-send-email-keith.busch@intel.com> References: <1446849346-8242-1-git-send-email-keith.busch@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org And use the max bus resource from the parent rather than assume 255. Signed-off-by: Keith Busch --- drivers/pci/probe.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8361d27..1cb3be7 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -856,7 +856,10 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) if (!child) goto out; child->primary = primary; - pci_bus_insert_busn_res(child, secondary, subordinate); + if (!pci_bus_insert_busn_res(child, secondary, subordinate)) { + pci_remove_bus(child); + goto out; + } child->bridge_ctl = bctl; } @@ -896,7 +899,10 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) child = pci_add_new_bus(bus, dev, max+1); if (!child) goto out; - pci_bus_insert_busn_res(child, max+1, 0xff); + if (!pci_bus_insert_busn_res(child, max+1, bus->busn_res.end)) { + pci_remove_bus(child); + goto out; + } } max++; buses = (buses & 0xff000000)