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

Commit c1a9f80e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-vf-tunnel' 



Manish Chopra says:

====================
qed/qede: VF tunnelling support

With this series VFs can run vxlan/geneve/gre tunnels over it.
Please consider applying this series to "net-next"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 36784277 eaf3c0c6

drivers/net/ethernet/qlogic/qed/qed.h

+28 −3
Original line number Diff line number Diff line
@@ -149,9 +149,35 @@ enum qed_tunn_clss { 
	QED_TUNN_CLSS_MAC_VNI,

	QED_TUNN_CLSS_INNER_MAC_VLAN,

	QED_TUNN_CLSS_INNER_MAC_VNI,

	QED_TUNN_CLSS_MAC_VLAN_DUAL_STAGE,

	MAX_QED_TUNN_CLSS,

};



struct qed_tunn_update_type {

	bool b_update_mode;

	bool b_mode_enabled;

	enum qed_tunn_clss tun_cls;

};



struct qed_tunn_update_udp_port {

	bool b_update_port;

	u16 port;

};



struct qed_tunnel_info {

	struct qed_tunn_update_type vxlan;

	struct qed_tunn_update_type l2_geneve;

	struct qed_tunn_update_type ip_geneve;

	struct qed_tunn_update_type l2_gre;

	struct qed_tunn_update_type ip_gre;



	struct qed_tunn_update_udp_port vxlan_port;

	struct qed_tunn_update_udp_port geneve_port;



	bool b_update_rx_cls;

	bool b_update_tx_cls;

};



struct qed_tunn_start_params {

	unsigned long	tunn_mode;

	u16		vxlan_udp_port;
@@ -648,9 +674,7 @@ struct qed_dev { 
	/* SRIOV */

	struct qed_hw_sriov_info *p_iov_info;

#define IS_QED_SRIOV(cdev)              (!!(cdev)->p_iov_info)



	unsigned long			tunn_mode;



	struct qed_tunnel_info		tunnel;

	bool				b_is_vf;

	u32				drv_type;

	struct qed_eth_stats		*reset_stats;
@@ -694,6 +718,7 @@ struct qed_dev { 
	u32 rdma_max_sge;

	u32 rdma_max_inline;

	u32 rdma_max_srq_sge;

	u16 tunn_feature_mask;

};



#define NUM_OF_VFS(dev)         (QED_IS_BB(dev) ? MAX_NUM_VFS_BB \

drivers/net/ethernet/qlogic/qed/qed_dev.c

+15 −2
Original line number Diff line number Diff line
@@ -1453,7 +1453,7 @@ static int qed_hw_init_port(struct qed_hwfn *p_hwfn, 


static int qed_hw_init_pf(struct qed_hwfn *p_hwfn,

			  struct qed_ptt *p_ptt,

			  struct qed_tunn_start_params *p_tunn,

			  struct qed_tunnel_info *p_tunn,

			  int hw_mode,

			  bool b_hw_start,

			  enum qed_int_mode int_mode,
@@ -1594,6 +1594,19 @@ qed_fill_load_req_params(struct qed_load_req_params *p_load_req, 
	p_load_req->override_force_load = p_drv_load->override_force_load;

}



static int qed_vf_start(struct qed_hwfn *p_hwfn,

			struct qed_hw_init_params *p_params)

{

	if (p_params->p_tunn) {

		qed_vf_set_vf_start_tunn_update_param(p_params->p_tunn);

		qed_vf_pf_tunnel_param_update(p_hwfn, p_params->p_tunn);

	}



	p_hwfn->b_int_enabled = 1;



	return 0;

}



int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params)

{

	struct qed_load_req_params load_req_params;
@@ -1623,7 +1636,7 @@ int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params) 
		}



		if (IS_VF(cdev)) {

			p_hwfn->b_int_enabled = 1;

			qed_vf_start(p_hwfn, p_params);

			continue;

		}

drivers/net/ethernet/qlogic/qed/qed_dev_api.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct qed_drv_load_params { 


struct qed_hw_init_params {

	/* Tunneling parameters */

	struct qed_tunn_start_params *p_tunn;

	struct qed_tunnel_info *p_tunn;



	bool b_hw_start;

drivers/net/ethernet/qlogic/qed/qed_l2.c

+26 −11
Original line number Diff line number Diff line
@@ -2285,31 +2285,46 @@ static int qed_stop_txq(struct qed_dev *cdev, u8 rss_id, void *handle) 
static int qed_tunn_configure(struct qed_dev *cdev,

			      struct qed_tunn_params *tunn_params)

{

	struct qed_tunn_update_params tunn_info;

	struct qed_tunnel_info tunn_info;

	int i, rc;



	if (IS_VF(cdev))

		return 0;



	memset(&tunn_info, 0, sizeof(tunn_info));

	if (tunn_params->update_vxlan_port == 1) {

		tunn_info.update_vxlan_udp_port = 1;

		tunn_info.vxlan_udp_port = tunn_params->vxlan_port;

	if (tunn_params->update_vxlan_port) {

		tunn_info.vxlan_port.b_update_port = true;

		tunn_info.vxlan_port.port = tunn_params->vxlan_port;

	}



	if (tunn_params->update_geneve_port == 1) {

		tunn_info.update_geneve_udp_port = 1;

		tunn_info.geneve_udp_port = tunn_params->geneve_port;

	if (tunn_params->update_geneve_port) {

		tunn_info.geneve_port.b_update_port = true;

		tunn_info.geneve_port.port = tunn_params->geneve_port;

	}



	for_each_hwfn(cdev, i) {

		struct qed_hwfn *hwfn = &cdev->hwfns[i];

		struct qed_tunnel_info *tun;



		tun = &hwfn->cdev->tunnel;



		rc = qed_sp_pf_update_tunn_cfg(hwfn, &tunn_info,

					       QED_SPQ_MODE_EBLOCK, NULL);



		if (rc)

			return rc;



		if (IS_PF_SRIOV(hwfn)) {

			u16 vxlan_port, geneve_port;

			int j;



			vxlan_port = tun->vxlan_port.port;

			geneve_port = tun->geneve_port.port;



			qed_for_each_vf(hwfn, j) {

				qed_iov_bulletin_set_udp_ports(hwfn, j,

							       vxlan_port,

							       geneve_port);

			}



			qed_schedule_iov(hwfn, QED_IOV_WQ_BULLETIN_UPDATE_FLAG);

		}

	}



	return 0;

drivers/net/ethernet/qlogic/qed/qed_main.c

+35 −12
Original line number Diff line number Diff line
@@ -230,10 +230,25 @@ static int qed_init_pci(struct qed_dev *cdev, struct pci_dev *pdev) 
int qed_fill_dev_info(struct qed_dev *cdev,

		      struct qed_dev_info *dev_info)

{

	struct qed_tunnel_info *tun = &cdev->tunnel;

	struct qed_ptt  *ptt;



	memset(dev_info, 0, sizeof(struct qed_dev_info));



	if (tun->vxlan.tun_cls == QED_TUNN_CLSS_MAC_VLAN &&

	    tun->vxlan.b_mode_enabled)

		dev_info->vxlan_enable = true;



	if (tun->l2_gre.b_mode_enabled && tun->ip_gre.b_mode_enabled &&

	    tun->l2_gre.tun_cls == QED_TUNN_CLSS_MAC_VLAN &&

	    tun->ip_gre.tun_cls == QED_TUNN_CLSS_MAC_VLAN)

		dev_info->gre_enable = true;



	if (tun->l2_geneve.b_mode_enabled && tun->ip_geneve.b_mode_enabled &&

	    tun->l2_geneve.tun_cls == QED_TUNN_CLSS_MAC_VLAN &&

	    tun->ip_geneve.tun_cls == QED_TUNN_CLSS_MAC_VLAN)

		dev_info->geneve_enable = true;



	dev_info->num_hwfns = cdev->num_hwfns;

	dev_info->pci_mem_start = cdev->pci_params.mem_start;

	dev_info->pci_mem_end = cdev->pci_params.mem_end;
@@ -909,8 +924,8 @@ static int qed_slowpath_start(struct qed_dev *cdev, 
{

	struct qed_drv_load_params drv_load_params;

	struct qed_hw_init_params hw_init_params;

	struct qed_tunn_start_params tunn_info;

	struct qed_mcp_drv_version drv_version;

	struct qed_tunnel_info tunn_info;

	const u8 *data = NULL;

	struct qed_hwfn *hwfn;

	struct qed_ptt *p_ptt;
@@ -974,19 +989,19 @@ static int qed_slowpath_start(struct qed_dev *cdev, 
		qed_dbg_pf_init(cdev);

	}



	memset(&tunn_info, 0, sizeof(tunn_info));

	tunn_info.tunn_mode |=  1 << QED_MODE_VXLAN_TUNN |

				1 << QED_MODE_L2GRE_TUNN |

				1 << QED_MODE_IPGRE_TUNN |

				1 << QED_MODE_L2GENEVE_TUNN |

				1 << QED_MODE_IPGENEVE_TUNN;



	tunn_info.tunn_clss_vxlan = QED_TUNN_CLSS_MAC_VLAN;

	tunn_info.tunn_clss_l2gre = QED_TUNN_CLSS_MAC_VLAN;

	tunn_info.tunn_clss_ipgre = QED_TUNN_CLSS_MAC_VLAN;



	/* Start the slowpath */

	memset(&hw_init_params, 0, sizeof(hw_init_params));

	memset(&tunn_info, 0, sizeof(tunn_info));

	tunn_info.vxlan.b_mode_enabled = true;

	tunn_info.l2_gre.b_mode_enabled = true;

	tunn_info.ip_gre.b_mode_enabled = true;

	tunn_info.l2_geneve.b_mode_enabled = true;

	tunn_info.ip_geneve.b_mode_enabled = true;

	tunn_info.vxlan.tun_cls = QED_TUNN_CLSS_MAC_VLAN;

	tunn_info.l2_gre.tun_cls = QED_TUNN_CLSS_MAC_VLAN;

	tunn_info.ip_gre.tun_cls = QED_TUNN_CLSS_MAC_VLAN;

	tunn_info.l2_geneve.tun_cls = QED_TUNN_CLSS_MAC_VLAN;

	tunn_info.ip_geneve.tun_cls = QED_TUNN_CLSS_MAC_VLAN;

	hw_init_params.p_tunn = &tunn_info;

	hw_init_params.b_hw_start = true;

	hw_init_params.int_mode = cdev->int_params.out.int_mode;
@@ -1007,6 +1022,14 @@ static int qed_slowpath_start(struct qed_dev *cdev, 
	DP_INFO(cdev,

		"HW initialization and function start completed successfully\n");



	if (IS_PF(cdev)) {

		cdev->tunn_feature_mask = (BIT(QED_MODE_VXLAN_TUNN) |

					   BIT(QED_MODE_L2GENEVE_TUNN) |

					   BIT(QED_MODE_IPGENEVE_TUNN) |

					   BIT(QED_MODE_L2GRE_TUNN) |

					   BIT(QED_MODE_IPGRE_TUNN));

	}



	/* Allocate LL2 interface if needed */

	if (QED_LEADING_HWFN(cdev)->using_ll2) {

		rc = qed_ll2_alloc_if(cdev);