PCI: Add defines for bridge window indexing

[ Upstream commit e4934832c5 ]

include/linux/pci.h provides PCI_BRIDGE_{IO,MEM,PREF_MEM}_WINDOW defines,
however, they're based on the resource array indexing in the pci_dev
struct. The struct pci_bus also has pointers to those same resources but
they start from zeroth index.

Add PCI_BUS_BRIDGE_{IO,MEM,PREF_MEM}_WINDOW defines to get rid of literal
indexing.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250829131113.36754-12-ilpo.jarvinen@linux.intel.com
Stable-dep-of: 9abf79c8d7 ("PCI/ACPI: Restrict program_hpx_type2() to AER bits")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ilpo Järvinen
2026-03-04 07:19:48 -05:00
committed by Sasha Levin
parent 82bd7f9d08
commit 89db6475c0
2 changed files with 11 additions and 3 deletions
+4
View File
@@ -40,6 +40,10 @@
#define PCIE_MSG_CODE_DEASSERT_INTC 0x26
#define PCIE_MSG_CODE_DEASSERT_INTD 0x27
#define PCI_BUS_BRIDGE_IO_WINDOW 0
#define PCI_BUS_BRIDGE_MEM_WINDOW 1
#define PCI_BUS_BRIDGE_PREF_MEM_WINDOW 2
extern const unsigned char pcie_link_speed[];
extern bool pci_early_dump;
+7 -3
View File
@@ -539,9 +539,13 @@ 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], false);
pci_read_bridge_mmio(child->self, child->resource[1], false);
pci_read_bridge_mmio_pref(child->self, child->resource[2], false);
pci_read_bridge_io(child->self,
child->resource[PCI_BUS_BRIDGE_IO_WINDOW], false);
pci_read_bridge_mmio(child->self,
child->resource[PCI_BUS_BRIDGE_MEM_WINDOW], false);
pci_read_bridge_mmio_pref(child->self,
child->resource[PCI_BUS_BRIDGE_PREF_MEM_WINDOW],
false);
if (dev->transparent) {
pci_bus_for_each_resource(child->parent, res) {