diff options
| author | Bogdan Purcareata <bogdan.purcareata@nxp.com> | 2016-05-17 07:18:40 +0000 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-06-03 14:12:10 -0700 |
| commit | 3378727d13dac410d8ef2d8426d4c9bfc4974405 (patch) | |
| tree | 0423022e7b6bae5061adad889261b9190ba23fc3 /drivers/pci | |
| parent | 5605dc6135f6f26560ef3b0c6ebc5141c531179a (diff) | |
| download | talos-obmc-uboot-3378727d13dac410d8ef2d8426d4c9bfc4974405.tar.gz talos-obmc-uboot-3378727d13dac410d8ef2d8426d4c9bfc4974405.zip | |
pcie/layerscape: fix bug in bus number computation when setting msi-map
When multiple PCI cards are present in an ls2080a board, the second
card does not get its msi-map set up properly due to a bug in
computing the bus number.
The bus number returned by PCI_BDF() is not the actual PCI bus
number, but instead represents a global u-boot PCI bus number. A
given bus number is relative to hose->first_busno, so that has to be
subtracted from the PCI device id.
Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
Acked-by: Stuart Yoder <stuart.yoder@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'drivers/pci')
| -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); } } |
