diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-04 08:49:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-04 08:49:08 -0400 |
| commit | c41c649c2fdec7bf6ef84173597cc3feabdb7828 (patch) | |
| tree | a6b7e3d25eb9d62e5b9989040aa39ddd1c00a83a /drivers/pci/pcie_layerscape.c | |
| parent | f15715afea3e7b576fad1f6877a073b65576a335 (diff) | |
| parent | ff78aa2ba19cda755b01818fb3caf2aca9236865 (diff) | |
| download | talos-obmc-uboot-c41c649c2fdec7bf6ef84173597cc3feabdb7828.tar.gz talos-obmc-uboot-c41c649c2fdec7bf6ef84173597cc3feabdb7828.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/pci/pcie_layerscape.c')
| -rw-r--r-- | drivers/pci/pcie_layerscape.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 0ba960e248..2e6b986dbc 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -569,7 +569,7 @@ static void fdt_fixup_pcie(void *blob) unsigned char header_type; int index; u32 streamid; - pci_dev_t dev; + pci_dev_t dev, bdf; int bus; unsigned short id; struct pci_controller *hose; @@ -611,12 +611,15 @@ static void fdt_fixup_pcie(void *blob) continue; } + /* the DT fixup must be relative to the hose first_busno */ + bdf = dev - PCI_BDF(hose->first_busno, 0, 0); + /* map PCI b.d.f to streamID in LUT */ - ls_pcie_lut_set_mapping(pcie, index, dev >> 8, + ls_pcie_lut_set_mapping(pcie, index, bdf >> 8, streamid); /* update msi-map in device tree */ - fdt_pcie_set_msi_map_entry(blob, pcie, dev >> 8, + fdt_pcie_set_msi_map_entry(blob, pcie, bdf >> 8, streamid); } } |
