From 4975dd15e5009fd1b862a123a6225b0ed9395483 Mon Sep 17 00:00:00 2001 From: David Daney Date: Wed, 15 Jul 2015 09:54:41 -0700 Subject: [PATCH] pci: Add is_pcierc element to struct pci_bus ... and use is to force only_one_child() to return true. Needed because the ThunderX PCIe RC cannot be identified by existing methods. Signed-off-by: David Daney Signed-off-by: Vadim Lomovtsev --- drivers/pci/probe.c | 2 ++ include/linux/pci.h | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index f6ae0d0052eb..b546c0a5ad4e 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1648,6 +1648,8 @@ static int only_one_child(struct pci_bus *bus) { struct pci_dev *parent = bus->self; + if (bus->is_pcierc) + return 1; if (!parent || !pci_is_pcie(parent)) return 0; if (pci_pcie_type(parent) == PCI_EXP_TYPE_ROOT_PORT) diff --git a/include/linux/pci.h b/include/linux/pci.h index 860c751810fc..b18189f1504c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -473,6 +473,7 @@ struct pci_bus { struct bin_attribute *legacy_io; /* legacy I/O for this bus */ struct bin_attribute *legacy_mem; /* legacy mem */ unsigned int is_added:1; + unsigned int is_pcierc:1; }; #define to_pci_bus(n) container_of(n, struct pci_bus, dev) -- 2.39.5