Commit 447621e3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-hns3-fixes-fot-net' 

Huazhong Tan says:

====================
net: hns3: fixes fot -net

The patchset includes some fixes for the HNS3 ethernet driver.
====================

Link: https://lore.kernel.org/r/1614410693-8107-1-git-send-email-tanhuazhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 89e5c58f b36fc875

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+3 −3
Original line number Diff line number Diff line
@@ -1053,16 +1053,16 @@ struct hclge_fd_tcam_config_3_cmd { 
#define HCLGE_FD_AD_DROP_B		0

#define HCLGE_FD_AD_DIRECT_QID_B	1

#define HCLGE_FD_AD_QID_S		2

#define HCLGE_FD_AD_QID_M		GENMASK(12, 2)

#define HCLGE_FD_AD_QID_M		GENMASK(11, 2)

#define HCLGE_FD_AD_USE_COUNTER_B	12

#define HCLGE_FD_AD_COUNTER_NUM_S	13

#define HCLGE_FD_AD_COUNTER_NUM_M	GENMASK(20, 13)

#define HCLGE_FD_AD_NXT_STEP_B		20

#define HCLGE_FD_AD_NXT_KEY_S		21

#define HCLGE_FD_AD_NXT_KEY_M		GENMASK(26, 21)

#define HCLGE_FD_AD_NXT_KEY_M		GENMASK(25, 21)

#define HCLGE_FD_AD_WR_RULE_ID_B	0

#define HCLGE_FD_AD_RULE_ID_S		1

#define HCLGE_FD_AD_RULE_ID_M		GENMASK(13, 1)

#define HCLGE_FD_AD_RULE_ID_M		GENMASK(12, 1)

#define HCLGE_FD_AD_TC_OVRD_B		16

#define HCLGE_FD_AD_TC_SIZE_S		17

#define HCLGE_FD_AD_TC_SIZE_M		GENMASK(20, 17)

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+3 −4
Original line number Diff line number Diff line
@@ -5245,9 +5245,9 @@ static bool hclge_fd_convert_tuple(u32 tuple_bit, u8 *key_x, u8 *key_y, 
	case BIT(INNER_SRC_MAC):

		for (i = 0; i < ETH_ALEN; i++) {

			calc_x(key_x[ETH_ALEN - 1 - i], rule->tuples.src_mac[i],

			       rule->tuples.src_mac[i]);

			       rule->tuples_mask.src_mac[i]);

			calc_y(key_y[ETH_ALEN - 1 - i], rule->tuples.src_mac[i],

			       rule->tuples.src_mac[i]);

			       rule->tuples_mask.src_mac[i]);

		}



		return true;
@@ -6330,8 +6330,7 @@ static void hclge_fd_get_ext_info(struct ethtool_rx_flow_spec *fs, 
		fs->h_ext.vlan_tci = cpu_to_be16(rule->tuples.vlan_tag1);

		fs->m_ext.vlan_tci =

				rule->unused_tuple & BIT(INNER_VLAN_TAG_FST) ?

				cpu_to_be16(VLAN_VID_MASK) :

				cpu_to_be16(rule->tuples_mask.vlan_tag1);

				0 : cpu_to_be16(rule->tuples_mask.vlan_tag1);

	}



	if (fs->flow_type & FLOW_MAC_EXT) {