Skip to contentSkip to conversation

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

PATCH Applied Hao Lan 2 participants 5 messages Nov 14, 2022 – Nov 15, 2022

Subsystems (4)
lore
Share & tools
lore

Hao Lan

author
#0 lore raw

v2 cover 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 796640778c26 ("net: hns3: support RXD advanced layout")
Fixes 232fc64b6e62 ("net: hns3: Add HW RSS hash information to RX skb")
Fixes ea4858670717 ("net: hns3: handle the BD info on the last BD of the packet")

Patch 2# fix return value check bug of rx copybreak.

Fixes e74a726da2c4 ("net: hns3: refactor hns3_nic_reuse_page()")
Fixes 99f6b5fb5f63 ("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 f5f2b3e4dcc0 ("net: hns3: add support for imp-controlled PHYs")
Fixes c5ef83cbb1e9 ("net: hns3: fix for phy_addr error in hclge_mac_mdio_config")
Fixes 2312e050f42b ("net: hns3: Fix for deadlock problem occurring when unregistering ae_algo")

Guangbin Huang (1):
net: hns3: fix setting incorrect phy link ksettings for firmware in
resetting process

Jian Shen (1):
net: hns3: fix incorrect hw rss hash type of rx packet

Jie Wang (1):
net: hns3: fix return value check bug of rx copybreak

 drivers/net/ethernet/hisilicon/hns3/hnae3.h   |   1 -
 .../hns3/hns3_common/hclge_comm_rss.c         |  20 ---
 .../hns3/hns3_common/hclge_comm_rss.h         |   2 -
 .../net/ethernet/hisilicon/hns3/hns3_enet.c   | 167 ++++++++++--------
 .../net/ethernet/hisilicon/hns3/hns3_enet.h   |   1 +
 .../hisilicon/hns3/hns3pf/hclge_main.c        |  11 +-
 6 files changed, 103 insertions(+), 99 deletions(-)
Signature · 1 line
2.30.0
author
#1 lore raw

PATCH v2 1/3 net: hns3: fix incorrect hw rss hash type of rx packet

From: Jian Shen <[email protected]>

Currently, the HNS3 driver reports the rss hash type of each packet based on the rss hash tuples set. It always reports PKT_HASH_TYPE_L4, without checking the type of current packet. It's incorrect.
Fixes it by reporting it base on the packet type.

Fixes 796640778c26 ("net: hns3: support RXD advanced layout")
Fixes 232fc64b6e62 ("net: hns3: Add HW RSS hash information to RX skb")
Fixes ea4858670717 ("net: hns3: handle the BD info on the last BD of the packet")
---
 drivers/net/ethernet/hisilicon/hns3/hnae3.h   |   1 -
 .../hns3/hns3_common/hclge_comm_rss.c         |  20 ---
 .../hns3/hns3_common/hclge_comm_rss.h         |   2 -
 .../net/ethernet/hisilicon/hns3/hns3_enet.c   | 163 ++++++++++--------
 .../net/ethernet/hisilicon/hns3/hns3_enet.h   |   1 +
 .../hisilicon/hns3/hns3pf/hclge_main.c        |   1 -
 6 files changed, 94 insertions(+), 94 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +0 -1
index 0179fc288f5f..17137de9338c 100644
@@ -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
index e23729ac3bb8..ae2736549526 100644
@@ -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
index 946d166a452d..92af3d2980d3 100644
@@ -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 +93 -70

212 lines not on this page · raw message

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +1 -0
index 133a054af6b7..294a14b4fdef 100644
@@ -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 {
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +0 -1
index 987271da6e9b..e34ac9c5900e 100644
@@ -4859,7 +4859,6 @@ static int hclge_set_rss_tuple(struct hnae3_handle *handle,
 		return ret;
 	}
 
-	hclge_comm_get_rss_type(&vport->nic, &hdev->rss_cfg.rss_tuple_sets);
 	return 0;
 }
 
Signature · 1 line
2.30.0
author
#2 lore raw

PATCH v2 2/3 net: hns3: fix return value check bug of rx copybreak

In reply to Hao Lan

From: Jie Wang <[email protected]>

The refactoring of rx copybreak modifies the original return logic, which will make this feature unavailable. So this patch fixes the return logic of rx copybreak.

Fixes e74a726da2c4 ("net: hns3: refactor hns3_nic_reuse_page()")
Fixes 99f6b5fb5f63 ("net: hns3: use bounce buffer when rx page can not be reused")
---
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +2 -2
index 7fc83409f257..028577943ec5 100644
@@ -3778,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:
Signature · 1 line
2.30.0
author
#3 lore raw

PATCH v2 3/3 net: hns3: fix setting incorrect phy link ksettings for firmware in resetting process

In reply to Hao Lan

From: Guangbin Huang <[email protected]>

Currently, if driver is in phy-imp(phy controlled by imp firmware) mode, as driver did not update phy link ksettings after initialization process or not update advertising when getting phy link ksettings from firmware, it may set incorrect phy link ksettings for firmware in resetting process. So fix it.

Fixes f5f2b3e4dcc0 ("net: hns3: add support for imp-controlled PHYs")
Fixes c5ef83cbb1e9 ("net: hns3: fix for phy_addr error in hclge_mac_mdio_config")
Fixes 2312e050f42b ("net: hns3: Fix for deadlock problem occurring when unregistering ae_algo")
---
 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +7 -3
index e34ac9c5900e..4e54f91f7a6c 100644
@@ -3443,6 +3443,7 @@ static int hclge_update_tp_port_info(struct hclge_dev *hdev)
 	hdev->hw.mac.autoneg = cmd.base.autoneg;
 	hdev->hw.mac.speed = cmd.base.speed;
 	hdev->hw.mac.duplex = cmd.base.duplex;
+	linkmode_copy(hdev->hw.mac.advertising, cmd.link_modes.advertising);
 
 	return 0;
 }
@@ -11586,9 +11587,12 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
 	if (ret)
 		goto err_msi_irq_uninit;
 
-	if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER &&
-	    !hnae3_dev_phy_imp_supported(hdev)) {
-		ret = hclge_mac_mdio_config(hdev);
+	if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER) {
+		if (hnae3_dev_phy_imp_supported(hdev))
+			ret = hclge_update_tp_port_info(hdev);
+		else
+			ret = hclge_mac_mdio_config(hdev);
+
 		if (ret)
 			goto err_msi_irq_uninit;
 	}
Signature · 1 line
2.30.0
#4 lore raw
In reply to Hao Lan
This series was applied to netdev/net.git (master) by Paolo Abeni <[email protected]>:

Hello:

This series was applied to netdev/net.git (master) by Paolo Abeni <[email protected]>:

Quoted 11 lines · On Mon, 14 Nov 2022 16:20:45 +0800 you wrote:

This series includes some bugfix for the HNS3 ethernet driver. Patch 1# fix incorrect hw rss hash type of rx packet.

Fixes 796640778c26 ("net: hns3: support RXD advanced layout")
Fixes 232fc64b6e62 ("net: hns3: Add HW RSS hash information to RX skb")
Fixes ea4858670717 ("net: hns3: handle the BD info on the last BD of the packet")

Patch 2# fix return value check bug of rx copybreak.

Fixes e74a726da2c4 ("net: hns3: refactor hns3_nic_reuse_page()")
Fixes 99f6b5fb5f63 ("net: hns3: use bounce buffer when rx page can not be reused")

[...]

Here is the summary with links:
- [V2,net,1/3] net: hns3: fix incorrect hw rss hash type of rx packet

    https://git.kernel.org/netdev/net/c/a56cad694767
  - [V2,net,2/3] net: hns3: fix return value check bug of rx copybreak
    https://git.kernel.org/netdev/net/c/29df7c695ed6
  - [V2,net,3/3] net: hns3: fix setting incorrect phy link ksettings for firmware in resetting process
    https://git.kernel.org/netdev/net/c/510d7b6ae842

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html