niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

net: sfp: handle module remove outside state machine

Browse source 
Removing a module resets the module state machine back to its initial
state.  Rather than explicitly handling this in every state, handle it
early on outside of the state machine.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2019-11-10 14:06:28 +00:00 • committed by David S. Miller
parent 0936ebc42f
commit d2e816c029
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/phy/sfp.c
View file

@ -1565,6 +1565,14 @@ static void sfp_sm_device(struct sfp *sfp, unsigned int event)
*/ */
static void sfp_sm_module(struct sfp *sfp, unsigned int event) static void sfp_sm_module(struct sfp *sfp, unsigned int event)
{ {
/* Handle remove event globally, it resets this state machine */
if (event == SFP_E_REMOVE) {
if (sfp->sm_mod_state > SFP_MOD_PROBE)
sfp_sm_mod_remove(sfp);
sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
return;
}
switch (sfp->sm_mod_state) { switch (sfp->sm_mod_state) {
default: default:
if (event == SFP_E_INSERT && sfp->attached) { if (event == SFP_E_INSERT && sfp->attached) {
@ -1574,9 +1582,7 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event)
break; break;
case SFP_MOD_PROBE: case SFP_MOD_PROBE:
if (event == SFP_E_REMOVE) { if (event == SFP_E_TIMEOUT) {
sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
} else if (event == SFP_E_TIMEOUT) {
int val = sfp_sm_mod_probe(sfp); int val = sfp_sm_mod_probe(sfp);
if (val == 0) if (val == 0)
@ -1598,10 +1604,6 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event)
/* fallthrough */ /* fallthrough */
case SFP_MOD_PRESENT: case SFP_MOD_PRESENT:
case SFP_MOD_ERROR: case SFP_MOD_ERROR:
if (event == SFP_E_REMOVE) {
sfp_sm_mod_remove(sfp);
sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
}
break; break;
} }
} }