sfxge(4): support choosing firmware variant
Submitted by: Gautam Dawar <gdawar at solarflare.com> Sponsored by: Solarflare Communications, Inc. Differential Revision: https://reviews.freebsd.org/D18222
This commit is contained in:
parent
2d2d812352
commit
87a67e180f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=341191
@ -157,9 +157,22 @@ efx_nic_create(
|
||||
__in efsys_lock_t *eslp,
|
||||
__deref_out efx_nic_t **enpp);
|
||||
|
||||
/* EFX_FW_VARIANT codes map one to one on MC_CMD_FW codes */
|
||||
typedef enum efx_fw_variant_e {
|
||||
EFX_FW_VARIANT_FULL_FEATURED,
|
||||
EFX_FW_VARIANT_LOW_LATENCY,
|
||||
EFX_FW_VARIANT_PACKED_STREAM,
|
||||
EFX_FW_VARIANT_HIGH_TX_RATE,
|
||||
EFX_FW_VARIANT_PACKED_STREAM_HASH_MODE_1,
|
||||
EFX_FW_VARIANT_RULES_ENGINE,
|
||||
EFX_FW_VARIANT_DPDK,
|
||||
EFX_FW_VARIANT_DONT_CARE = 0xffffffff
|
||||
} efx_fw_variant_t;
|
||||
|
||||
extern __checkReturn efx_rc_t
|
||||
efx_nic_probe(
|
||||
__in efx_nic_t *enp);
|
||||
__in efx_nic_t *enp,
|
||||
__in efx_fw_variant_t efv);
|
||||
|
||||
extern __checkReturn efx_rc_t
|
||||
efx_nic_init(
|
||||
|
@ -675,6 +675,7 @@ struct efx_nic_s {
|
||||
const efx_ev_ops_t *en_eevop;
|
||||
const efx_tx_ops_t *en_etxop;
|
||||
const efx_rx_ops_t *en_erxop;
|
||||
efx_fw_variant_t efv;
|
||||
#if EFSYS_OPT_FILTER
|
||||
efx_filter_t en_filter;
|
||||
const efx_filter_ops_t *en_efop;
|
||||
|
@ -1293,13 +1293,19 @@ efx_mcdi_drv_attach(
|
||||
req.emr_out_length = MC_CMD_DRV_ATTACH_EXT_OUT_LEN;
|
||||
|
||||
/*
|
||||
* Use DONT_CARE for the datapath firmware type to ensure that the
|
||||
* driver can attach to an unprivileged function. The datapath firmware
|
||||
* type to use is controlled by the 'sfboot' utility.
|
||||
* Typically, client drivers use DONT_CARE for the datapath firmware
|
||||
* type to ensure that the driver can attach to an unprivileged
|
||||
* function. The datapath firmware type to use is controlled by the
|
||||
* 'sfboot' utility.
|
||||
* If a client driver wishes to attach with a specific datapath firmware
|
||||
* type, that can be passed in second argument of efx_nic_probe API. One
|
||||
* such example is the ESXi native driver that attempts attaching with
|
||||
* FULL_FEATURED datapath firmware type first and fall backs to
|
||||
* DONT_CARE datapath firmware type if MC_CMD_DRV_ATTACH fails.
|
||||
*/
|
||||
MCDI_IN_SET_DWORD(req, DRV_ATTACH_IN_NEW_STATE, attach ? 1 : 0);
|
||||
MCDI_IN_SET_DWORD(req, DRV_ATTACH_IN_UPDATE, 1);
|
||||
MCDI_IN_SET_DWORD(req, DRV_ATTACH_IN_FIRMWARE_ID, MC_CMD_FW_DONT_CARE);
|
||||
MCDI_IN_SET_DWORD(req, DRV_ATTACH_IN_FIRMWARE_ID, enp->efv);
|
||||
|
||||
efx_mcdi_execute(enp, &req);
|
||||
|
||||
|
@ -319,7 +319,8 @@ efx_nic_create(
|
||||
|
||||
__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;
|
||||
@ -330,7 +331,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;
|
||||
|
||||
|
@ -748,7 +748,7 @@ sfxge_create(struct sfxge_softc *sc)
|
||||
|
||||
/* Probe the NIC and build the configuration data area. */
|
||||
DBGPRINT(sc->dev, "nic_probe...");
|
||||
if ((error = efx_nic_probe(enp)) != 0)
|
||||
if ((error = efx_nic_probe(enp, EFX_FW_VARIANT_DONT_CARE)) != 0)
|
||||
goto fail5;
|
||||
|
||||
if (!ISP2(sfxge_rx_ring_entries) ||
|
||||
|
Loading…
Reference in New Issue
Block a user