summaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2023-12-04 17:53:32 -0600
committerBjorn Helgaas <bhelgaas@google.com>2023-12-15 17:28:43 -0600
commit63c6ebb294b7c708cc987d621e59499686650683 (patch)
tree45e53d213ab6aaa01bbc354a9f1d799ed25978a0 /drivers/pci/probe.c
parent281e1f137a97dae4fe47a7d30635c5b83def790b (diff)
downloadlinux-stable-63c6ebb294b7c708cc987d621e59499686650683.tar.gz
linux-stable-63c6ebb294b7c708cc987d621e59499686650683.tar.bz2
linux-stable-63c6ebb294b7c708cc987d621e59499686650683.zip
PCI: Log bridge windows conditionally
Previously pci_read_bridge_io(), pci_read_bridge_mmio(), and pci_read_bridge_mmio_pref() unconditionally logged the bridge window resource. A future change will call these functions earlier and more often. Add a "log" parameter so callers can control whether to generate the log message. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b0b8ed7a72f3..3d39a47846b4 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -344,7 +344,8 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
}
}
-static void pci_read_bridge_io(struct pci_dev *dev, struct resource *res)
+static void pci_read_bridge_io(struct pci_dev *dev, struct resource *res,
+ bool log)
{
u8 io_base_lo, io_limit_lo;
unsigned long io_mask, io_granularity, base, limit;
@@ -377,11 +378,13 @@ static void pci_read_bridge_io(struct pci_dev *dev, struct resource *res)
region.start = base;
region.end = limit + io_granularity - 1;
pcibios_bus_to_resource(dev->bus, res, &region);
- pci_info(dev, " bridge window %pR\n", res);
+ if (log)
+ pci_info(dev, " bridge window %pR\n", res);
}
}
-static void pci_read_bridge_mmio(struct pci_dev *dev, struct resource *res)
+static void pci_read_bridge_mmio(struct pci_dev *dev, struct resource *res,
+ bool log)
{
u16 mem_base_lo, mem_limit_lo;
unsigned long base, limit;
@@ -396,11 +399,13 @@ static void pci_read_bridge_mmio(struct pci_dev *dev, struct resource *res)
region.start = base;
region.end = limit + 0xfffff;
pcibios_bus_to_resource(dev->bus, res, &region);
- pci_info(dev, " bridge window %pR\n", res);
+ if (log)
+ pci_info(dev, " bridge window %pR\n", res);
}
}
-static void pci_read_bridge_mmio_pref(struct pci_dev *dev, struct resource *res)
+static void pci_read_bridge_mmio_pref(struct pci_dev *dev, struct resource *res,
+ bool log)
{
u16 mem_base_lo, mem_limit_lo;
u64 base64, limit64;
@@ -446,7 +451,8 @@ static void pci_read_bridge_mmio_pref(struct pci_dev *dev, struct resource *res)
region.start = base;
region.end = limit + 0xfffff;
pcibios_bus_to_resource(dev->bus, res, &region);
- pci_info(dev, " bridge window %pR\n", res);
+ if (log)
+ pci_info(dev, " bridge window %pR\n", res);
}
}
@@ -518,9 +524,9 @@ void pci_read_bridge_bases(struct pci_bus *child)
for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++)
child->resource[i] = &dev->resource[PCI_BRIDGE_RESOURCES+i];
- pci_read_bridge_io(child->self, child->resource[0]);
- pci_read_bridge_mmio(child->self, child->resource[1]);
- pci_read_bridge_mmio_pref(child->self, child->resource[2]);
+ pci_read_bridge_io(child->self, child->resource[0], true);
+ pci_read_bridge_mmio(child->self, child->resource[1], true);
+ pci_read_bridge_mmio_pref(child->self, child->resource[2], true);
if (dev->transparent) {
pci_bus_for_each_resource(child->parent, res) {