Commit 598ab4b1 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-hns3-this-series-bugfix-for-the-hns3-ethernet-driver' 

Hao Lan says:

====================
net: hns3: This series bugfix for the HNS3 ethernet driver.

This series includes some bugfix for the HNS3 ethernet driver.
Patch 1# fix incorrect hw rss hash type of rx packet.
Fixes: 79664077 ("net: hns3: support RXD advanced layout")
Fixes: 232fc64b ("net: hns3: Add HW RSS hash information to RX skb")
Fixes: ea485867 ("net: hns3: handle the BD info on the last BD of the packet")

Patch 2# fix return value check bug of rx copybreak.
Fixes: e74a726d ("net: hns3: refactor hns3_nic_reuse_page()")
Fixes: 99f6b5fb ("net: hns3: use bounce buffer when rx page can not be reused")

Patch 3# net: hns3: fix setting incorrect phy link ksettings
 for firmware in resetting process
Fixes: f5f2b3e4 ("net: hns3: add support for imp-controlled PHYs")
Fixes: c5ef83cb ("net: hns3: fix for phy_addr error in hclge_mac_mdio_config")
Fixes: 2312e050 ("net: hns3: Fix for deadlock problem occurring when unregistering ae_algo")
====================

Link: https://lore.kernel.org/r/20221114082048.49450-1-lanhao@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 18c532e4 510d7b6a

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

+0 −1
Original line number Diff line number Diff line
@@ -819,7 +819,6 @@ struct hnae3_knic_private_info { 
	const struct hnae3_dcb_ops *dcb_ops;



	u16 int_rl_setting;

	enum pkt_hash_types rss_type;

	void __iomem *io_base;

};

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c

+0 −20
Original line number Diff line number Diff line
@@ -191,23 +191,6 @@ u32 hclge_comm_get_rss_key_size(struct hnae3_handle *handle) 
	return HCLGE_COMM_RSS_KEY_SIZE;

}



void hclge_comm_get_rss_type(struct hnae3_handle *nic,

			     struct hclge_comm_rss_tuple_cfg *rss_tuple_sets)

{

	if (rss_tuple_sets->ipv4_tcp_en ||

	    rss_tuple_sets->ipv4_udp_en ||

	    rss_tuple_sets->ipv4_sctp_en ||

	    rss_tuple_sets->ipv6_tcp_en ||

	    rss_tuple_sets->ipv6_udp_en ||

	    rss_tuple_sets->ipv6_sctp_en)

		nic->kinfo.rss_type = PKT_HASH_TYPE_L4;

	else if (rss_tuple_sets->ipv4_fragment_en ||

		 rss_tuple_sets->ipv6_fragment_en)

		nic->kinfo.rss_type = PKT_HASH_TYPE_L3;

	else

		nic->kinfo.rss_type = PKT_HASH_TYPE_NONE;

}



int hclge_comm_parse_rss_hfunc(struct hclge_comm_rss_cfg *rss_cfg,

			       const u8 hfunc, u8 *hash_algo)

{
@@ -344,9 +327,6 @@ int hclge_comm_set_rss_input_tuple(struct hnae3_handle *nic, 
	req->ipv6_sctp_en = rss_cfg->rss_tuple_sets.ipv6_sctp_en;

	req->ipv6_fragment_en = rss_cfg->rss_tuple_sets.ipv6_fragment_en;



	if (is_pf)

		hclge_comm_get_rss_type(nic, &rss_cfg->rss_tuple_sets);



	ret = hclge_comm_cmd_send(hw, &desc, 1);

	if (ret)

		dev_err(&hw->cmq.csq.pdev->dev,

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ struct hclge_comm_rss_tc_mode_cmd { 
};



u32 hclge_comm_get_rss_key_size(struct hnae3_handle *handle);

void hclge_comm_get_rss_type(struct hnae3_handle *nic,

			     struct hclge_comm_rss_tuple_cfg *rss_tuple_sets);

void hclge_comm_rss_indir_init_cfg(struct hnae3_ae_dev *ae_dev,

				   struct hclge_comm_rss_cfg *rss_cfg);

int hclge_comm_get_rss_tuple(struct hclge_comm_rss_cfg *rss_cfg, int flow_type,

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+95 −72
Original line number Diff line number Diff line
@@ -105,26 +105,28 @@ static const struct pci_device_id hns3_pci_tbl[] = { 
};

MODULE_DEVICE_TABLE(pci, hns3_pci_tbl);



#define HNS3_RX_PTYPE_ENTRY(ptype, l, s, t) \

#define HNS3_RX_PTYPE_ENTRY(ptype, l, s, t, h) \

	{	ptype, \

		l, \

		CHECKSUM_##s, \

		HNS3_L3_TYPE_##t, \

		1 }

		1, \

		h}



#define HNS3_RX_PTYPE_UNUSED_ENTRY(ptype) \

		{ ptype, 0, CHECKSUM_NONE, HNS3_L3_TYPE_PARSE_FAIL, 0 }

		{ ptype, 0, CHECKSUM_NONE, HNS3_L3_TYPE_PARSE_FAIL, 0, \

		  PKT_HASH_TYPE_NONE }



static const struct hns3_rx_ptype hns3_rx_ptype_tbl[] = {

	HNS3_RX_PTYPE_UNUSED_ENTRY(0),

	HNS3_RX_PTYPE_ENTRY(1, 0, COMPLETE, ARP),

	HNS3_RX_PTYPE_ENTRY(2, 0, COMPLETE, RARP),

	HNS3_RX_PTYPE_ENTRY(3, 0, COMPLETE, LLDP),

	HNS3_RX_PTYPE_ENTRY(4, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(5, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(6, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(7, 0, COMPLETE, CNM),

	HNS3_RX_PTYPE_ENTRY(8, 0, NONE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(1, 0, COMPLETE, ARP, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(2, 0, COMPLETE, RARP, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(3, 0, COMPLETE, LLDP, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(4, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(5, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(6, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(7, 0, COMPLETE, CNM, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(8, 0, NONE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_UNUSED_ENTRY(9),

	HNS3_RX_PTYPE_UNUSED_ENTRY(10),

	HNS3_RX_PTYPE_UNUSED_ENTRY(11),
@@ -132,36 +134,36 @@ static const struct hns3_rx_ptype hns3_rx_ptype_tbl[] = { 
	HNS3_RX_PTYPE_UNUSED_ENTRY(13),

	HNS3_RX_PTYPE_UNUSED_ENTRY(14),

	HNS3_RX_PTYPE_UNUSED_ENTRY(15),

	HNS3_RX_PTYPE_ENTRY(16, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(17, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(18, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(19, 0, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(20, 0, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(21, 0, NONE, IPV4),

	HNS3_RX_PTYPE_ENTRY(22, 0, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(23, 0, NONE, IPV4),

	HNS3_RX_PTYPE_ENTRY(24, 0, NONE, IPV4),

	HNS3_RX_PTYPE_ENTRY(25, 0, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(16, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(17, 0, COMPLETE, IPV4, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(18, 0, COMPLETE, IPV4, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(19, 0, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(20, 0, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(21, 0, NONE, IPV4, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(22, 0, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(23, 0, NONE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(24, 0, NONE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(25, 0, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_UNUSED_ENTRY(26),

	HNS3_RX_PTYPE_UNUSED_ENTRY(27),

	HNS3_RX_PTYPE_UNUSED_ENTRY(28),

	HNS3_RX_PTYPE_ENTRY(29, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(30, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(31, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(32, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(33, 1, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(34, 1, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(35, 1, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(36, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(37, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(29, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(30, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(31, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(32, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(33, 1, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(34, 1, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(35, 1, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(36, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(37, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_UNUSED_ENTRY(38),

	HNS3_RX_PTYPE_ENTRY(39, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(40, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(41, 1, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(42, 1, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(43, 1, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(44, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(45, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(39, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(40, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(41, 1, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(42, 1, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(43, 1, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(44, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(45, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_UNUSED_ENTRY(46),

	HNS3_RX_PTYPE_UNUSED_ENTRY(47),

	HNS3_RX_PTYPE_UNUSED_ENTRY(48),
@@ -227,35 +229,35 @@ static const struct hns3_rx_ptype hns3_rx_ptype_tbl[] = { 
	HNS3_RX_PTYPE_UNUSED_ENTRY(108),

	HNS3_RX_PTYPE_UNUSED_ENTRY(109),

	HNS3_RX_PTYPE_UNUSED_ENTRY(110),

	HNS3_RX_PTYPE_ENTRY(111, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(112, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(113, 0, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(114, 0, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(115, 0, NONE, IPV6),

	HNS3_RX_PTYPE_ENTRY(116, 0, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(117, 0, NONE, IPV6),

	HNS3_RX_PTYPE_ENTRY(118, 0, NONE, IPV6),

	HNS3_RX_PTYPE_ENTRY(119, 0, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(111, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(112, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(113, 0, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(114, 0, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(115, 0, NONE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(116, 0, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(117, 0, NONE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(118, 0, NONE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(119, 0, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_UNUSED_ENTRY(120),

	HNS3_RX_PTYPE_UNUSED_ENTRY(121),

	HNS3_RX_PTYPE_UNUSED_ENTRY(122),

	HNS3_RX_PTYPE_ENTRY(123, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(124, 0, COMPLETE, PARSE_FAIL),

	HNS3_RX_PTYPE_ENTRY(125, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(126, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(127, 1, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(128, 1, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(129, 1, UNNECESSARY, IPV4),

	HNS3_RX_PTYPE_ENTRY(130, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(131, 0, COMPLETE, IPV4),

	HNS3_RX_PTYPE_ENTRY(123, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(124, 0, COMPLETE, PARSE_FAIL, PKT_HASH_TYPE_NONE),

	HNS3_RX_PTYPE_ENTRY(125, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(126, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(127, 1, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(128, 1, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(129, 1, UNNECESSARY, IPV4, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(130, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(131, 0, COMPLETE, IPV4, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_UNUSED_ENTRY(132),

	HNS3_RX_PTYPE_ENTRY(133, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(134, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(135, 1, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(136, 1, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(137, 1, UNNECESSARY, IPV6),

	HNS3_RX_PTYPE_ENTRY(138, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(139, 0, COMPLETE, IPV6),

	HNS3_RX_PTYPE_ENTRY(133, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(134, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(135, 1, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(136, 1, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(137, 1, UNNECESSARY, IPV6, PKT_HASH_TYPE_L4),

	HNS3_RX_PTYPE_ENTRY(138, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_ENTRY(139, 0, COMPLETE, IPV6, PKT_HASH_TYPE_L3),

	HNS3_RX_PTYPE_UNUSED_ENTRY(140),

	HNS3_RX_PTYPE_UNUSED_ENTRY(141),

	HNS3_RX_PTYPE_UNUSED_ENTRY(142),
@@ -3776,8 +3778,8 @@ static void hns3_nic_reuse_page(struct sk_buff *skb, int i, 
		desc_cb->reuse_flag = 1;

	} else if (frag_size <= ring->rx_copybreak) {

		ret = hns3_handle_rx_copybreak(skb, i, ring, pull_len, desc_cb);

		if (ret)

			goto out;

		if (!ret)

			return;

	}



out:
@@ -4171,15 +4173,35 @@ static int hns3_set_gro_and_checksum(struct hns3_enet_ring *ring, 
}



static void hns3_set_rx_skb_rss_type(struct hns3_enet_ring *ring,

				     struct sk_buff *skb, u32 rss_hash)

				     struct sk_buff *skb, u32 rss_hash,

				     u32 l234info, u32 ol_info)

{

	struct hnae3_handle *handle = ring->tqp->handle;

	enum pkt_hash_types rss_type;

	enum pkt_hash_types rss_type = PKT_HASH_TYPE_NONE;

	struct net_device *netdev = ring_to_netdev(ring);

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	if (rss_hash)

		rss_type = handle->kinfo.rss_type;

	else

		rss_type = PKT_HASH_TYPE_NONE;

	if (test_bit(HNS3_NIC_STATE_RXD_ADV_LAYOUT_ENABLE, &priv->state)) {

		u32 ptype = hnae3_get_field(ol_info, HNS3_RXD_PTYPE_M,

					    HNS3_RXD_PTYPE_S);



		rss_type = hns3_rx_ptype_tbl[ptype].hash_type;

	} else {

		int l3_type = hnae3_get_field(l234info, HNS3_RXD_L3ID_M,

					      HNS3_RXD_L3ID_S);

		int l4_type = hnae3_get_field(l234info, HNS3_RXD_L4ID_M,

					      HNS3_RXD_L4ID_S);



		if (l3_type == HNS3_L3_TYPE_IPV4 ||

		    l3_type == HNS3_L3_TYPE_IPV6) {

			if (l4_type == HNS3_L4_TYPE_UDP ||

			    l4_type == HNS3_L4_TYPE_TCP ||

			    l4_type == HNS3_L4_TYPE_SCTP)

				rss_type = PKT_HASH_TYPE_L4;

			else if (l4_type == HNS3_L4_TYPE_IGMP ||

				 l4_type == HNS3_L4_TYPE_ICMP)

				rss_type = PKT_HASH_TYPE_L3;

		}

	}



	skb_set_hash(skb, rss_hash, rss_type);

}
@@ -4282,7 +4304,8 @@ static int hns3_handle_bdinfo(struct hns3_enet_ring *ring, struct sk_buff *skb) 


	ring->tqp_vector->rx_group.total_bytes += len;



	hns3_set_rx_skb_rss_type(ring, skb, le32_to_cpu(desc->rx.rss_hash));

	hns3_set_rx_skb_rss_type(ring, skb, le32_to_cpu(desc->rx.rss_hash),

				 l234info, ol_info);

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ struct hns3_rx_ptype { 
	u32 ip_summed : 2;

	u32 l3_type : 4;

	u32 valid : 1;

	u32 hash_type: 3;

};



struct ring_stats {