D18223.id50822.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18223.id50822.diff
View Options

	Index: sys/dev/sfxge/common/efx.h
	===================================================================
	--- sys/dev/sfxge/common/efx.h
	+++ sys/dev/sfxge/common/efx.h
	@@ -1322,6 +1322,13 @@
	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];
	Index: sys/dev/sfxge/common/efx_nic.c
	===================================================================
	--- sys/dev/sfxge/common/efx_nic.c
	+++ sys/dev/sfxge/common/efx_nic.c
	@@ -636,6 +636,18 @@
	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;