net: mvneta: read MAC address from hardware when available

This patch improves the logic used by the mvneta driver to find a MAC
address for a particular interface. Until now, it was only looking at
the Device Tree, and if no address was found, was falling back to
generating a random MAC address.

This patch adds the intermediate solution of reading the MAC address
from the hardware registers, in case it has been set by the
bootloader. So the order is now:

 1) MAC address from the Device Tree
 2) MAC address from the hardware registers
 3) Random MAC address

This requires moving the MAC address initialization a little bit later
in the ->probe() code, because it now requires the hardware registers
to be remapped.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index cd0ea204ac240d51f87b60c6642d187967e4f7ed..712779fb12b7d80416db0a4349257f046ae0d11d 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2251,6 +2251,21 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu)
        return 0;
 }
 
+/* Get mac address */
+static void mvneta_get_mac_addr(struct mvneta_port *pp, unsigned char *addr)
+{
+       u32 mac_addr_l, mac_addr_h;
+
+       mac_addr_l = mvreg_read(pp, MVNETA_MAC_ADDR_LOW);
+       mac_addr_h = mvreg_read(pp, MVNETA_MAC_ADDR_HIGH);
+       addr[0] = (mac_addr_h >> 24) & 0xFF;
+       addr[1] = (mac_addr_h >> 16) & 0xFF;
+       addr[2] = (mac_addr_h >> 8) & 0xFF;
+       addr[3] = mac_addr_h & 0xFF;
+       addr[4] = (mac_addr_l >> 8) & 0xFF;
+       addr[5] = mac_addr_l & 0xFF;
+}
+
 /* Handle setting mac address */
 static int mvneta_set_mac_addr(struct net_device *dev, void *addr)
 {
@@ -2667,7 +2682,9 @@ static int mvneta_probe(struct platform_device *pdev)
        u32 phy_addr;
        struct mvneta_port *pp;
        struct net_device *dev;
-       const char *mac_addr;
+       const char *dt_mac_addr;
+       char hw_mac_addr[ETH_ALEN];
+       const char *mac_from;
        int phy_mode;
        int err;
 
@@ -2703,13 +2720,6 @@ static int mvneta_probe(struct platform_device *pdev)
                goto err_free_irq;
        }
 
-       mac_addr = of_get_mac_address(dn);
-
-       if (!mac_addr || !is_valid_ether_addr(mac_addr))
-               eth_hw_addr_random(dev);
-       else
-               memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
-
        dev->tx_queue_len = MVNETA_MAX_TXD;
        dev->watchdog_timeo = 5 * HZ;
        dev->netdev_ops = &mvneta_netdev_ops;
@@ -2740,6 +2750,21 @@ static int mvneta_probe(struct platform_device *pdev)
 
        clk_prepare_enable(pp->clk);
 
+       dt_mac_addr = of_get_mac_address(dn);
+       if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {
+               mac_from = "device tree";
+               memcpy(dev->dev_addr, dt_mac_addr, ETH_ALEN);
+       } else {
+               mvneta_get_mac_addr(pp, hw_mac_addr);
+               if (is_valid_ether_addr(hw_mac_addr)) {
+                       mac_from = "hardware";
+                       memcpy(dev->dev_addr, hw_mac_addr, ETH_ALEN);
+               } else {
+                       mac_from = "random";
+                       eth_hw_addr_random(dev);
+               }
+       }
+
        pp->tx_done_timer.data = (unsigned long)dev;
 
        pp->tx_ring_size = MVNETA_MAX_TXD;
@@ -2772,7 +2797,8 @@ static int mvneta_probe(struct platform_device *pdev)
                goto err_deinit;
        }
 
-       netdev_info(dev, "mac: %pM\n", dev->dev_addr);
+       netdev_info(dev, "Using %s mac address %pM\n", mac_from,
+                   dev->dev_addr);
 
        platform_set_drvdata(pdev, pp->dev);