summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-09-07 21:24:19 +0300
committerBjorn Helgaas <bhelgaas@google.com>2017-09-07 21:24:19 +0300
commit9198407e23ec89f0e1562f439771aeea83345d0d (patch)
treec6a53b71b48c49d7713539eb035e7b2fcec69d2a /drivers/pci
parentd872694bac212f76ca13fd20a85e5c1bdb53a945 (diff)
parentc775697b713b70293507573355aa8c8c177db35b (diff)
downloadlinux-9198407e23ec89f0e1562f439771aeea83345d0d.tar.xz
Merge branch 'pci/resource' into next
* pci/resource: microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code ARC: Remove empty kernel/pcibios.c PCI: Add a generic weak pcibios_align_resource() PCI: Add a generic weak pcibios_fixup_bus()
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/probe.c9
-rw-r--r--drivers/pci/setup-res.c13
2 files changed, 22 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 9b8a445b9294..e03f95bd1b59 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2344,6 +2344,15 @@ void pcie_bus_configure_settings(struct pci_bus *bus)
}
EXPORT_SYMBOL_GPL(pcie_bus_configure_settings);
+/*
+ * Called after each bus is probed, but before its children are examined. This
+ * is marked as __weak because multiple architectures define it.
+ */
+void __weak pcibios_fixup_bus(struct pci_bus *bus)
+{
+ /* nothing to do, expected to be removed in the future */
+}
+
unsigned int pci_scan_child_bus(struct pci_bus *bus)
{
unsigned int devfn, pass, max = bus->busn_res.start;
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 85774b7a316a..e576e1a8d978 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -234,6 +234,19 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
return 0;
}
+/*
+ * We don't have to worry about legacy ISA devices, so nothing to do here.
+ * This is marked as __weak because multiple architectures define it; it should
+ * eventually go away.
+ */
+resource_size_t __weak pcibios_align_resource(void *data,
+ const struct resource *res,
+ resource_size_t size,
+ resource_size_t align)
+{
+ return res->start;
+}
+
static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
int resno, resource_size_t size, resource_size_t align)
{