37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 763716a55cb1f480ffe1a9702e6b5d9ea1a80a24 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Hagan <mnhagan88@gmail.com>
|
|
Date: Sat, 25 Sep 2021 11:36:27 +0000
|
|
Subject: [PATCH] net: bgmac-platform: handle mac-address deferral
|
|
|
|
This patch is a replication of Christian Lamparter's "net: bgmac-bcma:
|
|
handle deferred probe error due to mac-address" patch for the
|
|
bgmac-platform driver [1].
|
|
|
|
As is the case with the bgmac-bcma driver, this change is to cover the
|
|
scenario where the MAC address cannot yet be discovered due to reliance
|
|
on an nvmem provider which is yet to be instantiated, resulting in a
|
|
random address being assigned that has to be manually overridden.
|
|
|
|
[1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com
|
|
|
|
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/broadcom/bgmac-platform.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
|
|
@@ -193,6 +193,9 @@ static int bgmac_probe(struct platform_d
|
|
bgmac->dma_dev = &pdev->dev;
|
|
|
|
ret = of_get_mac_address(np, bgmac->net_dev->dev_addr);
|
|
+ if (ret == -EPROBE_DEFER)
|
|
+ return ret;
|
|
+
|
|
if (ret)
|
|
dev_warn(&pdev->dev,
|
|
"MAC address not present in device tree\n");
|