-
-
Notifications
You must be signed in to change notification settings - Fork 10k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bcm4908: fix -EPROBE_DEFER support in bcm4908_enet
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 1722e23)
- Loading branch information
Rafał Miłecki
committed
Sep 21, 2022
1 parent
700f5d2
commit 2a63467
Showing
2 changed files
with
58 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
.../bcm4908/patches-5.10/078-v6.1-net-broadcom-bcm4908_enet-handle-EPROBE_DEFER-when-g.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
From e93a766da57fff3273bcb618edf5dfca1fb86b89 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
Date: Thu, 15 Sep 2022 15:30:13 +0200 | ||
Subject: [PATCH] net: broadcom: bcm4908_enet: handle -EPROBE_DEFER when | ||
getting MAC | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
Reading MAC from OF may return -EPROBE_DEFER if underlaying NVMEM device | ||
isn't ready yet. In such case pass that error code up and "wait" to be | ||
probed later. | ||
|
||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
Link: https://lore.kernel.org/r/20220915133013.2243-1-zajec5@gmail.com | ||
Signed-off-by: Jakub Kicinski <kuba@kernel.org> | ||
--- | ||
drivers/net/ethernet/broadcom/bcm4908_enet.c | 13 +++++++++---- | ||
1 file changed, 9 insertions(+), 4 deletions(-) | ||
|
||
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||
@@ -714,7 +714,9 @@ static int bcm4908_enet_probe(struct pla | ||
return err; | ||
|
||
SET_NETDEV_DEV(netdev, &pdev->dev); | ||
- of_get_mac_address(dev->of_node, netdev->dev_addr); | ||
+ err = of_get_mac_address(dev->of_node, netdev->dev_addr); | ||
+ if (err == -EPROBE_DEFER) | ||
+ goto err_dma_free; | ||
if (!is_valid_ether_addr(netdev->dev_addr)) | ||
eth_hw_addr_random(netdev); | ||
netdev->netdev_ops = &bcm4908_enet_netdev_ops; | ||
@@ -725,14 +727,17 @@ static int bcm4908_enet_probe(struct pla | ||
netif_napi_add(netdev, &enet->rx_ring.napi, bcm4908_enet_poll_rx, NAPI_POLL_WEIGHT); | ||
|
||
err = register_netdev(netdev); | ||
- if (err) { | ||
- bcm4908_enet_dma_free(enet); | ||
- return err; | ||
- } | ||
+ if (err) | ||
+ goto err_dma_free; | ||
|
||
platform_set_drvdata(pdev, enet); | ||
|
||
return 0; | ||
+ | ||
+err_dma_free: | ||
+ bcm4908_enet_dma_free(enet); | ||
+ | ||
+ return err; | ||
} | ||
|
||
static int bcm4908_enet_remove(struct platform_device *pdev) |