Driver pci_mpc85xx.c is PCI controller driver for old PCI Local Bus,
which does not support access to extended PCIe registers (above 0xff),
as opposite of the PCIe driver pcie_fsl.c for the same platform.

So do not try to access extended PCIe registers as it cannot work.

Signed-off-by: Pali Rohár <p...@kernel.org>
---
 drivers/pci/pci_mpc85xx.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c
index d144f2b791b8..833de816c459 100644
--- a/drivers/pci/pci_mpc85xx.c
+++ b/drivers/pci/pci_mpc85xx.c
@@ -22,7 +22,12 @@ static int mpc85xx_pci_dm_read_config(const struct udevice 
*dev, pci_dev_t bdf,
        struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
        u32 addr;
 
-       addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), 
offset);
+       if (offset > 0xff) {
+               *value = pci_get_ff(size);
+               return 0;
+       }
+
+       addr = PCI_CONF1_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), 
offset);
        out_be32(priv->cfg_addr, addr);
        sync();
 
@@ -48,7 +53,10 @@ static int mpc85xx_pci_dm_write_config(struct udevice *dev, 
pci_dev_t bdf,
        struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
        u32 addr;
 
-       addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), 
offset);
+       if (offset > 0xff)
+               return 0;
+
+       addr = PCI_CONF1_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), 
offset);
        out_be32(priv->cfg_addr, addr);
        sync();
 
-- 
2.20.1

Reply via email to