Commit bb58fd7e authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: Update status codes 



Add a few new status code which will be used by the ice driver, and
rename a few to make them more consistent. Error code are mapped to
similar values as in i40e_status.h, so as to be compatible with older
VF drivers not using this status enum.

Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 48e01e00

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+1 −1
Original line number Diff line number Diff line
@@ -3674,7 +3674,7 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, 
		dev_err(&pf->pdev->dev, "Invalid message from VF %d, opcode %d, len %d\n",

			local_vf_id, v_opcode, msglen);

		switch (ret) {

		case VIRTCHNL_ERR_PARAM:

		case VIRTCHNL_STATUS_ERR_PARAM:

			return -EPERM;

		default:

			return -EINVAL;

include/linux/avf/virtchnl.h

+9 −3
Original line number Diff line number Diff line
@@ -62,13 +62,19 @@ 
/* Error Codes */

enum virtchnl_status_code {

	VIRTCHNL_STATUS_SUCCESS				= 0,

	VIRTCHNL_ERR_PARAM				= -5,

	VIRTCHNL_STATUS_ERR_PARAM			= -5,

	VIRTCHNL_STATUS_ERR_NO_MEMORY			= -18,

	VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH		= -38,

	VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR		= -39,

	VIRTCHNL_STATUS_ERR_INVALID_VF_ID		= -40,

	VIRTCHNL_STATUS_NOT_SUPPORTED			= -64,

	VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR		= -53,

	VIRTCHNL_STATUS_ERR_NOT_SUPPORTED		= -64,

};



/* Backward compatibility */

#define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM

#define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED



#define VIRTCHNL_LINK_SPEED_100MB_SHIFT		0x1

#define VIRTCHNL_LINK_SPEED_1000MB_SHIFT	0x2

#define VIRTCHNL_LINK_SPEED_10GB_SHIFT		0x3
@@ -831,7 +837,7 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode, 
	case VIRTCHNL_OP_EVENT:

	case VIRTCHNL_OP_UNKNOWN:

	default:

		return VIRTCHNL_ERR_PARAM;

		return VIRTCHNL_STATUS_ERR_PARAM;

	}

	/* few more checks */

	if (err_msg_format || valid_len != msglen)

CRA Git | Maintained and supported by SUSTech CRA and CCSE