net: ethernet: mtk_eth_soc: handle probe deferral
Subsystems (4)
PATCH 1/1 net: ethernet: mtk_eth_soc: handle probe deferral
Move the call to of_get_ethdev_address to mtk_add_mac which is part of the probe function and can hence itself return -EPROBE_DEFER should of_get_ethdev_address return -EPROBE_DEFER. This allows us to entirely get rid of the mtk_init function.
The problem of of_get_ethdev_address returning -EPROBE_DEFER surfaced in situations in which the NVMEM provider holding the MAC address has not yet be loaded at the time mtk_eth_soc is initially probed. In this case probing of mtk_eth_soc should be deferred instead of falling back to use a random MAC address, so once the NVMEM provider becomes available probing can be repeated.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 29 ++++++++------------- 1 file changed, 11 insertions(+), 18 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +11 -18
@@ -3846,23 +3846,6 @@ static int mtk_hw_deinit(struct mtk_eth *eth)return 0 ; } -static int __init mtk_init (struct net_device *dev) -{ -struct mtk_mac *mac =netdev_priv (dev); -struct mtk_eth *eth = mac->hw; -int ret; - - ret =of_get_ethdev_address (mac->of_node, dev); -if (ret) { -/* If the mac address is invalid, use random mac address */ -eth_hw_addr_random (dev); -dev_err (eth->dev,"generated random MAC address %pM\n" , - dev->dev_addr); - } - -return 0 ; -} -static void mtk_uninit (struct net_device *dev) {struct mtk_mac *mac =netdev_priv (dev);
@@ -4278,7 +4261,6 @@ static const struct ethtool_ops mtk_ethtool_ops = { };static const struct net_device_ops mtk_netdev_ops = { - .ndo_init = mtk_init, .ndo_uninit = mtk_uninit, .ndo_open = mtk_open, .ndo_stop = mtk_stop,
@@ -4340,6 +4322,17 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) mac->hw = eth; mac->of_node = np; + err =of_get_ethdev_address (mac->of_node, eth->netdev[id]); +if (err == -EPROBE_DEFER ) +return err; + +if (err) { +/* If the mac address is invalid, use random mac address */ +eth_hw_addr_random (eth->netdev[id]); +dev_err (eth->dev,"generated random MAC address %pM\n" , + eth->netdev[id]->dev_addr); + } +memset (mac->hwlro_ip,0 ,sizeof (mac->hwlro_ip)); mac->hwlro_ip_cnt =0 ;
Signature · 1 line
2.41.0
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 5 lines · On Thu, 13 Jul 2023 03:42:29 +0100 you wrote:
Move the call to
of_get_ethdev_addresstomtk_add_macwhich is part of the probe function and can hence itself return -EPROBE_DEFER shouldof_get_ethdev_addressreturn -EPROBE_DEFER. This allows us to entirely get rid of themtk_initfunction.
Quoted 8 lines
The problem of
of_get_ethdev_addressreturning -EPROBE_DEFER surfaced in situations in which the NVMEM provider holding the MAC address has not yet be loaded at the timemtk_eth_socis initially probed. In this case probing ofmtk_eth_socshould be deferred instead of falling back to use a random MAC address, so once the NVMEM provider becomes available probing can be repeated.[...]
Here is the summary with links:
- net: ethernet: mtk_eth_soc: handle probe deferral
https://git.kernel.org/netdev/net/c/1d6d537dc55d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html