wifi: wfx: handle EPROBE_DEFER with of_get_mac_address
PATCH 1/1 wifi: wfx: handle EPROBE_DEFER with of_get_mac_address
In case nvmem gets used and is not ready in time for probe of wfx, EPROBE_DEFER gets called. Return it so that a proper MAC address can be specified in such a case.
--- drivers/net/wireless/silabs/wfx/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/silabs/wfx/main.c +2 -0
@@ -445,6 +445,8 @@ int wfx_probe(struct wfx_dev *wdev)for (i =0 ; i <ARRAY_SIZE (wdev->addresses); i++) {eth_zero_addr (wdev->addresses[i].addr); err =of_get_mac_address (wdev->dev->of_node, wdev->addresses[i].addr); +if (err == -EPROBE_DEFER ) + goto irq_unsubscribe;if (!err) wdev->addresses[i].addr[ETH_ALEN -1 ] += i;else
Signature · 1 line
2.54.0
Jérôme Pouiller
maintainerHello Rosen,
Quoted 15 lines · On Monday 27 April 2026 07:16:04 Central European Summer Time Rosen Penev wrote:
In case nvmem gets used and is not ready in time for probe of wfx,
EPROBE_DEFERgets called. Return it so that a proper MAC address can be specified in such a case.Signed-off-by Rosen Penev <[email protected]>--- drivers/net/wireless/silabs/wfx/main.c | 2 ++ 1 file changed, 2 insertions(+)drivers/net/wireless/silabs/wfx/main.c +0
-0
drivers/net/wireless/silabs/wfx/main.c int wfx_probe(struct wfx_dev *wdev) · line 452
Quoted 8 lines
drivers/net/wireless/silabs/wfx/main.c +2
-0@@ -445,6 +445,8 @@ int wfx_probe(struct wfx_dev *wdev)for (i =0 ; i <ARRAY_SIZE (wdev->addresses); i++) {eth_zero_addr (wdev->addresses[i].addr); err =of_get_mac_address (wdev->dev->of_node, wdev->addresses[i].addr); +if (err == -EPROBE_DEFER ) + goto irq_unsubscribe;if (!err) wdev->addresses[i].addr[ETH_ALEN -1 ] += i;else
I assume this patch works when WF200 is connected on SPI with reset GPIO configured. However, for SDIO and without gpio reset, we can't run the device initialisation twice.
I believe the check has to happen before the call to wfx_init_device().
To check it works as expected, can you also test your patch without the reset-gpio attribute?
Signature · 1 line
Jérôme Pouiller
Quoted 32 lines · Jérôme Pouiller
Hello Rosen,
Quoted 15 lines · On Monday 27 April 2026 07:16:04 Central European Summer Time Rosen Penev wrote:
In case nvmem gets used and is not ready in time for probe of wfx,
EPROBE_DEFERgets called. Return it so that a proper MAC address can be specified in such a case.Signed-off-by Rosen Penev <[email protected]>--- drivers/net/wireless/silabs/wfx/main.c | 2 ++ 1 file changed, 2 insertions(+)drivers/net/wireless/silabs/wfx/main.c +0
-0drivers/net/wireless/silabs/wfx/main.c int wfx_probe(struct wfx_dev *wdev) · line 452
Quoted 8 lines
drivers/net/wireless/silabs/wfx/main.c +2
-0@@ -445,6 +445,8 @@ int wfx_probe(struct wfx_dev *wdev)for (i =0 ; i <ARRAY_SIZE (wdev->addresses); i++) {eth_zero_addr (wdev->addresses[i].addr); err =of_get_mac_address (wdev->dev->of_node, wdev->addresses[i].addr); +if (err == -EPROBE_DEFER ) + goto irq_unsubscribe;if (!err) wdev->addresses[i].addr[ETH_ALEN -1 ] += i;else I assume this patch works when WF200 is connected on SPI with reset GPIO configured. However, for SDIO and without gpio reset, we can't run the device initialisation twice.
Quoted 4 lines
I believe the check has to happen before the call to
wfx_init_device().To check it works as expected, can you also test your patch without the reset-gpio attribute?
I do not have this hardware.
Quoted 6 lines
--
Jérôme Pouiller