[PATCH RFCv2 6/6] net: phy: suspend phydev when going to HALTED

2013-12-04 Thread Sebastian Hesselbarth
When phydev is going to HALTED state, we can try to suspend it to
safe more power. phy_suspend helper will check if PHY can be suspended,
so just call it when entering HALTED state.

Signed-off-by: Sebastian Hesselbarth 
---
Changelog:
RFCv1->RFCv2:
- initial, integrate phy_suspend to phy state machine
  (Suggested by Mugunthan and Florian)

Cc: David Miller 
Cc: Florian Fainelli 
Cc: Mugunthan V N 
Cc: net...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/net/phy/phy.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 36c6994..6429942 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -740,7 +740,7 @@ void phy_state_machine(struct work_struct *work)
struct delayed_work *dwork = to_delayed_work(work);
struct phy_device *phydev =
container_of(dwork, struct phy_device, state_queue);
-   int needs_aneg = 0;
+   int needs_aneg = 0, do_suspend = 0;
int err = 0;
 
mutex_lock(>lock);
@@ -855,6 +855,7 @@ void phy_state_machine(struct work_struct *work)
phydev->link = 0;
netif_carrier_off(phydev->attached_dev);
phydev->adjust_link(phydev->attached_dev);
+   do_suspend = 1;
}
break;
case PHY_RESUMING:
@@ -913,6 +914,9 @@ void phy_state_machine(struct work_struct *work)
if (needs_aneg)
err = phy_start_aneg(phydev);
 
+   if (do_suspend)
+   phy_suspend(phydev);
+
if (err < 0)
phy_error(phydev);
 
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH RFCv2 6/6] net: phy: suspend phydev when going to HALTED

2013-12-04 Thread Sebastian Hesselbarth
When phydev is going to HALTED state, we can try to suspend it to
safe more power. phy_suspend helper will check if PHY can be suspended,
so just call it when entering HALTED state.

Signed-off-by: Sebastian Hesselbarth sebastian.hesselba...@gmail.com
---
Changelog:
RFCv1-RFCv2:
- initial, integrate phy_suspend to phy state machine
  (Suggested by Mugunthan and Florian)

Cc: David Miller da...@davemloft.net
Cc: Florian Fainelli f.faine...@gmail.com
Cc: Mugunthan V N mugunthan...@ti.com
Cc: net...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/net/phy/phy.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 36c6994..6429942 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -740,7 +740,7 @@ void phy_state_machine(struct work_struct *work)
struct delayed_work *dwork = to_delayed_work(work);
struct phy_device *phydev =
container_of(dwork, struct phy_device, state_queue);
-   int needs_aneg = 0;
+   int needs_aneg = 0, do_suspend = 0;
int err = 0;
 
mutex_lock(phydev-lock);
@@ -855,6 +855,7 @@ void phy_state_machine(struct work_struct *work)
phydev-link = 0;
netif_carrier_off(phydev-attached_dev);
phydev-adjust_link(phydev-attached_dev);
+   do_suspend = 1;
}
break;
case PHY_RESUMING:
@@ -913,6 +914,9 @@ void phy_state_machine(struct work_struct *work)
if (needs_aneg)
err = phy_start_aneg(phydev);
 
+   if (do_suspend)
+   phy_suspend(phydev);
+
if (err  0)
phy_error(phydev);
 
-- 
1.7.2.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/