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

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

Merge branch 'qed-general-fixes' 



Yuval Mintz says:

====================
qed*: General fixes

This series contain several fixes for qed and qede.

 - #1 [and ~#5] relate to XDP cleanups
 - #2 and #5 correct VF behavior
 - #3 and #4 fix and add missing configurations needed for RoCE & storage
====================

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

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

+1 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,7 @@ void qed_qm_init_pf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
	params.is_first_pf = p_hwfn->first_on_engine;

	params.num_pf_cids = iids.cids;

	params.num_vf_cids = iids.vf_cids;

	params.num_tids = iids.tids;

	params.start_pq = qm_info->start_pq;

	params.num_pf_pqs = qm_info->num_pqs - qm_info->num_vf_pqs;

	params.num_vf_pqs = qm_info->num_vf_pqs;

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

+1 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,7 @@ qed_hw_init_pf_doorbell_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
						   NULL) +

		       qed_cxt_get_proto_cid_count(p_hwfn, PROTOCOLID_ETH,

						   NULL);

	norm_regsize = roundup(QED_PF_DEMS_SIZE * non_pwm_conn, 4096);

	norm_regsize = roundup(QED_PF_DEMS_SIZE * non_pwm_conn, PAGE_SIZE);

	min_addr_reg1 = norm_regsize / 4096;

	pwm_regsize = db_bar_size - norm_regsize;

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

+4 −2
Original line number Diff line number Diff line
@@ -1093,10 +1093,12 @@ static int qed_slowpath_stop(struct qed_dev *cdev) 
		qed_free_stream_mem(cdev);

		if (IS_QED_ETH_IF(cdev))

			qed_sriov_disable(cdev, true);

	}



	qed_nic_stop(cdev);



	if (IS_PF(cdev))

		qed_slowpath_irq_free(cdev);

	}



	qed_disable_msix(cdev);

drivers/net/ethernet/qlogic/qede/qede_filter.c

+0 −5
Original line number Diff line number Diff line
@@ -1028,11 +1028,6 @@ int qede_xdp(struct net_device *dev, struct netdev_xdp *xdp) 
{

	struct qede_dev *edev = netdev_priv(dev);



	if (IS_VF(edev)) {

		DP_NOTICE(edev, "VFs don't support XDP\n");

		return -EOPNOTSUPP;

	}



	switch (xdp->command) {

	case XDP_SETUP_PROG:

		return qede_xdp_set(edev, xdp->prog);

drivers/net/ethernet/qlogic/qede/qede_main.c

+24 −1
Original line number Diff line number Diff line
@@ -563,6 +563,23 @@ static const struct net_device_ops qede_netdev_ops = { 
#endif

};



static const struct net_device_ops qede_netdev_vf_ops = {

	.ndo_open = qede_open,

	.ndo_stop = qede_close,

	.ndo_start_xmit = qede_start_xmit,

	.ndo_set_rx_mode = qede_set_rx_mode,

	.ndo_set_mac_address = qede_set_mac_addr,

	.ndo_validate_addr = eth_validate_addr,

	.ndo_change_mtu = qede_change_mtu,

	.ndo_vlan_rx_add_vid = qede_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid = qede_vlan_rx_kill_vid,

	.ndo_set_features = qede_set_features,

	.ndo_get_stats64 = qede_get_stats64,

	.ndo_udp_tunnel_add = qede_udp_tunnel_add,

	.ndo_udp_tunnel_del = qede_udp_tunnel_del,

	.ndo_features_check = qede_features_check,

};



/* -------------------------------------------------------------------------

 * START OF PROBE / REMOVE

 * -------------------------------------------------------------------------
@@ -622,6 +639,9 @@ static void qede_init_ndev(struct qede_dev *edev) 


	ndev->watchdog_timeo = TX_TIMEOUT;



	if (IS_VF(edev))

		ndev->netdev_ops = &qede_netdev_vf_ops;

	else

		ndev->netdev_ops = &qede_netdev_ops;



	qede_set_ethtool_ops(ndev);
@@ -1313,6 +1333,9 @@ static void qede_free_mem_fp(struct qede_dev *edev, struct qede_fastpath *fp) 
	if (fp->type & QEDE_FASTPATH_RX)

		qede_free_mem_rxq(edev, fp->rxq);



	if (fp->type & QEDE_FASTPATH_XDP)

		qede_free_mem_txq(edev, fp->xdp_tx);



	if (fp->type & QEDE_FASTPATH_TX)

		qede_free_mem_txq(edev, fp->txq);

}