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

Merge branch 'hns3-fixes' 



Huazhong Tan says:

====================
net: hns3: fixes for -net

There are some bugfixes for the HNS3 ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9f9d41f0 ab6e32d2

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ struct hclgevf_mbx_arq_ring { 
#define hclge_mbx_ring_ptr_move_crq(crq) \

	(crq->next_to_use = (crq->next_to_use + 1) % crq->desc_num)

#define hclge_mbx_tail_ptr_move_arq(arq) \

	(arq.tail = (arq.tail + 1) % HCLGE_MBX_MAX_ARQ_MSG_SIZE)

		(arq.tail = (arq.tail + 1) % HCLGE_MBX_MAX_ARQ_MSG_NUM)

#define hclge_mbx_head_ptr_move_arq(arq) \

		(arq.head = (arq.head + 1) % HCLGE_MBX_MAX_ARQ_MSG_SIZE)

		(arq.head = (arq.head + 1) % HCLGE_MBX_MAX_ARQ_MSG_NUM)

#endif

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

+6 −3
Original line number Diff line number Diff line
@@ -752,7 +752,8 @@ static int hclge_get_sset_count(struct hnae3_handle *handle, int stringset) 
		handle->flags |= HNAE3_SUPPORT_SERDES_SERIAL_LOOPBACK;

		handle->flags |= HNAE3_SUPPORT_SERDES_PARALLEL_LOOPBACK;



		if (hdev->hw.mac.phydev) {

		if (hdev->hw.mac.phydev && hdev->hw.mac.phydev->drv &&

		    hdev->hw.mac.phydev->drv->set_loopback) {

			count += 1;

			handle->flags |= HNAE3_SUPPORT_PHY_LOOPBACK;

		}
@@ -4537,8 +4538,8 @@ static int hclge_set_rss_tuple(struct hnae3_handle *handle, 
		req->ipv4_sctp_en = tuple_sets;

		break;

	case SCTP_V6_FLOW:

		if ((nfc->data & RXH_L4_B_0_1) ||

		    (nfc->data & RXH_L4_B_2_3))

		if (hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 &&

		    (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)))

			return -EINVAL;



		req->ipv6_sctp_en = tuple_sets;
@@ -4730,6 +4731,8 @@ static void hclge_rss_init_cfg(struct hclge_dev *hdev) 
		vport[i].rss_tuple_sets.ipv6_udp_en =

			HCLGE_RSS_INPUT_TUPLE_OTHER;

		vport[i].rss_tuple_sets.ipv6_sctp_en =

			hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 ?

			HCLGE_RSS_INPUT_TUPLE_SCTP_NO_PORT :

			HCLGE_RSS_INPUT_TUPLE_SCTP;

		vport[i].rss_tuple_sets.ipv6_fragment_en =

			HCLGE_RSS_INPUT_TUPLE_OTHER;

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

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ 
#define HCLGE_D_IP_BIT			BIT(2)

#define HCLGE_S_IP_BIT			BIT(3)

#define HCLGE_V_TAG_BIT			BIT(4)

#define HCLGE_RSS_INPUT_TUPLE_SCTP_NO_PORT	\

		(HCLGE_D_IP_BIT | HCLGE_S_IP_BIT | HCLGE_V_TAG_BIT)



#define HCLGE_RSS_TC_SIZE_0		1

#define HCLGE_RSS_TC_SIZE_1		2

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+6 −3
Original line number Diff line number Diff line
@@ -917,8 +917,8 @@ static int hclgevf_set_rss_tuple(struct hnae3_handle *handle, 
		req->ipv4_sctp_en = tuple_sets;

		break;

	case SCTP_V6_FLOW:

		if ((nfc->data & RXH_L4_B_0_1) ||

		    (nfc->data & RXH_L4_B_2_3))

		if (hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 &&

		    (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)))

			return -EINVAL;



		req->ipv6_sctp_en = tuple_sets;
@@ -2502,7 +2502,10 @@ static void hclgevf_rss_init_cfg(struct hclgevf_dev *hdev) 
		tuple_sets->ipv4_fragment_en = HCLGEVF_RSS_INPUT_TUPLE_OTHER;

		tuple_sets->ipv6_tcp_en = HCLGEVF_RSS_INPUT_TUPLE_OTHER;

		tuple_sets->ipv6_udp_en = HCLGEVF_RSS_INPUT_TUPLE_OTHER;

		tuple_sets->ipv6_sctp_en = HCLGEVF_RSS_INPUT_TUPLE_SCTP;

		tuple_sets->ipv6_sctp_en =

			hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 ?

					HCLGEVF_RSS_INPUT_TUPLE_SCTP_NO_PORT :

					HCLGEVF_RSS_INPUT_TUPLE_SCTP;

		tuple_sets->ipv6_fragment_en = HCLGEVF_RSS_INPUT_TUPLE_OTHER;

	}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ 
#define HCLGEVF_D_IP_BIT		BIT(2)

#define HCLGEVF_S_IP_BIT		BIT(3)

#define HCLGEVF_V_TAG_BIT		BIT(4)

#define HCLGEVF_RSS_INPUT_TUPLE_SCTP_NO_PORT	\

	(HCLGEVF_D_IP_BIT | HCLGEVF_S_IP_BIT | HCLGEVF_V_TAG_BIT)



#define HCLGEVF_STATS_TIMER_INTERVAL	36U