Skip to contentSkip to conversation

net: ftgmac100: support getting MAC address from NVMEM

PATCH Applied Paul Fertser 4 participants 5 messages Jul 13, 2023 – Jul 18, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ftgmac100: support getting MAC address from NVMEM

Make use of of_get_ethdev_address() to support reading MAC address not only from the usual DT nodes but also from an NVMEM provider (e.g. using a dedicated area in an FRU EEPROM).

---
 drivers/net/ethernet/faraday/ftgmac100.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/faraday/ftgmac100.c +12 -4
index a03879a27b04..9135b918dd49 100644
@@ -177,16 +177,20 @@ static void ftgmac100_write_mac_addr(struct ftgmac100 *priv, const u8 *mac)
 	iowrite32(laddr, priv->base + FTGMAC100_OFFSET_MAC_LADR);
 }
 
-static void ftgmac100_initial_mac(struct ftgmac100 *priv)
+static int ftgmac100_initial_mac(struct ftgmac100 *priv)
 {
 	u8 mac[ETH_ALEN];
 	unsigned int m;
 	unsigned int l;
+	int err;
 
-	if (!device_get_ethdev_address(priv->dev, priv->netdev)) {
+	err = of_get_ethdev_address(priv->dev->of_node, priv->netdev);
+	if (err == -EPROBE_DEFER)
+		return err;
+	if (!err) {
 		dev_info(priv->dev, "Read MAC address %pM from device tree\n",
 			 priv->netdev->dev_addr);
-		return;
+		return 0;
 	}
 
 	m = ioread32(priv->base + FTGMAC100_OFFSET_MAC_MADR);
@@ -207,6 +211,8 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
 		dev_info(priv->dev, "Generated random MAC address %pM\n",
 			 priv->netdev->dev_addr);
 	}
+
+	return 0;
 }
 
 static int ftgmac100_set_mac_addr(struct net_device *dev, void *p)
@@ -1843,7 +1849,9 @@ static int ftgmac100_probe(struct platform_device *pdev)
 	priv->aneg_pause = true;
 
 	/* MAC address from chip or random one */
-	ftgmac100_initial_mac(priv);
+	err = ftgmac100_initial_mac(priv);
+	if (err)
+		goto err_phy_connect;
 
 	np = pdev->dev.of_node;
 	if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
Signature · 1 line
2.34.1
#1 lore raw
Quoted 5 lines · Paul Fertser

Make use of of_get_ethdev_address() to support reading MAC address not only from the usual DT nodes but also from an NVMEM provider (e.g. using a dedicated area in an FRU EEPROM).

Looks like earlier ftgmac100_probe() would move on with self generated (random) MAC addr if getting it from the device failed.
Now you will fail the probe in a failure case. Is that OK?

Quoted 57 lines
---
 drivers/net/ethernet/faraday/ftgmac100.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/faraday/ftgmac100.c +12 -5
index a03879a27b04..9135b918dd49 100644
@@ -177,16 +177,20 @@ static void ftgmac100_write_mac_addr(struct ftgmac100 *priv, const u8 *mac)
        iowrite32(laddr, priv->base + FTGMAC100_OFFSET_MAC_LADR);
 }
 
-static void ftgmac100_initial_mac(struct ftgmac100 *priv)
+static int ftgmac100_initial_mac(struct ftgmac100 *priv)
 {
        u8 mac[ETH_ALEN];
        unsigned int m;
        unsigned int l;
+       int err;
 
-       if (!device_get_ethdev_address(priv->dev, priv->netdev)) {
+       err = of_get_ethdev_address(priv->dev->of_node, priv->netdev);
+       if (err == -EPROBE_DEFER)
+               return err;
+       if (!err) {
                dev_info(priv->dev, "Read MAC address %pM from device tree\n",
                         priv->netdev->dev_addr);
-               return;
+               return 0;
        }
 
        m = ioread32(priv->base + FTGMAC100_OFFSET_MAC_MADR);
@@ -207,6 +211,8 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
                dev_info(priv->dev, "Generated random MAC address %pM\n",
                         priv->netdev->dev_addr);
        }
+
+       return 0;
 }
 
 static int ftgmac100_set_mac_addr(struct net_device *dev, void *p)
@@ -1843,7 +1849,9 @@ static int ftgmac100_probe(struct platform_device *pdev)
        priv->aneg_pause = true;
 
        /* MAC address from chip or random one */
-       ftgmac100_initial_mac(priv);
+       err = ftgmac100_initial_mac(priv);
+       if (err)
+               goto err_phy_connect;
 
        np = pdev->dev.of_node;
        if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac") ||
--

2.34.1

#2 lore raw

Hello Pavan,

Quoted 8 lines · Pavan Chebbi
Quoted 3 lines · Paul Fertser

Make use of of_get_ethdev_address() to support reading MAC address not only from the usual DT nodes but also from an NVMEM provider (e.g. using a dedicated area in an FRU EEPROM).

Looks like earlier ftgmac100_probe() would move on with self generated (random) MAC addr if getting it from the device failed.
Now you will fail the probe in a failure case. Is that OK?

I think the previous behaviour is preserved with this patch in all the cases other than of_get_ethdev_address returning -EPROBE_DEFER. Can you please explain what failure case you have in mind and how the probe is going to be failed in that case?

Signature · 2 lines
Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software!
mailto:[email protected]
maintainer
#3 lore raw
Quoted 8 lines · Paul Fertser

Hello Pavan,

Quoted 5 lines · Pavan Chebbi
Quoted 3 lines · Paul Fertser

Make use of of_get_ethdev_address() to support reading MAC address not only from the usual DT nodes but also from an NVMEM provider (e.g. using a dedicated area in an FRU EEPROM).

Quoted 8 lines
Quoted 3 lines

Looks like earlier ftgmac100_probe() would move on with self generated (random) MAC addr if getting it from the device failed.
Now you will fail the probe in a failure case. Is that OK?

I think the previous behaviour is preserved with this patch in all the cases other than of_get_ethdev_address returning -EPROBE_DEFER. Can you please explain what failure case you have in mind and how the probe is going to be failed in that case?

FTR, I agree with the above: it looks like the old behavior is preserved. The patch LGTM, thanks!

Paolo

#4 lore raw
In reply to Paul Fertser
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:

Quoted 8 lines · On Thu, 13 Jul 2023 12:57:43 +0300 you wrote:

Make use of of_get_ethdev_address() to support reading MAC address not only from the usual DT nodes but also from an NVMEM provider (e.g. using a dedicated area in an FRU EEPROM).

---
 drivers/net/ethernet/faraday/ftgmac100.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Here is the summary with links:
- net: ftgmac100: support getting MAC address from NVMEM

    https://git.kernel.org/netdev/net-next/c/2cee73cef253

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html