net: sfp: control TX_DISABLE and phy only from main state machine
We initialise TX_DISABLE when the sfp cage is probed, and then maintain its state in the main state machine. However, the module state machine: - negates it when detecting a newly inserted module when it's already guaranteed to be negated. - negates it when the module is removed, but the main state machine will do this anyway. Make TX_DISABLE entirely controlled by the main state machine. The main state machine also probes the module for a PHY, and removes the PHY when the the module is removed. Hence, removing the PHY in sfp_sm_module_remove() is also redundant, and is a left-over from when we tried to probe for the PHY from the module 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:
parent
7cfa9c92d0
commit
8e210b6bdc
|
@ -1557,11 +1557,6 @@ static void sfp_sm_mod_remove(struct sfp *sfp)
|
||||||
|
|
||||||
sfp_hwmon_remove(sfp);
|
sfp_hwmon_remove(sfp);
|
||||||
|
|
||||||
if (sfp->mod_phy)
|
|
||||||
sfp_sm_phy_detach(sfp);
|
|
||||||
|
|
||||||
sfp_module_tx_disable(sfp);
|
|
||||||
|
|
||||||
memset(&sfp->id, 0, sizeof(sfp->id));
|
memset(&sfp->id, 0, sizeof(sfp->id));
|
||||||
sfp->module_power_mW = 0;
|
sfp->module_power_mW = 0;
|
||||||
|
|
||||||
|
@ -1599,10 +1594,8 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event)
|
||||||
|
|
||||||
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)
|
||||||
sfp_module_tx_disable(sfp);
|
|
||||||
sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL);
|
sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL);
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SFP_MOD_PROBE:
|
case SFP_MOD_PROBE:
|
||||||
|
|
Loading…
Reference in New Issue