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

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

virtchnl: rename i40e to generic virtchnl 



This morphs all the i40e and i40evf references to/in virtchnl.h
to be generic, using only automated methods. Updates all the
callers to use the new names.  A followup patch provides separate
clean ups for messy line conversions from these "automatic"
changes, to make them more reviewable.

Was executed with the following sed script:
sed -i -f transform_script drivers/net/ethernet/intel/i40e/i40e_client.c
sed -i -f transform_script drivers/net/ethernet/intel/i40e/i40e_prototype.h
sed -i -f transform_script drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
sed -i -f transform_script drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
sed -i -f transform_script drivers/net/ethernet/intel/i40evf/i40e_common.c
sed -i -f transform_script drivers/net/ethernet/intel/i40evf/i40e_prototype.h
sed -i -f transform_script drivers/net/ethernet/intel/i40evf/i40evf.h
sed -i -f transform_script drivers/net/ethernet/intel/i40evf/i40evf_client.c
sed -i -f transform_script drivers/net/ethernet/intel/i40evf/i40evf_main.c
sed -i -f transform_script drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
sed -i -f transform_script include/linux/avf/virtchnl.h

transform_script:
----8<----
s/I40E_VIRTCHNL_SUPPORTED_QTYPES/SAVE_ME_SUPPORTED_QTYPES/g
s/I40E_VIRTCHNL_VF_CAP/SAVE_ME_VF_CAP/g

s/I40E_VIRTCHNL_/VIRTCHNL_/g
s/i40e_virtchnl_/virtchnl_/g
s/i40e_vfr_/virtchnl_vfr_/g
s/I40E_VFR_/VIRTCHNL_VFR_/g

s/VIRTCHNL_OP_ADD_ETHER_ADDRESS/VIRTCHNL_OP_ADD_ETH_ADDR/g
s/VIRTCHNL_OP_DEL_ETHER_ADDRESS/VIRTCHNL_OP_DEL_ETH_ADDR/g
s/VIRTCHNL_OP_FCOE/VIRTCHNL_OP_RSVD/g

s/SAVE_ME_SUPPORTED_QTYPES/I40E_VIRTCHNL_SUPPORTED_QTYPES/g
s/SAVE_ME_VF_CAP/I40E_VIRTCHNL_VF_CAP/g
----8<----

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 55cdfd48

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

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,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, I40E_VIRTCHNL_OP_IWARP,

	err = i40e_aq_send_msg_to_vf(hw, vf_id, VIRTCHNL_OP_IWARP,

				     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_prototype.h

+2 −2
Original line number Diff line number Diff line
@@ -333,10 +333,10 @@ static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype) 


/* i40e_common for VF drivers*/

void i40e_vf_parse_hw_config(struct i40e_hw *hw,

			     struct i40e_virtchnl_vf_resource *msg);

			     struct virtchnl_vf_resource *msg);

i40e_status i40e_vf_reset(struct i40e_hw *hw);

i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw,

				enum i40e_virtchnl_ops v_opcode,

				enum virtchnl_ops v_opcode,

				i40e_status v_retval,

				u8 *msg, u16 msglen,

				struct i40e_asq_cmd_details *cmd_details);

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

+185 −185

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -81,13 +81,13 @@ struct i40e_vf { 
	s16 vf_id;

	/* all VF vsis connect to the same parent */

	enum i40e_switch_element_types parent_type;

	struct i40e_virtchnl_version_info vf_ver;

	struct virtchnl_version_info vf_ver;

	u32 driver_caps; /* reported by VF driver */



	/* VF Port Extender (PE) stag if used */

	u16 stag;



	struct i40e_virtchnl_ether_addr default_lan_addr;

	struct virtchnl_ether_addr default_lan_addr;

	u16 port_vlan_id;

	bool pf_set_mac;	/* The VMM admin set the VF MAC address */

	bool trusted;
@@ -115,7 +115,7 @@ struct i40e_vf { 
	u16 num_vlan;



	/* RDMA Client */

	struct i40e_virtchnl_iwarp_qvlist_info *qvlist_info;

	struct virtchnl_iwarp_qvlist_info *qvlist_info;

};



void i40e_free_vfs(struct i40e_pf *pf);

drivers/net/ethernet/intel/i40evf/i40e_common.c

+5 −5
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ void i40evf_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val) 
 * completion before returning.

 **/

i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw,

				enum i40e_virtchnl_ops v_opcode,

				enum virtchnl_ops v_opcode,

				i40e_status v_retval,

				u8 *msg, u16 msglen,

				struct i40e_asq_cmd_details *cmd_details)
@@ -1092,9 +1092,9 @@ i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw, 
 * with appropriate information.

 **/

void i40e_vf_parse_hw_config(struct i40e_hw *hw,

			     struct i40e_virtchnl_vf_resource *msg)

			     struct virtchnl_vf_resource *msg)

{

	struct i40e_virtchnl_vsi_resource *vsi_res;

	struct virtchnl_vsi_resource *vsi_res;

	int i;



	vsi_res = &msg->vsi_res[0];
@@ -1104,7 +1104,7 @@ void i40e_vf_parse_hw_config(struct i40e_hw *hw, 
	hw->dev_caps.num_tx_qp = msg->num_queue_pairs;

	hw->dev_caps.num_msix_vectors_vf = msg->max_vectors;

	hw->dev_caps.dcb = msg->vf_offload_flags &

			   I40E_VIRTCHNL_VF_OFFLOAD_L2;

			   VIRTCHNL_VF_OFFLOAD_L2;

	hw->dev_caps.fcoe = 0;

	for (i = 0; i < msg->num_vsis; i++) {

		if (vsi_res->vsi_type == I40E_VSI_SRIOV) {
@@ -1127,7 +1127,7 @@ void i40e_vf_parse_hw_config(struct i40e_hw *hw, 
 **/

i40e_status i40e_vf_reset(struct i40e_hw *hw)

{

	return i40e_aq_send_msg_to_pf(hw, I40E_VIRTCHNL_OP_RESET_VF,

	return i40e_aq_send_msg_to_pf(hw, VIRTCHNL_OP_RESET_VF,

				      0, NULL, 0, NULL);

}