From patchwork Fri Nov 13 17:17:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 7613241 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EF6A4BF90C for ; Fri, 13 Nov 2015 17:19:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F0AA2065D for ; Fri, 13 Nov 2015 17:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74B812044B for ; Fri, 13 Nov 2015 17:19:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932908AbbKMRRr (ORCPT ); Fri, 13 Nov 2015 12:17:47 -0500 Received: from mga09.intel.com ([134.134.136.24]:9725 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932838AbbKMRRq (ORCPT ); Fri, 13 Nov 2015 12:17:46 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 13 Nov 2015 09:17:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,288,1444719600"; d="scan'208";a="599889137" Received: from dcgshare.lm.intel.com ([10.232.118.254]) by FMSMGA003.fm.intel.com with ESMTP; 13 Nov 2015 09:17:44 -0800 Received: by dcgshare.lm.intel.com (Postfix, from userid 1017) id 2B6F5E0C64; Fri, 13 Nov 2015 10:17:43 -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: [PATCHv5 2/6] pci: skip child bus with conflicting resources Date: Fri, 13 Nov 2015 10:17:33 -0700 Message-Id: <1447435057-5212-3-git-send-email-keith.busch@intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1447435057-5212-1-git-send-email-keith.busch@intel.com> References: <1447435057-5212-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 X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 f14a970..ae5a4b3 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)