openwrt-mirror/openwrt
1
0 Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-10-12 06:57:57 +04:00
Code Issues Packages Projects Releases Wiki Activity

bmips: enetsw: fix probe after EPROBE_DEFER

Browse Source 
Since the MAC lookup started returning -EPROBE_DEFER, a probe that
defers while its nvmem provider (e.g. a mac-base cell in the CFE
partition) isn't ready yet leaves the power domain devices attached
by genpd_dev_pm_attach_by_id() behind. The next probe then fails to
re-create them:

  sysfs: cannot create duplicate filename '/devices/genpd:0:1000d800.ethernet'
  bcm6368-enetsw 1000d800.ethernet: error getting pm 0
  bcm6368-enetsw 1000d800.ethernet: probe with driver bcm6368-enetsw failed with error -22

leaving the board without ethernet and the DSA switch deferred forever.
Look up the MAC first, before anything that isn't device-managed has
been set up, so a deferred probe can simply be retried.

Seen on a BCM6328 (BeWAN A2100N) with kernel 6.18.

Fixes: ed545519ee ("bmips: enet: handle EPROBE_DEFER for the MAC address")
Signed-off-by: Max Plekh <mplekh@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/25454
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Max Plekh authored and Hauke Mehrtens committed 2026-10-05 00:24:07 +02:00
1 parent f795077528
commit 81919eb7e4
1 file changed
+18 -12
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
+18 -12
View File
@@ -938,6 +938,24 @@ static int bcm6368_enetsw_probe(struct platform_device *pdev)
priv->pdev = pdev;
priv->net_dev = ndev;
/*
* Look up the MAC first: an nvmem provider that isn't ready yet makes
* this return -EPROBE_DEFER, which must happen before the power
* domains are attached below, as those aren't released on defer and
* re-attaching them on the next probe fails with -EEXIST.
*/
ret = of_get_mac_address(node, dev_addr);
if (ret == -EPROBE_DEFER)
return ret;
if (is_valid_ether_addr(dev_addr)) {
dev_addr_set(ndev, dev_addr);
dev_info(dev, "mtd mac %pM\n", dev_addr);
} else {
eth_hw_addr_random(ndev);
dev_info(dev, "random mac\n");
}
priv->num_pms = of_count_phandle_with_args(node, "power-domains",
"#power-domain-cells");
if (priv->num_pms > 1) {
@@ -1010,18 +1028,6 @@ static int bcm6368_enetsw_probe(struct platform_device *pdev)
priv->tx_ring_size = ENETSW_DEF_TX_DESC;
priv->copybreak = ENETSW_DEF_CPY_BREAK;
ret = of_get_mac_address(node, dev_addr);
if (ret == -EPROBE_DEFER)
return ret;
if (is_valid_ether_addr(dev_addr)) {
dev_addr_set(ndev, dev_addr);
dev_info(dev, "mtd mac %pM\n", dev_addr);
} else {
eth_hw_addr_random(ndev);
dev_info(dev, "random mac\n");
}
priv->rx_buf_size = ALIGN(ENETSW_MAX_FRAME,
ENETSW_DMA_MAXBURST * 4);