Skip to content

Commit 2438a74

Browse files
committed
Merge branch 'pci/of'
- Use PCI bus addresses (not CPU addresses) in 'ranges' properties when building dynamic DT nodes so systems where the PCI and CPU addresses space differ work correctly (Andrea della Porta) * pci/of: PCI: of_property: Assign PCI instead of CPU bus address to dynamic PCI nodes
2 parents 5d756f3 + 5e316d3 commit 2438a74

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)