Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1269104
| Path | csiph.com!news.mixmin.net!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Keith Busch <keith.busch@intel.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCHv5 2/6] pci: skip child bus with conflicting resources |
| Date | Fri, 13 Nov 2015 18:20:02 +0100 |
| Message-ID | <quqb0-Rg-13@gated-at.bofh.it> (permalink) |
| References | <quqb0-Rg-3@gated-at.bofh.it> |
| X-Original-To | LKML <linux-kernel@vger.kernel.org>, x86@kernel.org, linux-pci@vger.kernel.org |
| X-Extloop1 | 1 |
| X-Ironport-Av | E=Sophos;i="5.20,288,1444719600"; d="scan'208";a="599889137" |
| X-Mailer | git-send-email 1.7.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 43 |
| Organization | linux.* mail to news gateway |
| X-Original-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> |
| X-Original-Date | Fri, 13 Nov 2015 10:17:33 -0700 |
| X-Original-Message-ID | <1447435057-5212-3-git-send-email-keith.busch@intel.com> |
| X-Original-References | <1447435057-5212-1-git-send-email-keith.busch@intel.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1269104 |
Show key headers only | View raw
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 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)
--
2.6.2.307.g37023ba
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCHv5 0/6] Driver for new VMD device Keith Busch <keith.busch@intel.com> - 2015-11-13 18:20 +0100
[PATCHv5 2/6] pci: skip child bus with conflicting resources Keith Busch <keith.busch@intel.com> - 2015-11-13 18:20 +0100
[PATCHv5 6/6] pciutils: Allow 32-bit domains Keith Busch <keith.busch@intel.com> - 2015-11-13 18:20 +0100
[PATCHv5 5/6] x86/pci: Initial commit for new VMD device driver Keith Busch <keith.busch@intel.com> - 2015-11-13 18:20 +0100
Re: [PATCHv5 5/6] x86/pci: Initial commit for new VMD device driver Thomas Gleixner <tglx@linutronix.de> - 2015-11-13 22:30 +0100
Re: [PATCHv5 5/6] x86/pci: Initial commit for new VMD device driver Keith Busch <keith.busch@intel.com> - 2015-11-13 22:50 +0100
[PATCHv5 4/6] x86-pci: allow pci domain specific dma ops Keith Busch <keith.busch@intel.com> - 2015-11-13 18:20 +0100
[PATCHv5 1/6] msi: Relax msi_domain_alloc() to support parentless MSI irqdomains Keith Busch <keith.busch@intel.com> - 2015-11-13 18:20 +0100
Re: [PATCHv5 1/6] msi: Relax msi_domain_alloc() to support parentless MSI irqdomains Thomas Gleixner <tglx@linutronix.de> - 2015-11-13 22:30 +0100
Re: [PATCHv5 0/6] Driver for new VMD device Thomas Gleixner <tglx@linutronix.de> - 2015-11-13 22:30 +0100
csiph-web