r8169: Load MAC address from device tree if present

If the system was booted using a device tree and if the device tree
contains a MAC address, use it instead of reading one from the EEPROM.
This is useful in situations where the EEPROM isn't properly programmed
or where the firmware wants to override the existing MAC address.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index e8a112149a623aeaf4590e210736e73a844a6a69..501891be7c56c66856e1242ebe4b7e4c7bfa2429 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7110,6 +7110,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
        return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);
 }
 
+static void rtl_read_mac_address(struct rtl8169_private *tp,
+                                u8 mac_addr[ETH_ALEN])
+{
+       /* Get MAC address */
+       switch (tp->mac_version) {
+       case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
+       case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
+               *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
+               *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
+               break;
+       default:
+               break;
+       }
+}
+
 DECLARE_RTL_COND(rtl_link_list_ready_cond)
 {
        return RTL_R8(tp, MCU) & LINK_LIST_RDY;
@@ -7301,6 +7316,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
 static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
+       u8 mac_addr[ETH_ALEN] __aligned(4) = {};
        struct rtl8169_private *tp;
        struct net_device *dev;
        int chipset, region, i;
@@ -7403,20 +7419,14 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        u64_stats_init(&tp->rx_stats.syncp);
        u64_stats_init(&tp->tx_stats.syncp);
 
-       /* Get MAC address */
-       switch (tp->mac_version) {
-               u8 mac_addr[ETH_ALEN] __aligned(4);
-       case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
-       case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
-               *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
-               *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
+       /* get MAC address */
+       rc = eth_platform_get_mac_address(&pdev->dev, mac_addr);
+       if (rc)
+               rtl_read_mac_address(tp, mac_addr);
+
+       if (is_valid_ether_addr(mac_addr))
+               rtl_rar_set(tp, mac_addr);
 
-               if (is_valid_ether_addr(mac_addr))
-                       rtl_rar_set(tp, mac_addr);
-               break;
-       default:
-               break;
-       }
        for (i = 0; i < ETH_ALEN; i++)
                dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);