[U-Boot] rtl8169: use dm_pci_map_bar

Patrick Wildt patrick at blueri.se
Tue Jun 11 11:15:00 UTC 2019


Hi,

I have an rtl8169 on a macchiatobin and that card has a 64-bit
memory address.  The current code only reads a single word, which
means it can only support a 32-bit address.  By using dm_pci_map_bar
we don't need to manually parse the register, we can just have it do
its job.

I'm not sure though if this works for all devices since the previous
version had an explicit check for the device.

Patrick

Signed-off-by: Patrick Wildt <patrick at blueri.se>

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 521e5909a2..f1d2ade253 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -1182,22 +1182,11 @@ static int rtl8169_eth_probe(struct udevice *dev)
 	struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
 	struct rtl8169_private *priv = dev_get_priv(dev);
 	struct eth_pdata *plat = dev_get_platdata(dev);
-	u32 iobase;
-	int region;
 	int ret;
 
-	debug("rtl8169: REALTEK RTL8169 @0x%x\n", iobase);
-	switch (pplat->device) {
-	case 0x8168:
-		region = 2;
-		break;
-	default:
-		region = 1;
-		break;
-	}
-	dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0 + region * 4, &iobase);
-	iobase &= ~0xf;
-	priv->iobase = (int)dm_pci_mem_to_phys(dev, iobase);
+	priv->iobase = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_2,
+				      PCI_REGION_MEM);
+	printf("rtl8169: REALTEK RTL8169 @0x%x\n", priv->iobase);
 
 	ret = rtl_init(priv->iobase, dev->name, plat->enetaddr);
 	if (ret < 0) {


More information about the U-Boot mailing list