net/sfc/base: add values for RxDPCPU firmware id recognition

Signed-off-by: Roman Zhukov <roman.zhukov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 4994745..fd9f059 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1294,6 +1294,13 @@ extern                   const efx_nic_cfg_t *
 efx_nic_cfg_get(
        __in            efx_nic_t *enp);
 
+/* RxDPCPU firmware id values by which FW variant can be identified */
+#define        EFX_RXDP_FULL_FEATURED_FW_ID    0x0
+#define        EFX_RXDP_LOW_LATENCY_FW_ID      0x1
+#define        EFX_RXDP_PACKED_STREAM_FW_ID    0x2
+#define        EFX_RXDP_RULES_ENGINE_FW_ID     0x5
+#define        EFX_RXDP_DPDK_FW_ID             0x6
+
 typedef struct efx_nic_fw_info_s {
        /* Basic FW version information */
        uint16_t        enfi_mc_fw_version[4];

diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c
index 3be32ad..8014dee 100644 (file)
--- a/drivers/net/sfc/base/efx_nic.c
+++ b/drivers/net/sfc/base/efx_nic.c
@@ -604,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;