net: phy: don't reschedule state machine when PHY is halted
Subsystems (3)
Heiner Kallweit
maintainerPATCH 1/1 net: phy: don't reschedule state machine when PHY is halted
I think I've seen a similar or same patch before, not sure why it didn't make it yet. When being in state PHY_HALTED we don't have to reschedule the state machine, phy_start() will start it again.
--- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/phy.c +1 -1
@@ -1123,7 +1123,7 @@ void phy_state_machine(struct work_struct *work)* PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving * between states from phy_mac_interrupt() */ -if (phy_polling_mode (phydev)) +if (phy_polling_mode (phydev) && old_state !=PHY_HALTED )queue_delayed_work (system_power_efficient_wq, &phydev->state_queue,PHY_STATE_TIME *HZ ); }
Signature · 1 line
2.19.0
Quoted 3 lines · Heiner Kallweit
I think I've seen a similar or same patch before, not sure why it didn't make it yet. When being in state
PHY_HALTEDwe don't have to reschedule the state machine,phy_start()will start it again.
Yes, this is conceptually the same patch as as this one:
https://patchwork.ozlabs.org/patch/830415/
I prefer your version, though the comment in the original patch explains why.
Quoted 20 lines
Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/phy/phy.c +1
-1@@ -1123,7 +1123,7 @@ void phy_state_machine(struct work_struct *work)* PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving * between states from phy_mac_interrupt() */ -if (phy_polling_mode (phydev)) +if (phy_polling_mode (phydev) && old_state !=PHY_HALTED )queue_delayed_work (system_power_efficient_wq, &phydev->state_queue,PHY_STATE_TIME *HZ ); }
Signature · 1 line
Florian
Heiner Kallweit
maintainerQuoted 9 lines · Florian Fainelli
Quoted 3 lines · Heiner Kallweit
I think I've seen a similar or same patch before, not sure why it didn't make it yet. When being in state
PHY_HALTEDwe don't have to reschedule the state machine,phy_start()will start it again.Yes, this is conceptually the same patch as as this one:
Thanks for the link, this is what I was referring to.
Quoted 3 lines
I prefer your version, though the comment in the original patch explains why.
To be sure I understand you correctly:
You're fine with the patch as is or would you prefer to add a comment like in the original patch ?
Quoted 22 lines
Quoted 20 lines
Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/phy/phy.c +1
-1@@ -1123,7 +1123,7 @@ void phy_state_machine(struct work_struct *work)* PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving * between states from phy_mac_interrupt() */ -if (phy_polling_mode (phydev)) +if (phy_polling_mode (phydev) && old_state !=PHY_HALTED )queue_delayed_work (system_power_efficient_wq, &phydev->state_queue,PHY_STATE_TIME *HZ ); }
Quoted 10 lines · Heiner Kallweit
Quoted 9 lines · Florian Fainelli
Quoted 3 lines · Heiner Kallweit
I think I've seen a similar or same patch before, not sure why it didn't make it yet. When being in state
PHY_HALTEDwe don't have to reschedule the state machine,phy_start()will start it again.Yes, this is conceptually the same patch as as this one:
Quoted 8 lines
Thanks for the link, this is what I was referring to.
Quoted 3 lines
I prefer your version, though the comment in the original patch explains why.
To be sure I understand you correctly:
You're fine with the patch as is or would you prefer to add a comment like in the original patch ?
Correct, unless you think this does not warrant a comment and it is clear enough as-is?
Quoted 24 lines
Quoted 23 lines
Quoted 21 lines
Signed-off-by Heiner Kallweit <[email protected]>--- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/phy/phy.c +1
-1@@ -1123,7 +1123,7 @@ void phy_state_machine(struct work_struct *work)* PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving * between states from phy_mac_interrupt() */ -if (phy_polling_mode (phydev)) +if (phy_polling_mode (phydev) && old_state !=PHY_HALTED )queue_delayed_work (system_power_efficient_wq, &phydev->state_queue,PHY_STATE_TIME *HZ ); }
Signature · 1 line
Florian
Heiner Kallweit
maintainerPATCH v2 1/1 net: phy: don't reschedule state machine when PHY is halted
In reply to Heiner KallweitWhen being in state PHY_HALTED we don't have to reschedule the state machine, phy_start() will start it again.
---
v2:
- added comment
--- drivers/net/phy/phy.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/phy/phy.c +6 -2
@@ -1123,9 +1123,13 @@ void phy_state_machine(struct work_struct *work)/* Only re-schedule a PHY state machine change if we are polling the * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving -* between states from phy_mac_interrupt() +* between states from phy_mac_interrupt(). +* +* In state PHY_HALTED the PHY gets suspended, so rescheduling the +* state machine would be pointless and possibly error prone when +* called from phy_disconnect() synchronously. */ -if (phy_polling_mode (phydev)) +if (phy_polling_mode (phydev) && old_state !=PHY_HALTED )queue_delayed_work (system_power_efficient_wq, &phydev->state_queue,PHY_STATE_TIME *HZ ); }
Signature · 1 line
2.19.0
Quoted 4 lines · Heiner Kallweit
When being in state
PHY_HALTEDwe don't have to reschedule the state machine,phy_start()will start it again.Signed-off-by Heiner Kallweit <[email protected]>
Signature · 1 line
Florian