phylink: get rid of separate Cisco SGMII and 802.3z modes

Since the handling of SGMII and 802.3z is now the same, combine the
MLO_AN_xxx constants into a single MLO_AN_INBAND, and use the PHY
interface mode to distinguish between Cisco SGMII and 802.3z.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index d7006fdc8f713149d7b774f8eba14b8a600c4b8c..34ecdb892f57be9d50db28e6e0ed521b09146f4a 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -117,8 +117,7 @@ static const char *phylink_an_mode_str(unsigned int mode)
        static const char *modestr[] = {
                [MLO_AN_PHY] = "phy",
                [MLO_AN_FIXED] = "fixed",
-               [MLO_AN_SGMII] = "SGMII",
-               [MLO_AN_8023Z] = "802.3z",
+               [MLO_AN_INBAND] = "inband",
        };
 
        return mode < ARRAY_SIZE(modestr) ? modestr[mode] : "unknown";
@@ -244,6 +243,7 @@ static int phylink_parse_mode(struct phylink *pl, struct device_node *np)
                phylink_set(pl->supported, Asym_Pause);
                phylink_set(pl->supported, Pause);
                pl->link_config.an_enabled = true;
+               pl->link_an_mode = MLO_AN_INBAND;
 
                switch (pl->link_config.interface) {
                case PHY_INTERFACE_MODE_SGMII:
@@ -253,17 +253,14 @@ static int phylink_parse_mode(struct phylink *pl, struct device_node *np)
                        phylink_set(pl->supported, 100baseT_Full);
                        phylink_set(pl->supported, 1000baseT_Half);
                        phylink_set(pl->supported, 1000baseT_Full);
-                       pl->link_an_mode = MLO_AN_SGMII;
                        break;
 
                case PHY_INTERFACE_MODE_1000BASEX:
                        phylink_set(pl->supported, 1000baseX_Full);
-                       pl->link_an_mode = MLO_AN_8023Z;
                        break;
 
                case PHY_INTERFACE_MODE_2500BASEX:
                        phylink_set(pl->supported, 2500baseX_Full);
-                       pl->link_an_mode = MLO_AN_8023Z;
                        break;
 
                case PHY_INTERFACE_MODE_10GKR:
@@ -280,7 +277,6 @@ static int phylink_parse_mode(struct phylink *pl, struct device_node *np)
                        phylink_set(pl->supported, 10000baseLR_Full);
                        phylink_set(pl->supported, 10000baseLRM_Full);
                        phylink_set(pl->supported, 10000baseER_Full);
-                       pl->link_an_mode = MLO_AN_SGMII;
                        break;
 
                default:
@@ -422,8 +418,7 @@ static void phylink_resolve(struct work_struct *w)
                        phylink_mac_config(pl, &link_state);
                        break;
 
-               case MLO_AN_SGMII:
-               case MLO_AN_8023Z:
+               case MLO_AN_INBAND:
                        phylink_get_mac_state(pl, &link_state);
                        if (pl->phydev) {
                                bool changed = false;
@@ -654,7 +649,8 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
        int ret;
 
        if (WARN_ON(pl->link_an_mode == MLO_AN_FIXED ||
-                   pl->link_an_mode == MLO_AN_8023Z))
+                   (pl->link_an_mode == MLO_AN_INBAND &&
+                    phy_interface_mode_is_8023z(pl->link_interface))))
                return -EINVAL;
 
        ret = phy_attach_direct(pl->netdev, phy, 0, pl->link_interface);
@@ -677,7 +673,8 @@ int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn)
 
        /* Fixed links and 802.3z are handled without needing a PHY */
        if (pl->link_an_mode == MLO_AN_FIXED ||
-           pl->link_an_mode == MLO_AN_8023Z)
+           (pl->link_an_mode == MLO_AN_INBAND &&
+            phy_interface_mode_is_8023z(pl->link_interface)))
                return 0;
 
        phy_node = of_parse_phandle(dn, "phy-handle", 0);
@@ -851,8 +848,7 @@ int phylink_ethtool_ksettings_get(struct phylink *pl,
                phylink_get_ksettings(&link_state, kset);
                break;
 
-       case MLO_AN_SGMII:
-       case MLO_AN_8023Z:
+       case MLO_AN_INBAND:
                /* If there is a phy attached, then use the reported
                 * settings from the phy with no modification.
                 */
@@ -1029,8 +1025,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl,
                        phylink_mac_config(pl, config);
                        break;
 
-               case MLO_AN_SGMII:
-               case MLO_AN_8023Z:
+               case MLO_AN_INBAND:
                        phylink_mac_config(pl, config);
                        phylink_mac_an_restart(pl);
                        break;
@@ -1247,9 +1242,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned int phy_id,
        case MLO_AN_PHY:
                return -EOPNOTSUPP;
 
-       case MLO_AN_SGMII:
-               /* No phy, fall through to 8023z method */
-       case MLO_AN_8023Z:
+       case MLO_AN_INBAND:
                if (phy_id == 0) {
                        val = phylink_get_mac_state(pl, &state);
                        if (val < 0)
@@ -1274,9 +1267,7 @@ static int phylink_mii_write(struct phylink *pl, unsigned int phy_id,
        case MLO_AN_PHY:
                return -EOPNOTSUPP;
 
-       case MLO_AN_SGMII:
-               /* No phy, fall through to 8023z method */
-       case MLO_AN_8023Z:
+       case MLO_AN_INBAND:
                break;
        }
 
@@ -1291,7 +1282,7 @@ int phylink_mii_ioctl(struct phylink *pl, struct ifreq *ifr, int cmd)
        WARN_ON(!lockdep_rtnl_is_held());
 
        if (pl->phydev) {
-               /* PHYs only exist for MLO_AN_PHY and MLO_AN_SGMII */
+               /* PHYs only exist for MLO_AN_PHY and SGMII */
                switch (cmd) {
                case SIOCGMIIPHY:
                        mii->phy_id = pl->phydev->mdio.addr;
@@ -1360,10 +1351,8 @@ static int phylink_sfp_module_insert(void *upstream,
 
        switch (iface) {
        case PHY_INTERFACE_MODE_SGMII:
-               mode = MLO_AN_SGMII;
-               break;
        case PHY_INTERFACE_MODE_1000BASEX:
-               mode = MLO_AN_8023Z;
+               mode = MLO_AN_INBAND;
                break;
        default:
                return -EINVAL;
@@ -1390,7 +1379,7 @@ static int phylink_sfp_module_insert(void *upstream,
                   phylink_an_mode_str(mode), phy_modes(config.interface),
                   __ETHTOOL_LINK_MODE_MASK_NBITS, support);
 
-       if (mode == MLO_AN_8023Z && pl->phydev)
+       if (phy_interface_mode_is_8023z(iface) && pl->phydev)
                return -EINVAL;
 
        changed = !bitmap_equal(pl->supported, support,

diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index af67edd4ae38067055443d105222249ed2dce709..cab22ad3bd6fe3fce6bf6b72c44251cbaf1503e0 100644 (file)
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -20,13 +20,12 @@ enum {
 
        MLO_AN_PHY = 0, /* Conventional PHY */
        MLO_AN_FIXED,   /* Fixed-link mode */
-       MLO_AN_SGMII,   /* Cisco SGMII protocol */
-       MLO_AN_8023Z,   /* 1000base-X protocol */
+       MLO_AN_INBAND,  /* In-band protocol */
 };
 
 static inline bool phylink_autoneg_inband(unsigned int mode)
 {
-       return mode == MLO_AN_SGMII || mode == MLO_AN_8023Z;
+       return mode == MLO_AN_INBAND;
 }
 
 struct phylink_link_state {
@@ -69,7 +68,7 @@ struct phylink_mac_ops {
        /**
         * mac_config: configure the MAC for the selected mode and state
         * @ndev: net_device structure for the MAC
-        * @mode: one of MLO_AN_FIXED, MLO_AN_PHY, MLO_AN_8023Z, MLO_AN_SGMII
+        * @mode: one of MLO_AN_FIXED, MLO_AN_PHY, MLO_AN_INBAND
         * @state: state structure
         *
         * The action performed depends on the currently selected mode:
@@ -77,14 +76,10 @@ struct phylink_mac_ops {
         * %MLO_AN_FIXED, %MLO_AN_PHY:
         *   set the specified speed, duplex, pause mode, and phy interface
         *   mode in the provided @state.
-        * %MLO_AN_8023Z:
-        *   place the link in 1000base-X mode, advertising the parameters
-        *   given in advertising in @state.
-        * %MLO_AN_SGMII:
-        *   place the link in Cisco SGMII mode - there is no advertisment
-        *   to make as the PHY communicates the speed and duplex to the
-        *   MAC over the in-band control word.  Configuration of the pause
-        *   mode is as per MLO_AN_PHY since this is not included.
+        * %MLO_AN_INBAND:
+        *   place the link in an inband negotiation mode (such as
+        *   1000base-X or Cisco SGMII mode depending on the phy interface
+        *   mode), advertising the parameters given in advertising in @state.
         */
        void (*mac_config)(struct net_device *ndev, unsigned int mode,
                           const struct phylink_link_state *state);