Re: [PATCH] lan743x: allow mac address to come from dt

[David Miller]

From: Tim Harvey 
Date: Wed, 17 Jun 2020 15:59:10 -0700

> If a valid mac address is present in dt, use that before using
> CSR's or a random mac address.
> 
> Signed-off-by: Tim Harvey 

Applied to net-next, thanks.

Re: [PATCH] lan743x: allow mac address to come from dt

[Andrew Lunn]

On Wed, Jun 17, 2020 at 03:59:10PM -0700, Tim Harvey wrote:
> If a valid mac address is present in dt, use that before using
> CSR's or a random mac address.
> 
> Signed-off-by: Tim Harvey 

Reviewed-by: Andrew Lunn 

Andrew

[PATCH] lan743x: allow mac address to come from dt

[Tim Harvey]

If a valid mac address is present in dt, use that before using
CSR's or a random mac address.

Signed-off-by: Tim Harvey 
---
 drivers/net/ethernet/microchip/lan743x_main.c | 41 ---
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/microchip/lan743x_main.c 
b/drivers/net/ethernet/microchip/lan743x_main.c
index 7ef22bf..50ad56b 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "lan743x_main.h"
 #include "lan743x_ethtool.h"
 
@@ -804,26 +805,29 @@ static int lan743x_mac_init(struct lan743x_adapter 
*adapter)
data |= MAC_CR_CNTR_RST_;
lan743x_csr_write(adapter, MAC_CR, data);
 
-   mac_addr_hi = lan743x_csr_read(adapter, MAC_RX_ADDRH);
-   mac_addr_lo = lan743x_csr_read(adapter, MAC_RX_ADDRL);
-   adapter->mac_address[0] = mac_addr_lo & 0xFF;
-   adapter->mac_address[1] = (mac_addr_lo >> 8) & 0xFF;
-   adapter->mac_address[2] = (mac_addr_lo >> 16) & 0xFF;
-   adapter->mac_address[3] = (mac_addr_lo >> 24) & 0xFF;
-   adapter->mac_address[4] = mac_addr_hi & 0xFF;
-   adapter->mac_address[5] = (mac_addr_hi >> 8) & 0xFF;
+   if (!is_valid_ether_addr(adapter->mac_address)) {
+   mac_addr_hi = lan743x_csr_read(adapter, MAC_RX_ADDRH);
+   mac_addr_lo = lan743x_csr_read(adapter, MAC_RX_ADDRL);
+   adapter->mac_address[0] = mac_addr_lo & 0xFF;
+   adapter->mac_address[1] = (mac_addr_lo >> 8) & 0xFF;
+   adapter->mac_address[2] = (mac_addr_lo >> 16) & 0xFF;
+   adapter->mac_address[3] = (mac_addr_lo >> 24) & 0xFF;
+   adapter->mac_address[4] = mac_addr_hi & 0xFF;
+   adapter->mac_address[5] = (mac_addr_hi >> 8) & 0xFF;
+
+   if (((mac_addr_hi & 0x) == 0x) &&
+   mac_addr_lo == 0x) {
+   mac_address_valid = false;
+   } else if (!is_valid_ether_addr(adapter->mac_address)) {
+   mac_address_valid = false;
+   }
 
-   if (((mac_addr_hi & 0x) == 0x) &&
-   mac_addr_lo == 0x) {
-   mac_address_valid = false;
-   } else if (!is_valid_ether_addr(adapter->mac_address)) {
-   mac_address_valid = false;
+   if (!mac_address_valid)
+   eth_random_addr(adapter->mac_address);
}
-
-   if (!mac_address_valid)
-   eth_random_addr(adapter->mac_address);
lan743x_mac_set_address(adapter, adapter->mac_address);
ether_addr_copy(netdev->dev_addr, adapter->mac_address);
+
return 0;
 }
 
@@ -2756,6 +2760,7 @@ static int lan743x_pcidev_probe(struct pci_dev *pdev,
 {
struct lan743x_adapter *adapter = NULL;
struct net_device *netdev = NULL;
+   const void *mac_addr;
int ret = -ENODEV;
 
netdev = devm_alloc_etherdev(>dev,
@@ -2772,6 +2777,10 @@ static int lan743x_pcidev_probe(struct pci_dev *pdev,
  NETIF_MSG_IFDOWN | NETIF_MSG_TX_QUEUED;
netdev->max_mtu = LAN743X_MAX_FRAME_SIZE;
 
+   mac_addr = of_get_mac_address(pdev->dev.of_node);
+   if (!IS_ERR(mac_addr))
+   ether_addr_copy(adapter->mac_address, mac_addr);
+
ret = lan743x_pci_init(adapter, pdev);
if (ret)
goto return_error;
-- 
2.7.4