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

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

Merge branch 'qed-ethtool-rx-flow-classification-enhancements' 



Manish Chopra says:

====================
qed*: ethtool rx flow classification enhancements.

This series re-structures the driver's ethtool rx flow
classification flow, following that it adds other flow
profiles and rx flow classification enhancements
via "ethtool -N/-U"

Please consider applying this to "net-next"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e2f4f4e9 608e00d0

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

+22 −15
Original line number Diff line number Diff line
@@ -1677,6 +1677,8 @@ static void __qed_get_vport_tstats(struct qed_hwfn *p_hwfn, 
	    HILO_64_REGPAIR(tstats.mftag_filter_discard);

	p_stats->common.mac_filter_discards +=

	    HILO_64_REGPAIR(tstats.eth_mac_filter_discard);

	p_stats->common.gft_filter_drop +=

		HILO_64_REGPAIR(tstats.eth_gft_drop_pkt);

}



static void __qed_get_vport_ustats_addrlen(struct qed_hwfn *p_hwfn,
@@ -1973,6 +1975,8 @@ qed_arfs_mode_to_hsi(enum qed_filter_config_mode mode) 
		return GFT_PROFILE_TYPE_4_TUPLE;

	if (mode == QED_FILTER_CONFIG_MODE_IP_DEST)

		return GFT_PROFILE_TYPE_IP_DST_ADDR;

	if (mode == QED_FILTER_CONFIG_MODE_IP_SRC)

		return GFT_PROFILE_TYPE_IP_SRC_ADDR;

	return GFT_PROFILE_TYPE_L4_DST_PORT;

}
@@ -2013,16 +2017,6 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, 
	u8 abs_vport_id = 0;

	int rc = -EINVAL;



	rc = qed_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);

	if (rc)

		return rc;



	if (p_params->qid != QED_RFS_NTUPLE_QID_RSS) {

		rc = qed_fw_l2_queue(p_hwfn, p_params->qid, &abs_rx_q_id);

		if (rc)

			return rc;

	}



	/* Get SPQ entry */

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

	init_data.cid = qed_spq_get_cid(p_hwfn);
@@ -2047,15 +2041,28 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, 
	DMA_REGPAIR_LE(p_ramrod->pkt_hdr_addr, p_params->addr);

	p_ramrod->pkt_hdr_length = cpu_to_le16(p_params->length);



	if (p_params->b_is_drop) {

		p_ramrod->vport_id = cpu_to_le16(ETH_GFT_TRASHCAN_VPORT);

	} else {

		rc = qed_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);

		if (rc)

			return rc;



		if (p_params->qid != QED_RFS_NTUPLE_QID_RSS) {

			rc = qed_fw_l2_queue(p_hwfn, p_params->qid,

					     &abs_rx_q_id);

			if (rc)

				return rc;



			p_ramrod->rx_qid_valid = 1;

			p_ramrod->rx_qid = cpu_to_le16(abs_rx_q_id);

		}



		p_ramrod->vport_id = cpu_to_le16((u16)abs_vport_id);

	}



	p_ramrod->flow_id_valid = 0;

	p_ramrod->flow_id = 0;



	p_ramrod->vport_id = cpu_to_le16((u16)abs_vport_id);

	p_ramrod->filter_action = p_params->b_is_add ? GFT_ADD_FILTER

	    : GFT_DELETE_FILTER;

drivers/net/ethernet/qlogic/qede/qede.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct qede_stats_common { 
	u64 rx_bcast_pkts;

	u64 mftag_filter_discards;

	u64 mac_filter_discards;

	u64 gft_filter_drop;

	u64 tx_ucast_bytes;

	u64 tx_mcast_bytes;

	u64 tx_bcast_bytes;

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

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static const struct { 
	QEDE_STAT(no_buff_discards),

	QEDE_PF_STAT(mftag_filter_discards),

	QEDE_PF_STAT(mac_filter_discards),

	QEDE_PF_STAT(gft_filter_drop),

	QEDE_STAT(tx_err_drop_pkts),

	QEDE_STAT(ttl0_discard),

	QEDE_STAT(packet_too_big_discard),

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

+472 −184

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ void qede_fill_by_demand_stats(struct qede_dev *edev) 
	p_common->rx_bcast_pkts = stats.common.rx_bcast_pkts;

	p_common->mftag_filter_discards = stats.common.mftag_filter_discards;

	p_common->mac_filter_discards = stats.common.mac_filter_discards;

	p_common->gft_filter_drop = stats.common.gft_filter_drop;



	p_common->tx_ucast_bytes = stats.common.tx_ucast_bytes;

	p_common->tx_mcast_bytes = stats.common.tx_mcast_bytes;