net: phy: Support setting polarity in marvell phy driver

[firefly-linux-kernel-4.4.55.git] / drivers / net / phy / phy.c

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 47cd578052fc2328169fcc9df304be79e7af9ac5..84b1fba58ac3c8efcbbb0bf9311b442ac52614c1 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -58,6 +58,31 @@ static const char *phy_speed_to_str(int speed)
        }
 }
 
+#define PHY_STATE_STR(_state)                  \
+       case PHY_##_state:                      \
+               return __stringify(_state);     \
+
+static const char *phy_state_to_str(enum phy_state st)
+{
+       switch (st) {
+       PHY_STATE_STR(DOWN)
+       PHY_STATE_STR(STARTING)
+       PHY_STATE_STR(READY)
+       PHY_STATE_STR(PENDING)
+       PHY_STATE_STR(UP)
+       PHY_STATE_STR(AN)
+       PHY_STATE_STR(RUNNING)
+       PHY_STATE_STR(NOLINK)
+       PHY_STATE_STR(FORCING)
+       PHY_STATE_STR(CHANGELINK)
+       PHY_STATE_STR(HALTED)
+       PHY_STATE_STR(RESUMING)
+       }
+
+       return NULL;
+}
+
+
 /**
  * phy_print_status - Convenience function to print out the current phy status
  * @phydev: the phy_device struct
@@ -328,6 +353,8 @@ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 
        phydev->duplex = cmd->duplex;
 
+       phydev->mdix = cmd->eth_tp_mdix_ctrl;
+
        /* Restart the PHY */
        phy_start_aneg(phydev);
 
@@ -352,6 +379,7 @@ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
        cmd->transceiver = phy_is_internal(phydev) ?
                XCVR_INTERNAL : XCVR_EXTERNAL;
        cmd->autoneg = phydev->autoneg;
+       cmd->eth_tp_mdix_ctrl = phydev->mdix;
 
        return 0;
 }
@@ -784,10 +812,13 @@ void phy_state_machine(struct work_struct *work)
        struct phy_device *phydev =
                        container_of(dwork, struct phy_device, state_queue);
        bool needs_aneg = false, do_suspend = false;
+       enum phy_state old_state;
        int err = 0;
 
        mutex_lock(&phydev->lock);
 
+       old_state = phydev->state;
+
        if (phydev->drv->link_change_notify)
                phydev->drv->link_change_notify(phydev);
 
@@ -952,6 +983,9 @@ void phy_state_machine(struct work_struct *work)
        if (err < 0)
                phy_error(phydev);
 
+       dev_dbg(&phydev->dev, "PHY state change %s -> %s\n",
+               phy_state_to_str(old_state), phy_state_to_str(phydev->state));
+
        queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,
                           PHY_STATE_TIME * HZ);
 }
@@ -1062,8 +1096,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
        if ((phydev->duplex == DUPLEX_FULL) &&
            ((phydev->interface == PHY_INTERFACE_MODE_MII) ||
            (phydev->interface == PHY_INTERFACE_MODE_GMII) ||
-           (phydev->interface >= PHY_INTERFACE_MODE_RGMII &&
-            phydev->interface <= PHY_INTERFACE_MODE_RGMII_TXID) ||
+            phy_interface_is_rgmii(phydev) ||
             phy_is_internal(phydev))) {
                int eee_lp, eee_cap, eee_adv;
                u32 lp, cap, adv;