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

Commit eedcfef8 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

virtchnl: convert to new macros 



As part of the conversion, change the arguments
to VF_IS_V1[01] macros and move them to virtchnl.h

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 260e9382

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

+3 −3
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ static int i40e_vc_get_version_msg(struct i40e_vf *vf, u8 *msg) 


	vf->vf_ver = *(struct virtchnl_version_info *)msg;

	/* VFs running the 1.0 API expect to get 1.0 back or they will cry. */

	if (VF_IS_V10(vf))

	if (VF_IS_V10(&vf->vf_ver))

		info.minor = VIRTCHNL_VERSION_MINOR_NO_VF_CAPS;

	return i40e_vc_send_msg_to_vf(vf, VIRTCHNL_OP_VERSION,

				      I40E_SUCCESS, (u8 *)&info,
@@ -1521,7 +1521,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) 
		len = 0;

		goto err;

	}

	if (VF_IS_V11(vf))

	if (VF_IS_V11(&vf->vf_ver))

		vf->driver_caps = *(u32 *)msg;

	else

		vf->driver_caps = VIRTCHNL_VF_OFFLOAD_L2 |
@@ -2557,7 +2557,7 @@ static int i40e_vc_validate_vf_msg(struct i40e_vf *vf, u32 v_opcode, 
	case VIRTCHNL_OP_RESET_VF:

		break;

	case VIRTCHNL_OP_GET_VF_RESOURCES:

		if (VF_IS_V11(vf))

		if (VF_IS_V11(&vf->vf_ver))

			valid_len = sizeof(u32);

		break;

	case VIRTCHNL_OP_CONFIG_TX_QUEUE:

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

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ 
#define I40E_VLAN_MASK			0xFFF

#define I40E_PRIORITY_MASK		0x7000



#define VF_IS_V10(_v) (((_v)->vf_ver.major == 1) && ((_v)->vf_ver.minor == 0))

#define VF_IS_V11(_v) (((_v)->vf_ver.major == 1) && ((_v)->vf_ver.minor == 1))



/* Various queue ctrls */

enum i40e_queue_ctrl {

	I40E_QUEUE_CTRL_UNKNOWN = 0,

include/linux/avf/virtchnl.h

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ struct virtchnl_version_info { 
	u32 minor;

};



#define VF_IS_V10(_v) (((_v)->major == 1) && ((_v)->minor == 0))

#define VF_IS_V11(_ver) (((_ver)->major == 1) && ((_ver)->minor == 1))



/* VIRTCHNL_OP_RESET_VF

 * VF sends this request to PF with no parameters

 * PF does NOT respond! VF driver must delay then poll VFGEN_RSTAT register