diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-11-25 22:40:46 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-11-25 22:40:46 +0300 |
| commit | 2438a7457179957b273e76e3090a82b19a60a287 (patch) | |
| tree | 85d8041fd40906718c776d2f9ad3051359c1068d | |
| parent | 5d756f3fa82ff907d875b57e194bb89beff63c4b (diff) | |
| parent | 5e316d34b53039346e252d0019e2f4167af2c0ef (diff) | |
| download | linux-2438a7457179957b273e76e3090a82b19a60a287.tar.xz | |
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
| -rw-r--r-- | drivers/pci/of_property.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index 5a0b98e69795..886c236e5de6 100644 --- a/drivers/pci/of_property.c +++ b/drivers/pci/of_property.c @@ -126,7 +126,7 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs, if (of_pci_get_addr_flags(&res[j], &flags)) continue; - val64 = res[j].start; + val64 = pci_bus_address(pdev, &res[j] - pdev->resource); of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags, false); if (pci_is_bridge(pdev)) { |