Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca889a05 authored by Bert Kenward's avatar Bert Kenward Committed by David S. Miller
Browse files

sfc: retrieve second word of datapath capabilities 



Signed-off-by: default avatarBert Kenward <bkenward@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7014d7f6

drivers/net/ethernet/sfc/ef10.c

+8 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int efx_ef10_get_vf_index(struct efx_nic *efx) 


static int efx_ef10_init_datapath_caps(struct efx_nic *efx)

{

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_CAPABILITIES_OUT_LEN);

	MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_CAPABILITIES_V2_OUT_LEN);

	struct efx_ef10_nic_data *nic_data = efx->nic_data;

	size_t outlen;

	int rc;
@@ -188,7 +188,7 @@ static int efx_ef10_init_datapath_caps(struct efx_nic *efx) 
			  outbuf, sizeof(outbuf), &outlen);

	if (rc)

		return rc;

	if (outlen < sizeof(outbuf)) {

	if (outlen < MC_CMD_GET_CAPABILITIES_OUT_LEN) {

		netif_err(efx, drv, efx->net_dev,

			  "unable to read datapath firmware capabilities\n");

		return -EIO;
@@ -197,6 +197,12 @@ static int efx_ef10_init_datapath_caps(struct efx_nic *efx) 
	nic_data->datapath_caps =

		MCDI_DWORD(outbuf, GET_CAPABILITIES_OUT_FLAGS1);



	if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN)

		nic_data->datapath_caps2 = MCDI_DWORD(outbuf,

				GET_CAPABILITIES_V2_OUT_FLAGS2);

	else

		nic_data->datapath_caps2 = 0;



	/* record the DPCPU firmware IDs to determine VEB vswitching support.

	 */

	nic_data->rx_dpcpu_fw_id =

drivers/net/ethernet/sfc/nic.h

+3 −0
Original line number Diff line number Diff line
@@ -511,6 +511,8 @@ enum { 
 *	after MC reboot

 * @datapath_caps: Capabilities of datapath firmware (FLAGS1 field of

 *	%MC_CMD_GET_CAPABILITIES response)

 * @datapath_caps2: Further Capabilities of datapath firmware (FLAGS2 field of

 * %MC_CMD_GET_CAPABILITIES response)

 * @rx_dpcpu_fw_id: Firmware ID of the RxDPCPU

 * @tx_dpcpu_fw_id: Firmware ID of the TxDPCPU

 * @vport_id: The function's vport ID, only relevant for PFs
@@ -542,6 +544,7 @@ struct efx_ef10_nic_data { 
	bool workaround_26807;

	bool must_check_datapath_caps;

	u32 datapath_caps;

	u32 datapath_caps2;

	unsigned int rx_dpcpu_fw_id;

	unsigned int tx_dpcpu_fw_id;

	unsigned int vport_id;