net/sfc/base: use transceiver ID when reading info
authorRichard Houldsworth <rhouldsworth@solarflare.com>
Mon, 24 Sep 2018 13:50:29 +0000 (14:50 +0100)
committerFerruh Yigit <ferruh.yigit@intel.com>
Thu, 27 Sep 2018 23:41:03 +0000 (01:41 +0200)
In efx_mcdi_phy_module_get_info() probe the
transceiver identification byte rather than assume
the module matches the fixed port type.  This
supports scenarios such as a SFP mounted in a QSFP
port via a QSA module.

Signed-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
drivers/net/sfc/base/efx_mcdi.c

index f53be01..c896aa0 100644 (file)
@@ -2150,6 +2150,14 @@ fail1:
  */
 #define        EFX_PHY_MEDIA_INFO_PAGE_SIZE            0x80
 
  */
 #define        EFX_PHY_MEDIA_INFO_PAGE_SIZE            0x80
 
+/*
+ * Transceiver identifiers from SFF-8024 Table 4-1.
+ */
+#define        EFX_SFF_TRANSCEIVER_ID_SFP              0x03 /* SFP/SFP+/SFP28 */
+#define        EFX_SFF_TRANSCEIVER_ID_QSFP             0x0c /* QSFP */
+#define        EFX_SFF_TRANSCEIVER_ID_QSFP_PLUS        0x0d /* QSFP+ or later */
+#define        EFX_SFF_TRANSCEIVER_ID_QSFP28           0x11 /* QSFP28 or later */
+
 static __checkReturn           efx_rc_t
 efx_mcdi_get_phy_media_info(
        __in                    efx_nic_t *enp,
 static __checkReturn           efx_rc_t
 efx_mcdi_get_phy_media_info(
        __in                    efx_nic_t *enp,
@@ -2222,6 +2230,7 @@ efx_mcdi_phy_module_get_info(
        efx_rc_t rc;
        uint32_t mcdi_lower_page;
        uint32_t mcdi_upper_page;
        efx_rc_t rc;
        uint32_t mcdi_lower_page;
        uint32_t mcdi_upper_page;
+       uint8_t id;
 
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
 
 
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
 
@@ -2235,6 +2244,26 @@ efx_mcdi_phy_module_get_info(
         */
        switch (epp->ep_fixed_port_type) {
        case EFX_PHY_MEDIA_SFP_PLUS:
         */
        switch (epp->ep_fixed_port_type) {
        case EFX_PHY_MEDIA_SFP_PLUS:
+       case EFX_PHY_MEDIA_QSFP_PLUS:
+               /* Port type supports modules */
+               break;
+       default:
+               rc = ENOTSUP;
+               goto fail1;
+       }
+
+       /*
+        * For all supported port types, MCDI page 0 offset 0 holds the
+        * transceiver identifier. Probe to determine the data layout.
+        * Definitions from SFF-8024 Table 4-1.
+        */
+       rc = efx_mcdi_get_phy_media_info(enp,
+                   0, 0, sizeof(id), &id);
+       if (rc != 0)
+               goto fail2;
+
+       switch (id) {
+       case EFX_SFF_TRANSCEIVER_ID_SFP:
                /*
                 * In accordance with SFF-8472 Diagnostic Monitoring
                 * Interface for Optical Transceivers section 4 Memory
                /*
                 * In accordance with SFF-8472 Diagnostic Monitoring
                 * Interface for Optical Transceivers section 4 Memory
@@ -2269,10 +2298,12 @@ efx_mcdi_phy_module_get_info(
                        break;
                default:
                        rc = ENOTSUP;
                        break;
                default:
                        rc = ENOTSUP;
-                       goto fail1;
+                       goto fail3;
                }
                break;
                }
                break;
-       case EFX_PHY_MEDIA_QSFP_PLUS:
+       case EFX_SFF_TRANSCEIVER_ID_QSFP:
+       case EFX_SFF_TRANSCEIVER_ID_QSFP_PLUS:
+       case EFX_SFF_TRANSCEIVER_ID_QSFP28:
                switch (dev_addr) {
                case EFX_PHY_MEDIA_INFO_DEV_ADDR_QSFP:
                        /*
                switch (dev_addr) {
                case EFX_PHY_MEDIA_INFO_DEV_ADDR_QSFP:
                        /*
@@ -2288,12 +2319,12 @@ efx_mcdi_phy_module_get_info(
                        break;
                default:
                        rc = ENOTSUP;
                        break;
                default:
                        rc = ENOTSUP;
-                       goto fail1;
+                       goto fail3;
                }
                break;
        default:
                rc = ENOTSUP;
                }
                break;
        default:
                rc = ENOTSUP;
-               goto fail1;
+               goto fail3;
        }
 
        EFX_STATIC_ASSERT(EFX_PHY_MEDIA_INFO_PAGE_SIZE <= 0xFF);
        }
 
        EFX_STATIC_ASSERT(EFX_PHY_MEDIA_INFO_PAGE_SIZE <= 0xFF);
@@ -2305,7 +2336,7 @@ efx_mcdi_phy_module_get_info(
                rc = efx_mcdi_get_phy_media_info(enp,
                    mcdi_lower_page, (uint8_t)offset, (uint8_t)read_len, data);
                if (rc != 0)
                rc = efx_mcdi_get_phy_media_info(enp,
                    mcdi_lower_page, (uint8_t)offset, (uint8_t)read_len, data);
                if (rc != 0)
-                       goto fail2;
+                       goto fail4;
 
                data += read_len;
                len -= read_len;
 
                data += read_len;
                len -= read_len;
@@ -2322,11 +2353,15 @@ efx_mcdi_phy_module_get_info(
                rc = efx_mcdi_get_phy_media_info(enp,
                    mcdi_upper_page, (uint8_t)offset, (uint8_t)len, data);
                if (rc != 0)
                rc = efx_mcdi_get_phy_media_info(enp,
                    mcdi_upper_page, (uint8_t)offset, (uint8_t)len, data);
                if (rc != 0)
-                       goto fail3;
+                       goto fail5;
        }
 
        return (0);
 
        }
 
        return (0);
 
+fail5:
+       EFSYS_PROBE(fail5);
+fail4:
+       EFSYS_PROBE(fail4);
 fail3:
        EFSYS_PROBE(fail3);
 fail2:
 fail3:
        EFSYS_PROBE(fail3);
 fail2: