Commit 87454b6e authored by Russell King's avatar Russell King Committed by David S. Miller

net: phylink: avoid resolving link state too early

During testing on Armada 388 platforms, it was found with a certain
module configuration that it was possible to trigger a kernel oops
during the module load process, caused by the phylink resolver being
triggered for a currently disabled interface.

This problem was introduced by changing the way the SFP registration
works, which now can result in the sfp link down notification being
called during phylink_create().

Fixes: b5bfc21a ("net: sfp: do not probe SFP module before we're attached")
Signed-off-by: 's avatarRussell King <>
Signed-off-by: 's avatarDavid S. Miller <>
parent a7603ac1
......@@ -474,6 +474,17 @@ static void phylink_run_resolve(struct phylink *pl)
queue_work(system_power_efficient_wq, &pl->resolve);
static void phylink_run_resolve_and_disable(struct phylink *pl, int bit)
unsigned long state = pl->phylink_disable_state;
set_bit(bit, &pl->phylink_disable_state);
if (state == 0) {
queue_work(system_power_efficient_wq, &pl->resolve);
static void phylink_fixed_poll(struct timer_list *t)
struct phylink *pl = container_of(t, struct phylink, link_poll);
......@@ -924,9 +935,7 @@ void phylink_stop(struct phylink *pl)
if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio))
set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
queue_work(system_power_efficient_wq, &pl->resolve);
phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED);
......@@ -1632,9 +1641,7 @@ static void phylink_sfp_link_down(void *upstream)
set_bit(PHYLINK_DISABLE_LINK, &pl->phylink_disable_state);
queue_work(system_power_efficient_wq, &pl->resolve);
phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_LINK);
static void phylink_sfp_link_up(void *upstream)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment