net/qede: fix incorrect link status update
[dpdk.git] / drivers / net / sfc / base / efx_nic.c
index dc53071..6c162e0 100644 (file)
@@ -290,7 +290,8 @@ fail1:
 
        __checkReturn   efx_rc_t
 efx_nic_probe(
-       __in            efx_nic_t *enp)
+       __in            efx_nic_t *enp,
+       __in            efx_fw_variant_t efv)
 {
        const efx_nic_ops_t *enop;
        efx_rc_t rc;
@@ -301,7 +302,27 @@ efx_nic_probe(
 #endif /* EFSYS_OPT_MCDI */
        EFSYS_ASSERT(!(enp->en_mod_flags & EFX_MOD_PROBE));
 
+       /* Ensure FW variant codes match with MC_CMD_FW codes */
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_FULL_FEATURED ==
+           MC_CMD_FW_FULL_FEATURED);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_LOW_LATENCY ==
+           MC_CMD_FW_LOW_LATENCY);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_PACKED_STREAM ==
+           MC_CMD_FW_PACKED_STREAM);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_HIGH_TX_RATE ==
+           MC_CMD_FW_HIGH_TX_RATE);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_PACKED_STREAM_HASH_MODE_1 ==
+           MC_CMD_FW_PACKED_STREAM_HASH_MODE_1);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_RULES_ENGINE ==
+           MC_CMD_FW_RULES_ENGINE);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_DPDK ==
+           MC_CMD_FW_DPDK);
+       EFX_STATIC_ASSERT(EFX_FW_VARIANT_DONT_CARE ==
+           (int)MC_CMD_FW_DONT_CARE);
+
        enop = enp->en_enop;
+       enp->efv = efv;
+
        if ((rc = enop->eno_probe(enp)) != 0)
                goto fail1;
 
@@ -583,6 +604,18 @@ efx_nic_get_fw_version(
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_MCDI);
        EFSYS_ASSERT3U(enp->en_features, &, EFX_FEATURE_MCDI);
 
+       /* Ensure RXDP_FW_ID codes match with MC_CMD_GET_CAPABILITIES codes */
+       EFX_STATIC_ASSERT(EFX_RXDP_FULL_FEATURED_FW_ID ==
+           MC_CMD_GET_CAPABILITIES_OUT_RXDP);
+       EFX_STATIC_ASSERT(EFX_RXDP_LOW_LATENCY_FW_ID ==
+           MC_CMD_GET_CAPABILITIES_OUT_RXDP_LOW_LATENCY);
+       EFX_STATIC_ASSERT(EFX_RXDP_PACKED_STREAM_FW_ID ==
+           MC_CMD_GET_CAPABILITIES_OUT_RXDP_PACKED_STREAM);
+       EFX_STATIC_ASSERT(EFX_RXDP_RULES_ENGINE_FW_ID ==
+           MC_CMD_GET_CAPABILITIES_OUT_RXDP_RULES_ENGINE);
+       EFX_STATIC_ASSERT(EFX_RXDP_DPDK_FW_ID ==
+           MC_CMD_GET_CAPABILITIES_OUT_RXDP_DPDK);
+
        rc = efx_mcdi_version(enp, mc_fw_version, NULL, NULL);
        if (rc != 0)
                goto fail2;
@@ -693,6 +726,9 @@ efx_loopback_mask(
        LOOPBACK_CHECK(SD_FEP1_5_WS, SD_FEP1_5_WS);
        LOOPBACK_CHECK(SD_FEP_WS, SD_FEP_WS);
        LOOPBACK_CHECK(SD_FES_WS, SD_FES_WS);
+       LOOPBACK_CHECK(AOE_INT_NEAR, AOE_INT_NEAR);
+       LOOPBACK_CHECK(DATA_WS, DATA_WS);
+       LOOPBACK_CHECK(FORCE_EXT_LINK, FORCE_EXT_LINK);
 #undef LOOPBACK_CHECK
 
        /* Build bitmask of possible loopback types */
@@ -751,7 +787,7 @@ efx_mcdi_get_loopback_modes(
        efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
        efx_mcdi_req_t req;
        uint8_t payload[MAX(MC_CMD_GET_LOOPBACK_MODES_IN_LEN,
-                           MC_CMD_GET_LOOPBACK_MODES_OUT_LEN)];
+                           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_LEN)];
        efx_qword_t mask;
        efx_qword_t modes;
        efx_rc_t rc;
@@ -761,7 +797,7 @@ efx_mcdi_get_loopback_modes(
        req.emr_in_buf = payload;
        req.emr_in_length = MC_CMD_GET_LOOPBACK_MODES_IN_LEN;
        req.emr_out_buf = payload;
-       req.emr_out_length = MC_CMD_GET_LOOPBACK_MODES_OUT_LEN;
+       req.emr_out_length = MC_CMD_GET_LOOPBACK_MODES_OUT_V2_LEN;
 
        efx_mcdi_execute(enp, &req);
 
@@ -802,18 +838,51 @@ efx_mcdi_get_loopback_modes(
            MC_CMD_GET_LOOPBACK_MODES_OUT_40G_OFST +
            MC_CMD_GET_LOOPBACK_MODES_OUT_40G_LEN) {
                /* Response includes 40G loopback modes */
-               modes =
-                   *MCDI_OUT2(req, efx_qword_t, GET_LOOPBACK_MODES_OUT_40G);
+               modes = *MCDI_OUT2(req, efx_qword_t,
+                   GET_LOOPBACK_MODES_OUT_40G);
                EFX_AND_QWORD(modes, mask);
                encp->enc_loopback_types[EFX_LINK_40000FDX] = modes;
        }
 
+       if (req.emr_out_length_used >=
+           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_25G_OFST +
+           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_25G_LEN) {
+               /* Response includes 25G loopback modes */
+               modes = *MCDI_OUT2(req, efx_qword_t,
+                   GET_LOOPBACK_MODES_OUT_V2_25G);
+               EFX_AND_QWORD(modes, mask);
+               encp->enc_loopback_types[EFX_LINK_25000FDX] = modes;
+       }
+
+       if (req.emr_out_length_used >=
+           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_50G_OFST +
+           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_50G_LEN) {
+               /* Response includes 50G loopback modes */
+               modes = *MCDI_OUT2(req, efx_qword_t,
+                   GET_LOOPBACK_MODES_OUT_V2_50G);
+               EFX_AND_QWORD(modes, mask);
+               encp->enc_loopback_types[EFX_LINK_50000FDX] = modes;
+       }
+
+       if (req.emr_out_length_used >=
+           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_100G_OFST +
+           MC_CMD_GET_LOOPBACK_MODES_OUT_V2_100G_LEN) {
+               /* Response includes 100G loopback modes */
+               modes = *MCDI_OUT2(req, efx_qword_t,
+                   GET_LOOPBACK_MODES_OUT_V2_100G);
+               EFX_AND_QWORD(modes, mask);
+               encp->enc_loopback_types[EFX_LINK_100000FDX] = modes;
+       }
+
        EFX_ZERO_QWORD(modes);
        EFX_SET_QWORD_BIT(modes, EFX_LOOPBACK_OFF);
        EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_100FDX]);
        EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_1000FDX]);
        EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_10000FDX]);
        EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_40000FDX]);
+       EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_25000FDX]);
+       EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_50000FDX]);
+       EFX_OR_QWORD(modes, encp->enc_loopback_types[EFX_LINK_100000FDX]);
        encp->enc_loopback_types[EFX_LINK_UNKNOWN] = modes;
 
        return (0);
@@ -875,6 +944,82 @@ fail1:
        return (rc);
 }
 
+#if EFSYS_OPT_FW_SUBVARIANT_AWARE
+
+       __checkReturn   efx_rc_t
+efx_nic_get_fw_subvariant(
+       __in            efx_nic_t *enp,
+       __out           efx_nic_fw_subvariant_t *subvariantp)
+{
+       efx_rc_t rc;
+       uint32_t value;
+
+       rc = efx_mcdi_get_nic_global(enp,
+           MC_CMD_SET_NIC_GLOBAL_IN_FIRMWARE_SUBVARIANT, &value);
+       if (rc != 0)
+               goto fail1;
+
+       /* Mapping is not required since values match MCDI */
+       EFX_STATIC_ASSERT(EFX_NIC_FW_SUBVARIANT_DEFAULT ==
+           MC_CMD_SET_NIC_GLOBAL_IN_FW_SUBVARIANT_DEFAULT);
+       EFX_STATIC_ASSERT(EFX_NIC_FW_SUBVARIANT_NO_TX_CSUM ==
+           MC_CMD_SET_NIC_GLOBAL_IN_FW_SUBVARIANT_NO_TX_CSUM);
+
+       switch (value) {
+       case MC_CMD_SET_NIC_GLOBAL_IN_FW_SUBVARIANT_DEFAULT:
+       case MC_CMD_SET_NIC_GLOBAL_IN_FW_SUBVARIANT_NO_TX_CSUM:
+               *subvariantp = value;
+               break;
+       default:
+               rc = EINVAL;
+               goto fail2;
+       }
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+       __checkReturn   efx_rc_t
+efx_nic_set_fw_subvariant(
+       __in            efx_nic_t *enp,
+       __in            efx_nic_fw_subvariant_t subvariant)
+{
+       efx_rc_t rc;
+
+       switch (subvariant) {
+       case EFX_NIC_FW_SUBVARIANT_DEFAULT:
+       case EFX_NIC_FW_SUBVARIANT_NO_TX_CSUM:
+               /* Mapping is not required since values match MCDI */
+               break;
+       default:
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       rc = efx_mcdi_set_nic_global(enp,
+           MC_CMD_SET_NIC_GLOBAL_IN_FIRMWARE_SUBVARIANT, subvariant);
+       if (rc != 0)
+               goto fail2;
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+#endif /* EFSYS_OPT_FW_SUBVARIANT_AWARE */
 
        __checkReturn   efx_rc_t
 efx_nic_check_pcie_link_speed(