net: pch_gbe: Use dm_pci_map_bar to discover MMIO base

Reading the PCI BAR & converting the result to a physical address is not
safe across all architectures. For example on MIPS the virtual:physical
mapping is not 1:1, so we cannot directly make use of the physical
address.

Use the more generic BAR-mapping function dm_pci_map_bar to discover the
MMIO base address, which should work across architectures.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index 137818b39071406b707c6a6741ad51926fedfe5c..2d0a70088af561f3449cab9448781394d71079ba 100644 (file)
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -421,7 +421,7 @@ int pch_gbe_probe(struct udevice *dev)
 {
        struct pch_gbe_priv *priv;
        struct eth_pdata *plat = dev_get_platdata(dev);
-       u32 iobase;
+       void *iobase;
 
        /*
         * The priv structure contains the descriptors and frame buffers which
@@ -432,11 +432,9 @@ int pch_gbe_probe(struct udevice *dev)
 
        priv->dev = dev;
 
-       dm_pci_read_config32(dev, PCI_BASE_ADDRESS_1, &iobase);
-       iobase &= PCI_BASE_ADDRESS_MEM_MASK;
-       iobase = dm_pci_mem_to_phys(dev, iobase);
+       iobase = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_1, PCI_REGION_MEM);
 
-       plat->iobase = iobase;
+       plat->iobase = (ulong)iobase;
        priv->mac_regs = (struct pch_gbe_regs *)iobase;
 
        /* Read MAC address from SROM and initialize dev->enetaddr with it */