drivers: net: cpsw: ethtool: fix accessing to suspended device

BugLink: http://bugs.launchpad.net/bugs/1625177
The CPSW might be suspended by RPM if all ethX interfaces are down,
but it still could be accesible through ethtool interfce. In this case
ethtool operations, requiring registers access, will cause L3 errors and
CPSW crash.

ethtool callbcaks which need to access CPSW registers now:
.set_coalesce(), .get_ethtool_stats(), .set_pauseparam(), .get_regs()

Hence, fix it by adding .begin()/.complete() ethtool callbacks, which
will be called before/after each ethtool operation runs, and do CPSW
RPM handling in these callbacks. That way CPSW will be active while
handling ethtool requests.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 7898b1daf055537a8f661828272defecdee49f27)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index d87260d362eeec0248e60f071a849e1630ff30e8..d97c8c719f3605894587a3c921f1576042c9e142 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1907,10 +1907,33 @@ static int cpsw_set_pauseparam(struct net_device *ndev,
        priv->tx_pause = pause->tx_pause ? true : false;
 
        for_each_slave(priv, _cpsw_adjust_link, priv, &link);
-
        return 0;
 }
 
+static int cpsw_ethtool_op_begin(struct net_device *ndev)
+{
+       struct cpsw_priv *priv = netdev_priv(ndev);
+       int ret;
+
+       ret = pm_runtime_get_sync(&priv->pdev->dev);
+       if (ret < 0) {
+               cpsw_err(priv, drv, "ethtool begin failed %d\n", ret);
+               pm_runtime_put_noidle(&priv->pdev->dev);
+       }
+
+       return ret;
+}
+
+static void cpsw_ethtool_op_complete(struct net_device *ndev)
+{
+       struct cpsw_priv *priv = netdev_priv(ndev);
+       int ret;
+
+       ret = pm_runtime_put(&priv->pdev->dev);
+       if (ret < 0)
+               cpsw_err(priv, drv, "ethtool complete failed %d\n", ret);
+}
+
 static const struct ethtool_ops cpsw_ethtool_ops = {
        .get_drvinfo    = cpsw_get_drvinfo,
        .get_msglevel   = cpsw_get_msglevel,
@@ -1930,6 +1953,8 @@ static const struct ethtool_ops cpsw_ethtool_ops = {
        .set_wol        = cpsw_set_wol,
        .get_regs_len   = cpsw_get_regs_len,
        .get_regs       = cpsw_get_regs,
+       .begin          = cpsw_ethtool_op_begin,
+       .complete       = cpsw_ethtool_op_complete,
 };
 
 static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv,