summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-11-12 18:26:49 -0700
committerTom Rini <trini@ti.com>2014-11-23 06:49:01 -0500
commit4efe52bf23c96cee7052273bd8549caee4d0fdc2 (patch)
tree0729647bcc94f7df595ca3071a36fd8ccc42baa2
parent042b83d4c502d17db40f1fa4f6d9b6cb86c653d2 (diff)
downloadu-boot-imx-4efe52bf23c96cee7052273bd8549caee4d0fdc2.zip
u-boot-imx-4efe52bf23c96cee7052273bd8549caee4d0fdc2.tar.gz
u-boot-imx-4efe52bf23c96cee7052273bd8549caee4d0fdc2.tar.bz2
pci: Honour pci_skip_dev()
When enumerating devices, honour the pci_skip_dev() function. This can be used by PCI controller drivers to restrict which devices will be probed. This is required by the NVIDIA Tegra PCIe controller driver, which will fail with a data abort exception if an access is attempted to a device number larger than 0 outside of bus 0. pci_skip_dev() is therefore implemented to prevent any such accesses. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/cmd_pci.c3
-rw-r--r--drivers/pci/pci.c3
-rw-r--r--include/pci.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 5a6048c..e3a77e3 100644
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -71,6 +71,9 @@ void pciinfo(int BusNum, int ShortPCIListing)
dev = PCI_BDF(BusNum, Device, Function);
+ if (pci_skip_dev(hose, dev))
+ continue;
+
pci_read_config_word(dev, PCI_VENDOR_ID, &VendorID);
if ((VendorID == 0xFFFF) || (VendorID == 0x0000))
continue;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5d54790..7ee21d1 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -195,6 +195,9 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
bdf < PCI_BDF(bus + 1, 0, 0);
#endif
bdf += PCI_BDF(0, 0, 1)) {
+ if (pci_skip_dev(hose, bdf))
+ continue;
+
if (!PCI_FUNC(bdf)) {
pci_read_config_byte(bdf,
PCI_HEADER_TYPE,
diff --git a/include/pci.h b/include/pci.h
index 2ff7365..d211351 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -623,6 +623,7 @@ extern void pci_register_hose(struct pci_controller* hose);
extern struct pci_controller* pci_bus_to_hose(int bus);
extern struct pci_controller *find_hose_by_cfg_addr(void *cfg_addr);
+extern int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev);
extern int pci_hose_scan(struct pci_controller *hose);
extern int pci_hose_scan_bus(struct pci_controller *hose, int bus);