net: sfp: add more extended compliance codes

SFF-8024 is used to define various constants re-used in several SFF
SFP-related specifications.  Split these constants from the enum, and
rename them to indicate that they're defined by SFF-8024.

Add and use updated SFF-8024 extended compliance code definitions for
10GBASE-T, 5GBASE-T and 2.5GBASE-T modules.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 1561962fda30dbaf5fc5ef6f5a452ece453b5f0d..c6627f1e5d68f93ee2b94755d8d3730fb96bad3f 100644 (file)
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -124,35 +124,35 @@ int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
 
        /* port is the physical connector, set this from the connector field. */
        switch (id->base.connector) {
-       case SFP_CONNECTOR_SC:
-       case SFP_CONNECTOR_FIBERJACK:
-       case SFP_CONNECTOR_LC:
-       case SFP_CONNECTOR_MT_RJ:
-       case SFP_CONNECTOR_MU:
-       case SFP_CONNECTOR_OPTICAL_PIGTAIL:
+       case SFF8024_CONNECTOR_SC:
+       case SFF8024_CONNECTOR_FIBERJACK:
+       case SFF8024_CONNECTOR_LC:
+       case SFF8024_CONNECTOR_MT_RJ:
+       case SFF8024_CONNECTOR_MU:
+       case SFF8024_CONNECTOR_OPTICAL_PIGTAIL:
+       case SFF8024_CONNECTOR_MPO_1X12:
+       case SFF8024_CONNECTOR_MPO_2X16:
                port = PORT_FIBRE;
                break;
 
-       case SFP_CONNECTOR_RJ45:
+       case SFF8024_CONNECTOR_RJ45:
                port = PORT_TP;
                break;
 
-       case SFP_CONNECTOR_COPPER_PIGTAIL:
+       case SFF8024_CONNECTOR_COPPER_PIGTAIL:
                port = PORT_DA;
                break;
 
-       case SFP_CONNECTOR_UNSPEC:
+       case SFF8024_CONNECTOR_UNSPEC:
                if (id->base.e1000_base_t) {
                        port = PORT_TP;
                        break;
                }
                /* fallthrough */
-       case SFP_CONNECTOR_SG: /* guess */
-       case SFP_CONNECTOR_MPO_1X12:
-       case SFP_CONNECTOR_MPO_2X16:
-       case SFP_CONNECTOR_HSSDC_II:
-       case SFP_CONNECTOR_NOSEPARATE:
-       case SFP_CONNECTOR_MXC_2X16:
+       case SFF8024_CONNECTOR_SG: /* guess */
+       case SFF8024_CONNECTOR_HSSDC_II:
+       case SFF8024_CONNECTOR_NOSEPARATE:
+       case SFF8024_CONNECTOR_MXC_2X16:
                port = PORT_OTHER;
                break;
        default:
@@ -261,22 +261,33 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
        }
 
        switch (id->base.extended_cc) {
-       case 0x00: /* Unspecified */
+       case SFF8024_ECC_UNSPEC:
                break;
-       case 0x02: /* 100Gbase-SR4 or 25Gbase-SR */
+       case SFF8024_ECC_100GBASE_SR4_25GBASE_SR:
                phylink_set(modes, 100000baseSR4_Full);
                phylink_set(modes, 25000baseSR_Full);
                break;
-       case 0x03: /* 100Gbase-LR4 or 25Gbase-LR */
-       case 0x04: /* 100Gbase-ER4 or 25Gbase-ER */
+       case SFF8024_ECC_100GBASE_LR4_25GBASE_LR:
+       case SFF8024_ECC_100GBASE_ER4_25GBASE_ER:
                phylink_set(modes, 100000baseLR4_ER4_Full);
                break;
-       case 0x0b: /* 100Gbase-CR4 or 25Gbase-CR CA-L */
-       case 0x0c: /* 25Gbase-CR CA-S */
-       case 0x0d: /* 25Gbase-CR CA-N */
+       case SFF8024_ECC_100GBASE_CR4:
                phylink_set(modes, 100000baseCR4_Full);
+               /* fallthrough */
+       case SFF8024_ECC_25GBASE_CR_S:
+       case SFF8024_ECC_25GBASE_CR_N:
                phylink_set(modes, 25000baseCR_Full);
                break;
+       case SFF8024_ECC_10GBASE_T_SFI:
+       case SFF8024_ECC_10GBASE_T_SR:
+               phylink_set(modes, 10000baseT_Full);
+               break;
+       case SFF8024_ECC_5GBASE_T:
+               phylink_set(modes, 5000baseT_Full);
+               break;
+       case SFF8024_ECC_2_5GBASE_T:
+               phylink_set(modes, 2500baseT_Full);
+               break;
        default:
                dev_warn(bus->sfp_dev,
                         "Unknown/unsupported extended compliance code: 0x%02x\n",
@@ -301,7 +312,7 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
         */
        if (bitmap_empty(modes, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
                /* If the encoding and bit rate allows 1000baseX */
-               if (id->base.encoding == SFP_ENCODING_8B10B && br_nom &&
+               if (id->base.encoding == SFF8024_ENCODING_8B10B && br_nom &&
                    br_min <= 1300 && br_max >= 1200)
                        phylink_set(modes, 1000baseX_Full);
        }
@@ -332,7 +343,8 @@ phy_interface_t sfp_select_interface(struct sfp_bus *bus,
            phylink_test(link_modes, 10000baseSR_Full) ||
            phylink_test(link_modes, 10000baseLR_Full) ||
            phylink_test(link_modes, 10000baseLRM_Full) ||
-           phylink_test(link_modes, 10000baseER_Full))
+           phylink_test(link_modes, 10000baseER_Full) ||
+           phylink_test(link_modes, 10000baseT_Full))
                return PHY_INTERFACE_MODE_10GKR;
 
        if (phylink_test(link_modes, 2500baseX_Full))

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index ae6a52a19458665c1a9b6414450ff43b6b03c97d..ad3808307dba32c88a9be2b7d60453cca4f0a187 100644 (file)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -242,7 +242,7 @@ struct sfp {
 
 static bool sff_module_supported(const struct sfp_eeprom_id *id)
 {
-       return id->base.phys_id == SFP_PHYS_ID_SFF &&
+       return id->base.phys_id == SFF8024_ID_SFF_8472 &&
               id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP;
 }
 
@@ -253,7 +253,7 @@ static const struct sff_data sff_data = {
 
 static bool sfp_module_supported(const struct sfp_eeprom_id *id)
 {
-       return id->base.phys_id == SFP_PHYS_ID_SFP &&
+       return id->base.phys_id == SFF8024_ID_SFP &&
               id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP;
 }
 

diff --git a/include/linux/sfp.h b/include/linux/sfp.h
index 8d7b98c214d78005467a0b080cd70658078dbfbf..373d8b67ea86a8a9719841affab8e8d564cea134 100644 (file)
--- a/include/linux/sfp.h
+++ b/include/linux/sfp.h
@@ -275,6 +275,61 @@ struct sfp_diag {
        __be16 cal_v_offset;
 } __packed;
 
+/* SFF8024 defined constants */
+enum {
+       SFF8024_ID_UNK                  = 0x00,
+       SFF8024_ID_SFF_8472             = 0x02,
+       SFF8024_ID_SFP                  = 0x03,
+       SFF8024_ID_DWDM_SFP             = 0x0b,
+       SFF8024_ID_QSFP_8438            = 0x0c,
+       SFF8024_ID_QSFP_8436_8636       = 0x0d,
+       SFF8024_ID_QSFP28_8636          = 0x11,
+
+       SFF8024_ENCODING_UNSPEC         = 0x00,
+       SFF8024_ENCODING_8B10B          = 0x01,
+       SFF8024_ENCODING_4B5B           = 0x02,
+       SFF8024_ENCODING_NRZ            = 0x03,
+       SFF8024_ENCODING_8472_MANCHESTER= 0x04,
+       SFF8024_ENCODING_8472_SONET     = 0x05,
+       SFF8024_ENCODING_8472_64B66B    = 0x06,
+       SFF8024_ENCODING_8436_MANCHESTER= 0x06,
+       SFF8024_ENCODING_8436_SONET     = 0x04,
+       SFF8024_ENCODING_8436_64B66B    = 0x05,
+       SFF8024_ENCODING_256B257B       = 0x07,
+       SFF8024_ENCODING_PAM4           = 0x08,
+
+       SFF8024_CONNECTOR_UNSPEC        = 0x00,
+       /* codes 01-05 not supportable on SFP, but some modules have single SC */
+       SFF8024_CONNECTOR_SC            = 0x01,
+       SFF8024_CONNECTOR_FIBERJACK     = 0x06,
+       SFF8024_CONNECTOR_LC            = 0x07,
+       SFF8024_CONNECTOR_MT_RJ         = 0x08,
+       SFF8024_CONNECTOR_MU            = 0x09,
+       SFF8024_CONNECTOR_SG            = 0x0a,
+       SFF8024_CONNECTOR_OPTICAL_PIGTAIL= 0x0b,
+       SFF8024_CONNECTOR_MPO_1X12      = 0x0c,
+       SFF8024_CONNECTOR_MPO_2X16      = 0x0d,
+       SFF8024_CONNECTOR_HSSDC_II      = 0x20,
+       SFF8024_CONNECTOR_COPPER_PIGTAIL= 0x21,
+       SFF8024_CONNECTOR_RJ45          = 0x22,
+       SFF8024_CONNECTOR_NOSEPARATE    = 0x23,
+       SFF8024_CONNECTOR_MXC_2X16      = 0x24,
+
+       SFF8024_ECC_UNSPEC              = 0x00,
+       SFF8024_ECC_100G_25GAUI_C2M_AOC = 0x01,
+       SFF8024_ECC_100GBASE_SR4_25GBASE_SR = 0x02,
+       SFF8024_ECC_100GBASE_LR4_25GBASE_LR = 0x03,
+       SFF8024_ECC_100GBASE_ER4_25GBASE_ER = 0x04,
+       SFF8024_ECC_100GBASE_SR10       = 0x05,
+       SFF8024_ECC_100GBASE_CR4        = 0x0b,
+       SFF8024_ECC_25GBASE_CR_S        = 0x0c,
+       SFF8024_ECC_25GBASE_CR_N        = 0x0d,
+       SFF8024_ECC_10GBASE_T_SFI       = 0x16,
+       SFF8024_ECC_10GBASE_T_SR        = 0x1c,
+       SFF8024_ECC_5GBASE_T            = 0x1d,
+       SFF8024_ECC_2_5GBASE_T          = 0x1e,
+};
+
 /* SFP EEPROM registers */
 enum {
        SFP_PHYS_ID                     = 0x00,
@@ -309,34 +364,7 @@ enum {
        SFP_SFF8472_COMPLIANCE          = 0x5e,
        SFP_CC_EXT                      = 0x5f,
 
-       SFP_PHYS_ID_SFF                 = 0x02,
-       SFP_PHYS_ID_SFP                 = 0x03,
        SFP_PHYS_EXT_ID_SFP             = 0x04,
-       SFP_CONNECTOR_UNSPEC            = 0x00,
-       /* codes 01-05 not supportable on SFP, but some modules have single SC */
-       SFP_CONNECTOR_SC                = 0x01,
-       SFP_CONNECTOR_FIBERJACK         = 0x06,
-       SFP_CONNECTOR_LC                = 0x07,
-       SFP_CONNECTOR_MT_RJ             = 0x08,
-       SFP_CONNECTOR_MU                = 0x09,
-       SFP_CONNECTOR_SG                = 0x0a,
-       SFP_CONNECTOR_OPTICAL_PIGTAIL   = 0x0b,
-       SFP_CONNECTOR_MPO_1X12          = 0x0c,
-       SFP_CONNECTOR_MPO_2X16          = 0x0d,
-       SFP_CONNECTOR_HSSDC_II          = 0x20,
-       SFP_CONNECTOR_COPPER_PIGTAIL    = 0x21,
-       SFP_CONNECTOR_RJ45              = 0x22,
-       SFP_CONNECTOR_NOSEPARATE        = 0x23,
-       SFP_CONNECTOR_MXC_2X16          = 0x24,
-       SFP_ENCODING_UNSPEC             = 0x00,
-       SFP_ENCODING_8B10B              = 0x01,
-       SFP_ENCODING_4B5B               = 0x02,
-       SFP_ENCODING_NRZ                = 0x03,
-       SFP_ENCODING_8472_MANCHESTER    = 0x04,
-       SFP_ENCODING_8472_SONET         = 0x05,
-       SFP_ENCODING_8472_64B66B        = 0x06,
-       SFP_ENCODING_256B257B           = 0x07,
-       SFP_ENCODING_PAM4               = 0x08,
        SFP_OPTIONS_HIGH_POWER_LEVEL    = BIT(13),
        SFP_OPTIONS_PAGING_A2           = BIT(12),
        SFP_OPTIONS_RETIMER             = BIT(11),