From: Keith Busch <keith.busch@intel.com>
To: LKML <linux-kernel@vger.kernel.org>,
x86@kernel.org, linux-pci@vger.kernel.org
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Dan Williams <dan.j.williams@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Bryan Veal <bryan.e.veal@intel.com>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Martin Mares <mj@ucw.cz>,
Jon Derrick <jonathan.derrick@intel.com>,
Keith Busch <keith.busch@intel.com>
Subject: [PATCHv4 2/6] pci: skip child bus with conflicting resources
Date: Fri, 6 Nov 2015 15:35:42 -0700 [thread overview]
Message-ID: <1446849346-8242-3-git-send-email-keith.busch@intel.com> (raw)
In-Reply-To: <1446849346-8242-1-git-send-email-keith.busch@intel.com>
And use the max bus resource from the parent rather than assume 255.
Signed-off-by: Keith Busch <keith.busch@intel.com>
---
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)
--
2.6.2.307.g37023ba
next prev parent reply other threads:[~2015-11-06 22:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-06 22:35 [PATCHv4 0/6] Driver for new VMD device Keith Busch
2015-11-06 22:35 ` [PATCHv4 1/6] msi: Relax msi_domain_alloc() to support parentless MSI irqdomains Keith Busch
2015-11-07 11:43 ` Thomas Gleixner
2015-11-06 22:35 ` Keith Busch [this message]
2015-11-06 22:35 ` [PATCHv4 3/6] Export msi and irq functions for module use Keith Busch
2015-11-06 22:35 ` [PATCHv4 4/6] x86-pci: allow pci domain specific dma ops Keith Busch
2015-11-06 22:35 ` [PATCHv4 5/6] x86/pci: Initial commit for new VMD device driver Keith Busch
2015-11-07 11:55 ` Thomas Gleixner
2015-11-06 22:35 ` [PATCHv4 6/6] pciutils: Allow 32-bit domains Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446849346-8242-3-git-send-email-keith.busch@intel.com \
--to=keith.busch@intel.com \
--cc=bhelgaas@google.com \
--cc=bryan.e.veal@intel.com \
--cc=dan.j.williams@intel.com \
--cc=hpa@zytor.com \
--cc=jiang.liu@linux.intel.com \
--cc=jonathan.derrick@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mj@ucw.cz \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).