Skip to content

Commit 5e316d3

Browse files
Andrea della Portabjorn-helgaas
authored andcommitted
PCI: of_property: Assign PCI instead of CPU bus address to dynamic PCI nodes
When populating "ranges" property for a PCI bridge or endpoint, of_pci_prop_ranges() incorrectly uses the CPU address of the resource. In such PCI nodes, the window should instead be in PCI address space. Call pci_bus_address() on the resource in order to obtain the PCI bus address. [Previous discussion at: https://lore.kernel.org/all/8b4fa91380fc4754ea80f47330c613e4f6b6592c.1724159867.git.andrea.porta@suse.com/] Link: https://lore.kernel.org/r/20241108094256.28933-1-andrea.porta@suse.com Fixes: 407d1a5 ("PCI: Create device tree node for bridge") Tested-by: Herve Codina <herve.codina@bootlin.com> Signed-off-by: Andrea della Porta <andrea.porta@suse.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: stable@vger.kernel.org
1 parent 9852d85 commit 5e316d3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/pci/of_property.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs,
126126
if (of_pci_get_addr_flags(&res[j], &flags))
127127
continue;
128128

129-
val64 = res[j].start;
129+
val64 = pci_bus_address(pdev, &res[j] - pdev->resource);
130130
of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags,
131131
false);
132132
if (pci_is_bridge(pdev)) {

0 commit comments

Comments
 (0)