The IOC3 on Fuel's system board has no MAC PROM on its 1-wire bus, so
ioc3eth_get_mac_addr() cannot succeed there and the probe defers for
ever. Ask eth_platform_get_mac_address() before deferring; on IP35
machines it answers from the L1 system controller. Once deferred probing
gives up with neither source answering, use a random address.
Signed-off-by: Imre Kaloz <kaloz@kernel.org>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 8702dfdf4c36..85b49e7b0f79 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -857,9 +857,16 @@ static int ioc3eth_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Invalid resource\n");
return -EINVAL;
}
- /* get mac addr from one wire prom */
- if (ioc3eth_get_mac_addr(regs, mac_addr))
- return -EPROBE_DEFER; /* not available yet */
+ /* get mac addr from one wire prom, or from the platform */
+ if (ioc3eth_get_mac_addr(regs, mac_addr) &&
+ eth_platform_get_mac_address(&pdev->dev, mac_addr)) {
+ err = driver_deferred_probe_check_state(&pdev->dev);
+ if (err == -EPROBE_DEFER)
+ return err; /* not available yet */
+
+ dev_warn(&pdev->dev, "no MAC address, using a random one\n");
+ eth_random_addr(mac_addr);
+ }
dev = alloc_etherdev(sizeof(struct ioc3_private));
if (!dev)--
2.47.3