Commit 2723f3b5 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

virtchnl: i40e/iavf: rename iwarp to rdma 



Since the latest Intel hardware does both IWARP and ROCE, rename the
term IWARP in the virtchnl header to be RDMA. Do this for both upper and
lower case instances. Many of the non-virtchnl.h changes were done with
regular expression replacements using perl like:
perl -p -i -e 's/_IWARP/_RDMA/' <files>
perl -p -i -e 's/_iwarp/_rdma/' <files>
and I had to pick up a few instances manually.

The virtchnl.h header has some comments and clarity added around when to
use certain defines.

note: had to fix a checkpatch warning for a long line by wrapping one of
the lines I changed.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarJakub Andrysiak <jakub.andrysiak@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4e4df559

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

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static int i40e_client_virtchnl_send(struct i40e_info *ldev, 
	struct i40e_hw *hw = &pf->hw;

	i40e_status err;



	err = i40e_aq_send_msg_to_vf(hw, vf_id, VIRTCHNL_OP_IWARP,

	err = i40e_aq_send_msg_to_vf(hw, vf_id, VIRTCHNL_OP_RDMA,

				     0, msg, len, NULL);

	if (err)

		dev_err(&pf->pdev->dev, "Unable to send iWarp message to VF, error %d, aq status %d\n",

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

+32 −31
Original line number Diff line number Diff line
@@ -441,14 +441,14 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_id, 
}



/**

 * i40e_release_iwarp_qvlist

 * i40e_release_rdma_qvlist

 * @vf: pointer to the VF.

 *

 **/

static void i40e_release_iwarp_qvlist(struct i40e_vf *vf)

static void i40e_release_rdma_qvlist(struct i40e_vf *vf)

{

	struct i40e_pf *pf = vf->pf;

	struct virtchnl_iwarp_qvlist_info *qvlist_info = vf->qvlist_info;

	struct virtchnl_rdma_qvlist_info *qvlist_info = vf->qvlist_info;

	u32 msix_vf;

	u32 i;
@@ -457,7 +457,7 @@ static void i40e_release_iwarp_qvlist(struct i40e_vf *vf) 


	msix_vf = pf->hw.func_caps.num_msix_vectors_vf;

	for (i = 0; i < qvlist_info->num_vectors; i++) {

		struct virtchnl_iwarp_qv_info *qv_info;

		struct virtchnl_rdma_qv_info *qv_info;

		u32 next_q_index, next_q_type;

		struct i40e_hw *hw = &pf->hw;

		u32 v_idx, reg_idx, reg;
@@ -491,18 +491,19 @@ static void i40e_release_iwarp_qvlist(struct i40e_vf *vf) 
}



/**

 * i40e_config_iwarp_qvlist

 * i40e_config_rdma_qvlist

 * @vf: pointer to the VF info

 * @qvlist_info: queue and vector list

 *

 * Return 0 on success or < 0 on error

 **/

static int i40e_config_iwarp_qvlist(struct i40e_vf *vf,

				    struct virtchnl_iwarp_qvlist_info *qvlist_info)

static int

i40e_config_rdma_qvlist(struct i40e_vf *vf,

			struct virtchnl_rdma_qvlist_info *qvlist_info)

{

	struct i40e_pf *pf = vf->pf;

	struct i40e_hw *hw = &pf->hw;

	struct virtchnl_iwarp_qv_info *qv_info;

	struct virtchnl_rdma_qv_info *qv_info;

	u32 v_idx, i, reg_idx, reg;

	u32 next_q_idx, next_q_type;

	u32 msix_vf;
@@ -2123,11 +2124,11 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) 
		vfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_VLAN;



	if (i40e_vf_client_capable(pf, vf->vf_id) &&

	    (vf->driver_caps & VIRTCHNL_VF_OFFLOAD_IWARP)) {

		vfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_IWARP;

		set_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states);

	    (vf->driver_caps & VIRTCHNL_VF_OFFLOAD_RDMA)) {

		vfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_RDMA;

		set_bit(I40E_VF_STATE_RDMAENA, &vf->vf_states);

	} else {

		clear_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states);

		clear_bit(I40E_VF_STATE_RDMAENA, &vf->vf_states);

	}



	if (vf->driver_caps & VIRTCHNL_VF_OFFLOAD_RSS_PF) {
@@ -3187,21 +3188,21 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg) 
}



/**

 * i40e_vc_iwarp_msg

 * i40e_vc_rdma_msg

 * @vf: pointer to the VF info

 * @msg: pointer to the msg buffer

 * @msglen: msg length

 *

 * called from the VF for the iwarp msgs

 **/

static int i40e_vc_iwarp_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)

static int i40e_vc_rdma_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)

{

	struct i40e_pf *pf = vf->pf;

	int abs_vf_id = vf->vf_id + pf->hw.func_caps.vf_base_id;

	i40e_status aq_ret = 0;



	if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||

	    !test_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states)) {

	    !test_bit(I40E_VF_STATE_RDMAENA, &vf->vf_states)) {

		aq_ret = I40E_ERR_PARAM;

		goto error_param;

	}
@@ -3211,42 +3212,42 @@ static int i40e_vc_iwarp_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) 


error_param:

	/* send the response to the VF */

	return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_IWARP,

	return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_RDMA,

				       aq_ret);

}



/**

 * i40e_vc_iwarp_qvmap_msg

 * i40e_vc_rdma_qvmap_msg

 * @vf: pointer to the VF info

 * @msg: pointer to the msg buffer

 * @config: config qvmap or release it

 *

 * called from the VF for the iwarp msgs

 **/

static int i40e_vc_iwarp_qvmap_msg(struct i40e_vf *vf, u8 *msg, bool config)

static int i40e_vc_rdma_qvmap_msg(struct i40e_vf *vf, u8 *msg, bool config)

{

	struct virtchnl_iwarp_qvlist_info *qvlist_info =

				(struct virtchnl_iwarp_qvlist_info *)msg;

	struct virtchnl_rdma_qvlist_info *qvlist_info =

				(struct virtchnl_rdma_qvlist_info *)msg;

	i40e_status aq_ret = 0;



	if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||

	    !test_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states)) {

	    !test_bit(I40E_VF_STATE_RDMAENA, &vf->vf_states)) {

		aq_ret = I40E_ERR_PARAM;

		goto error_param;

	}



	if (config) {

		if (i40e_config_iwarp_qvlist(vf, qvlist_info))

		if (i40e_config_rdma_qvlist(vf, qvlist_info))

			aq_ret = I40E_ERR_PARAM;

	} else {

		i40e_release_iwarp_qvlist(vf);

		i40e_release_rdma_qvlist(vf);

	}



error_param:

	/* send the response to the VF */

	return i40e_vc_send_resp_to_vf(vf,

			       config ? VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP :

			       VIRTCHNL_OP_RELEASE_IWARP_IRQ_MAP,

			       config ? VIRTCHNL_OP_CONFIG_RDMA_IRQ_MAP :

			       VIRTCHNL_OP_RELEASE_RDMA_IRQ_MAP,

			       aq_ret);

}
@@ -4112,14 +4113,14 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, 
	case VIRTCHNL_OP_GET_STATS:

		ret = i40e_vc_get_stats_msg(vf, msg);

		break;

	case VIRTCHNL_OP_IWARP:

		ret = i40e_vc_iwarp_msg(vf, msg, msglen);

	case VIRTCHNL_OP_RDMA:

		ret = i40e_vc_rdma_msg(vf, msg, msglen);

		break;

	case VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP:

		ret = i40e_vc_iwarp_qvmap_msg(vf, msg, true);

	case VIRTCHNL_OP_CONFIG_RDMA_IRQ_MAP:

		ret = i40e_vc_rdma_qvmap_msg(vf, msg, true);

		break;

	case VIRTCHNL_OP_RELEASE_IWARP_IRQ_MAP:

		ret = i40e_vc_iwarp_qvmap_msg(vf, msg, false);

	case VIRTCHNL_OP_RELEASE_RDMA_IRQ_MAP:

		ret = i40e_vc_rdma_qvmap_msg(vf, msg, false);

		break;

	case VIRTCHNL_OP_CONFIG_RSS_KEY:

		ret = i40e_vc_config_rss_key(vf, msg);

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

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ enum i40e_queue_ctrl { 
enum i40e_vf_states {

	I40E_VF_STATE_INIT = 0,

	I40E_VF_STATE_ACTIVE,

	I40E_VF_STATE_IWARPENA,

	I40E_VF_STATE_RDMAENA,

	I40E_VF_STATE_DISABLED,

	I40E_VF_STATE_MC_PROMISC,

	I40E_VF_STATE_UC_PROMISC,
@@ -46,7 +46,7 @@ enum i40e_vf_states { 
enum i40e_vf_capabilities {

	I40E_VIRTCHNL_VF_CAP_PRIVILEGE = 0,

	I40E_VIRTCHNL_VF_CAP_L2,

	I40E_VIRTCHNL_VF_CAP_IWARP,

	I40E_VIRTCHNL_VF_CAP_RDMA,

};



/* In ADq, max 4 VSI's can be allocated per VF including primary VF VSI.
@@ -108,7 +108,7 @@ struct i40e_vf { 
	u16 num_cloud_filters;



	/* RDMA Client */

	struct virtchnl_iwarp_qvlist_info *qvlist_info;

	struct virtchnl_rdma_qvlist_info *qvlist_info;

};



void i40e_free_vfs(struct i40e_pf *pf);

drivers/net/ethernet/intel/iavf/iavf.h

+3 −3
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ struct iavf_adapter { 
	u64 hw_csum_rx_error;

	u32 rx_desc_count;

	int num_msix_vectors;

	int num_iwarp_msix;

	int iwarp_base_vector;

	int num_rdma_msix;

	int rdma_base_vector;

	u32 client_pending;

	struct iavf_client_instance *cinst;

	struct msix_entry *msix_entries;
@@ -383,7 +383,7 @@ struct iavf_adapter { 
	enum virtchnl_ops current_op;

#define CLIENT_ALLOWED(_a) ((_a)->vf_res ? \

			    (_a)->vf_res->vf_cap_flags & \

				VIRTCHNL_VF_OFFLOAD_IWARP : \

				VIRTCHNL_VF_OFFLOAD_RDMA : \

			    0)

#define CLIENT_ENABLED(_a) ((_a)->cinst)

/* RSS by the PF should be preferred over RSS via other methods. */

drivers/net/ethernet/intel/iavf/iavf_client.c

+16 −16
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void iavf_notify_client_open(struct iavf_vsi *vsi) 
}



/**

 * iavf_client_release_qvlist - send a message to the PF to release iwarp qv map

 * iavf_client_release_qvlist - send a message to the PF to release rdma qv map

 * @ldev: pointer to L2 context.

 *

 * Return 0 on success or < 0 on error
@@ -141,12 +141,12 @@ static int iavf_client_release_qvlist(struct iavf_info *ldev) 
		return -EAGAIN;



	err = iavf_aq_send_msg_to_pf(&adapter->hw,

				     VIRTCHNL_OP_RELEASE_IWARP_IRQ_MAP,

				     VIRTCHNL_OP_RELEASE_RDMA_IRQ_MAP,

				     IAVF_SUCCESS, NULL, 0, NULL);



	if (err)

		dev_err(&adapter->pdev->dev,

			"Unable to send iWarp vector release message to PF, error %d, aq status %d\n",

			"Unable to send RDMA vector release message to PF, error %d, aq status %d\n",

			err, adapter->hw.aq.asq_last_status);



	return err;
@@ -215,9 +215,9 @@ iavf_client_add_instance(struct iavf_adapter *adapter) 
	cinst->lan_info.params = params;

	set_bit(__IAVF_CLIENT_INSTANCE_NONE, &cinst->state);



	cinst->lan_info.msix_count = adapter->num_iwarp_msix;

	cinst->lan_info.msix_count = adapter->num_rdma_msix;

	cinst->lan_info.msix_entries =

			&adapter->msix_entries[adapter->iwarp_base_vector];

			&adapter->msix_entries[adapter->rdma_base_vector];



	mac = list_first_entry(&cinst->lan_info.netdev->dev_addrs.list,

			       struct netdev_hw_addr, list);
@@ -425,17 +425,17 @@ static u32 iavf_client_virtchnl_send(struct iavf_info *ldev, 
	if (adapter->aq_required)

		return -EAGAIN;



	err = iavf_aq_send_msg_to_pf(&adapter->hw, VIRTCHNL_OP_IWARP,

	err = iavf_aq_send_msg_to_pf(&adapter->hw, VIRTCHNL_OP_RDMA,

				     IAVF_SUCCESS, msg, len, NULL);

	if (err)

		dev_err(&adapter->pdev->dev, "Unable to send iWarp message to PF, error %d, aq status %d\n",

		dev_err(&adapter->pdev->dev, "Unable to send RDMA message to PF, error %d, aq status %d\n",

			err, adapter->hw.aq.asq_last_status);



	return err;

}



/**

 * iavf_client_setup_qvlist - send a message to the PF to setup iwarp qv map

 * iavf_client_setup_qvlist - send a message to the PF to setup rdma qv map

 * @ldev: pointer to L2 context.

 * @client: Client pointer.

 * @qvlist_info: queue and vector list
@@ -446,7 +446,7 @@ static int iavf_client_setup_qvlist(struct iavf_info *ldev, 
				    struct iavf_client *client,

				    struct iavf_qvlist_info *qvlist_info)

{

	struct virtchnl_iwarp_qvlist_info *v_qvlist_info;

	struct virtchnl_rdma_qvlist_info *v_qvlist_info;

	struct iavf_adapter *adapter = ldev->vf;

	struct iavf_qv_info *qv_info;

	enum iavf_status err;
@@ -463,23 +463,23 @@ static int iavf_client_setup_qvlist(struct iavf_info *ldev, 
			continue;

		v_idx = qv_info->v_idx;

		if ((v_idx >=

		    (adapter->iwarp_base_vector + adapter->num_iwarp_msix)) ||

		    (v_idx < adapter->iwarp_base_vector))

		    (adapter->rdma_base_vector + adapter->num_rdma_msix)) ||

		    (v_idx < adapter->rdma_base_vector))

			return -EINVAL;

	}



	v_qvlist_info = (struct virtchnl_iwarp_qvlist_info *)qvlist_info;

	v_qvlist_info = (struct virtchnl_rdma_qvlist_info *)qvlist_info;

	msg_size = struct_size(v_qvlist_info, qv_info,

			       v_qvlist_info->num_vectors - 1);



	adapter->client_pending |= BIT(VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP);

	adapter->client_pending |= BIT(VIRTCHNL_OP_CONFIG_RDMA_IRQ_MAP);

	err = iavf_aq_send_msg_to_pf(&adapter->hw,

				VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP, IAVF_SUCCESS,

				VIRTCHNL_OP_CONFIG_RDMA_IRQ_MAP, IAVF_SUCCESS,

				(u8 *)v_qvlist_info, msg_size, NULL);



	if (err) {

		dev_err(&adapter->pdev->dev,

			"Unable to send iWarp vector config message to PF, error %d, aq status %d\n",

			"Unable to send RDMA vector config message to PF, error %d, aq status %d\n",

			err, adapter->hw.aq.asq_last_status);

		goto out;

	}
@@ -488,7 +488,7 @@ static int iavf_client_setup_qvlist(struct iavf_info *ldev, 
	for (i = 0; i < 5; i++) {

		msleep(100);

		if (!(adapter->client_pending &

		      BIT(VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP))) {

		      BIT(VIRTCHNL_OP_CONFIG_RDMA_IRQ_MAP))) {

			err = 0;

			break;

		}