Skip to content

Commit

Permalink
net: bgmac-bcma: handle deferred probe error due to mac-address
Browse files Browse the repository at this point in the history
Due to the inclusion of nvmem handling into the mac-address getter
function of_get_mac_address() by
commit d01f449 ("of_net: add NVMEM support to of_get_mac_address")
it is now possible to get a -EPROBE_DEFER return code. Which did cause
bgmac to assign a random ethernet address.

This exact issue happened on my Meraki MR32. The nvmem provider is
an EEPROM (at24c64) which gets instantiated once the module
driver is loaded... This happens once the filesystem becomes available.

With this patch, bgmac_probe() will propagate the -EPROBE_DEFER error.
Then the driver subsystem will reschedule the probe at a later time.

Cc: Petr Štetiar <ynezz@true.cz>
Cc: Michael Walle <michael@walle.cc>
Fixes: d01f449 ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
chunkeey authored and davem330 committed Sep 19, 2021
1 parent fd292c1 commit 029497e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/net/ethernet/broadcom/bgmac-bcma.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ static int bgmac_probe(struct bcma_device *core)
bcma_set_drvdata(core, bgmac);

err = of_get_mac_address(bgmac->dev->of_node, bgmac->net_dev->dev_addr);
if (err == -EPROBE_DEFER)
return err;

/* If no MAC address assigned via device tree, check SPROM */
if (err) {
Expand Down

0 comments on commit 029497e

Please sign in to comment.