From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

--------------------------------------------

This patch optimizes the return process of hclge_enable_phy_loopback() and hclge_disable_phy_loopback() function for cleanup.

Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index c05b595..324925a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -6728,8 +6728,7 @@ static int hclge_enable_phy_loopback(struct hclge_dev *hdev, if (ret) return ret;

- ret = phy_loopback(phydev, true); - return ret; + return phy_loopback(phydev, true); }

static int hclge_disable_phy_loopback(struct hclge_dev *hdev, @@ -6741,8 +6740,7 @@ static int hclge_disable_phy_loopback(struct hclge_dev *hdev, if (ret) return ret;

- ret = phy_suspend(phydev); - return ret; + return phy_suspend(phydev); }

static int hclge_set_phy_loopback(struct hclge_dev *hdev, bool en)

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

--------------------------------------------------

This patch deletes unnecessary null pointer judgement of data in hns3_get_regs() function for cleanup.

Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c index 1ecbc1f..969978f 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -1292,7 +1292,7 @@ static void hns3_get_regs(struct net_device *netdev, { struct hnae3_handle *h = hns3_get_handle(netdev);

- if (!h->ae_algo->ops->get_regs || !data) + if (!h->ae_algo->ops->get_regs) return;

h->ae_algo->ops->get_regs(h, &cmd->version, data);

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

-------------------------------------------------

This patch deletes unnecessary 5s delay judgement in hclgevf_reset_event() function.

Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 ---- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 - 2 files changed, 5 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index b9bca6c..f4204ca 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -1868,10 +1868,6 @@ static void hclgevf_reset_event(struct pci_dev *pdev, struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); struct hclgevf_dev *hdev = ae_dev->priv;

- if (time_before(jiffies, (hdev->last_reset_time + - HCLGEVF_RESET_TASK_INTERVAL * HZ))) - return; - dev_info(&hdev->pdev->dev, "received reset request from VF enet\n");

if (hdev->default_reset_request) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h index 596618e..b49e9c3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h @@ -18,7 +18,6 @@

#define HCLGEVF_INVALID_VPORT 0xffff

-#define HCLGEVF_RESET_TASK_INTERVAL 5 #define HCLGEVF_GENERAL_TASK_INTERVAL 5 #define HCLGEVF_KEEP_ALIVE_TASK_INTERVAL 2

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

-------------------------------------------------------

When enable 4 TC after set the bandwidth of VF, the bandwidth of VF will resume to default value, because of the qset resources changed in this case.

This patch makes VF's qset resources fixed.

Signed-off-by: Yonglong Liu liuyonglong@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c index fbc39a2..4cee33f 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c @@ -566,7 +566,7 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport) */ kinfo->num_tc = vport->vport_id ? 1 : min_t(u16, vport->alloc_tqps, hdev->tm_info.num_tc); - vport->qs_offset = (vport->vport_id ? hdev->tm_info.num_tc : 0) + + vport->qs_offset = (vport->vport_id ? HNAE3_MAX_TC : 0) + (vport->vport_id ? (vport->vport_id - 1) : 0);

max_rss_size = min_t(u16, hdev->rss_size_max,

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

--------------------------------------------------

When deleting all the Flow Direction Table(FDT), driver needs to clear the bit map of hdev->fd_bmap and the rule number to zero. Using clear_bit() is redundant with bitmap_zere().

Signed-off-by: Guojia Liao liaoguojia@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 9a48731..19668a0 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -5919,11 +5919,10 @@ static void hclge_del_all_fd_entries(struct hnae3_handle *handle, hlist_for_each_entry_safe(rule, node, &hdev->fd_rule_list, rule_node) { hlist_del(&rule->rule_node); - clear_bit(rule->location, hdev->fd_bmap); kfree(rule); - hdev->hclge_fd_rule_num--; } hdev->fd_active_type = HCLGE_FD_RULE_NONE; + hdev->hclge_fd_rule_num = 0; bitmap_zero(hdev->fd_bmap, hdev->fd_cfg.rule_num[HCLGE_FD_STAGE_1]); }

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

---------------------------------------------------

There is a risk that causing index out of bounds error when using memcpy() without checking the length of the size to be copyed. This patch fixes it, which will make the code more reliable.

Signed-off-by: Guojia Liao liaoguojia@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 9 +++++++++ 1 file changed, 9 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index f4204ca..0ba9fe6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -3358,10 +3358,19 @@ static void hclgevf_get_regs(struct hnae3_handle *handle, u32 *version, void hclgevf_update_port_base_vlan_info(struct hclgevf_dev *hdev, u16 state, u8 *port_base_vlan_info, u8 data_size) { +#define MAX_LENGTH_OF_PORT_BASE_VLAN_INFO 8U struct hnae3_handle *nic = &hdev->nic; struct hclge_vf_to_pf_msg send_msg; int ret;

+ if (data_size > MAX_LENGTH_OF_PORT_BASE_VLAN_INFO) { + dev_info(&hdev->pdev->dev, + "the VF info len %u exceeds max len %u\n", + data_size, MAX_LENGTH_OF_PORT_BASE_VLAN_INFO); + /* If data_size is too long, set the value to max length */ + data_size = MAX_LENGTH_OF_PORT_BASE_VLAN_INFO; + } + rtnl_lock();

if (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state)) {

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

---------------------------------------------------

1.Tqp number, with the max number of 32768, using "u16" insteand of "int" is more suitable. 2.hash_algo, with the scope of hclge_main.c, declaring it with a "static" is more better.

Signed-off-by: Guojia Liao liaoguojia@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 869211a..abbcf92 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -72,7 +72,7 @@ static void hclge_sync_promisc_mode(struct hclge_dev *hdev); static int hclge_vf_vlan_filter_switch(struct hclge_vport *vport);

-struct hnae3_ae_algo ae_algo; +static struct hnae3_ae_algo ae_algo;

static struct workqueue_struct *hclge_wq;

@@ -10751,8 +10751,8 @@ static int hclge_set_channels(struct hnae3_handle *handle, u32 new_tqps_num, u16 tc_offset[HCLGE_MAX_TC_NUM] = {0}; struct hclge_dev *hdev = vport->back; u16 tc_size[HCLGE_MAX_TC_NUM] = {0}; - int cur_rss_size = kinfo->rss_size; - int cur_tqps = kinfo->num_tqps; + u16 cur_rss_size = kinfo->rss_size; + u16 cur_tqps = kinfo->num_tqps; u16 tc_valid[HCLGE_MAX_TC_NUM]; u16 roundup_size; u32 *rss_indir; @@ -10806,7 +10806,7 @@ static int hclge_set_channels(struct hnae3_handle *handle, u32 new_tqps_num, out: if (!ret) dev_info(&hdev->pdev->dev, - "Channels changed, rss_size from %d to %u, tqps from %d to %u", + "Channels changed, rss_size from %u to %u, tqps from %u to %u", cur_rss_size, kinfo->rss_size, cur_tqps, kinfo->rss_size * kinfo->num_tc);

@@ -11545,7 +11545,7 @@ struct hnae3_ae_ops hclge_ops = { .get_module_eeprom = hclge_get_module_eeprom, };

-struct hnae3_ae_algo ae_algo = { +static struct hnae3_ae_algo ae_algo = { .ops = &hclge_ops, .pdev_id_table = ae_algo_pci_tbl, };

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

----------------------------------------------------------

This patch renames parameter "h" into "handle" in function hclge_add_fd_entry_by_arfs() to make its meaning clearer, and to synchronize code with kernel mainline.

Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 6087def6..65d1bbd 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -6309,11 +6309,11 @@ static void hclge_fd_build_arfs_rule(const struct hclge_fd_rule_tuples *tuples, memset(&rule->tuples_mask, 0xFF, sizeof(rule->tuples_mask)); }

-static int hclge_add_fd_entry_by_arfs(struct hnae3_handle *h, u16 queue_id, +static int hclge_add_fd_entry_by_arfs(struct hnae3_handle *handle, u16 queue_id, u16 flow_id, struct flow_keys *fkeys) { #ifdef CONFIG_RFS_ACCEL - struct hclge_vport *vport = hclge_get_vport(h); + struct hclge_vport *vport = hclge_get_vport(handle); struct hclge_fd_rule_tuples new_tuples; struct hclge_dev *hdev = vport->back; struct hclge_fd_rule *rule;

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

-------------------------------------------------

The configuration of MAC address should be guaranteed by the user, and the driver should not limit the MAC address of user configuration.

Since unicast MAC no need to check existence anymore, reduce the parameters of hclge_lookup_mac_vlan_tbl() from 4 to 3.

Signed-off-by: Yonglong Liu liuyonglong@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 82 +++++++--------------- 1 file changed, 25 insertions(+), 57 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 65d1bbd..62285cb 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -7156,10 +7156,10 @@ static int hclge_remove_mac_vlan_tbl(struct hclge_vport *vport, HCLGE_MAC_VLAN_REMOVE); }

-static int hclge_lookup_mac_vlan_tbl(struct hclge_vport *vport, - struct hclge_mac_vlan_tbl_entry_cmd *req, - struct hclge_desc *desc, - bool is_mc) +static int +hclge_lookup_mc_mac_vlan_tbl(struct hclge_vport *vport, + struct hclge_mac_vlan_tbl_entry_cmd *req, + struct hclge_desc *desc) { struct hclge_dev *hdev = vport->back; u8 resp_code; @@ -7167,31 +7167,20 @@ static int hclge_lookup_mac_vlan_tbl(struct hclge_vport *vport, int ret;

hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_MAC_VLAN_ADD, true); - if (is_mc) { - desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); - memcpy(desc[0].data, - req, - sizeof(struct hclge_mac_vlan_tbl_entry_cmd)); - hclge_cmd_setup_basic_desc(&desc[1], - HCLGE_OPC_MAC_VLAN_ADD, - true); - desc[1].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); - hclge_cmd_setup_basic_desc(&desc[2], - HCLGE_OPC_MAC_VLAN_ADD, - true); - ret = hclge_cmd_send(&hdev->hw, desc, 3); - } else { - memcpy(desc[0].data, - req, - sizeof(struct hclge_mac_vlan_tbl_entry_cmd)); - ret = hclge_cmd_send(&hdev->hw, desc, 1); - } + desc[0].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); + memcpy(desc[0].data, req, sizeof(struct hclge_mac_vlan_tbl_entry_cmd)); + hclge_cmd_setup_basic_desc(&desc[1], HCLGE_OPC_MAC_VLAN_ADD, true); + desc[1].flag |= cpu_to_le16(HCLGE_CMD_FLAG_NEXT); + hclge_cmd_setup_basic_desc(&desc[2], HCLGE_OPC_MAC_VLAN_ADD, true); + + ret = hclge_cmd_send(&hdev->hw, desc, 3); if (ret) { dev_err(&hdev->pdev->dev, "lookup mac addr failed for cmd_send, ret =%d.\n", ret); return ret; } + resp_code = (le32_to_cpu(desc[0].data[0]) >> 8) & 0xff; retval = le16_to_cpu(desc[0].retval);

@@ -7464,7 +7453,6 @@ int hclge_add_uc_addr_common(struct hclge_vport *vport, { struct hclge_dev *hdev = vport->back; struct hclge_mac_vlan_tbl_entry_cmd req; - struct hclge_desc desc; u16 egress_port = 0; int ret;

@@ -7489,42 +7477,22 @@ int hclge_add_uc_addr_common(struct hclge_vport *vport,

hclge_prepare_mac_addr(&req, addr, false);

- /* Lookup the mac address in the mac_vlan table, and add - * it if the entry is inexistent. Repeated unicast entry - * is not allowed in the mac vlan table. - */ - ret = hclge_lookup_mac_vlan_tbl(vport, &req, &desc, false); - if (ret == -ENOENT) { - mutex_lock(&hdev->vport_lock); - if (!hclge_is_umv_space_full(vport, false)) { - ret = hclge_add_mac_vlan_tbl(vport, &req, NULL); - if (!ret) - hclge_update_umv_space(vport, false); + mutex_lock(&hdev->vport_lock); + if (!hclge_is_umv_space_full(vport, false)) { + ret = hclge_add_mac_vlan_tbl(vport, &req, NULL); + if (!ret) + hclge_update_umv_space(vport, false);

- mutex_unlock(&hdev->vport_lock); - return ret; - } mutex_unlock(&hdev->vport_lock); - - if (!(vport->overflow_promisc_flags & HNAE3_OVERFLOW_UPE)) - dev_err(&hdev->pdev->dev, "UC MAC table full(%u)\n", - hdev->priv_umv_size); - - return -ENOSPC; - } - - /* check if we just hit the duplicate */ - if (!ret) { - dev_warn(&hdev->pdev->dev, "VF %u mac(%pM) exists\n", - vport->vport_id, addr); - return 0; + return ret; } + mutex_unlock(&hdev->vport_lock);

- dev_err(&hdev->pdev->dev, - "PF failed to add unicast entry(%pM) in the MAC table\n", - addr); + if (!(vport->overflow_promisc_flags & HNAE3_OVERFLOW_UPE)) + dev_err(&hdev->pdev->dev, "UC MAC table full(%u)\n", + hdev->priv_umv_size);

- return ret; + return -ENOSPC; }

static int hclge_rm_uc_addr(struct hnae3_handle *handle, @@ -7593,7 +7561,7 @@ int hclge_add_mc_addr_common(struct hclge_vport *vport, } memset(&req, 0, sizeof(req)); hclge_prepare_mac_addr(&req, addr, true); - status = hclge_lookup_mac_vlan_tbl(vport, &req, desc, true); + status = hclge_lookup_mc_mac_vlan_tbl(vport, &req, desc); if (status) { /* This mac addr do not exist, add new entry for it */ memset(desc[0].data, 0, sizeof(desc[0].data)); @@ -7641,7 +7609,7 @@ int hclge_rm_mc_addr_common(struct hclge_vport *vport,

memset(&req, 0, sizeof(req)); hclge_prepare_mac_addr(&req, addr, true); - status = hclge_lookup_mac_vlan_tbl(vport, &req, desc, true); + status = hclge_lookup_mc_mac_vlan_tbl(vport, &req, desc); if (!status) { /* This mac addr exist, remove this handle's VFID for it */ status = hclge_update_desc_vfid(desc, vport->vport_id, true);

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

-------------------------------------------------------------

If selftest and reset are performed at the same time, the phy loopback setting may be still in enable state after the reset. As a result, device cannot link up. So we need to disable it before phy_start().

This patch also adds support of dump phy loopback in debugfs.

Signed-off-by: Yufeng Mo moyufeng@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 5 +++++ drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 2 ++ 2 files changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c index 6278ff6..ec6b147 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c @@ -1316,6 +1316,7 @@ static void hclge_dbg_dump_ncl_config(struct hclge_dev *hdev, static void hclge_dbg_dump_loopback(struct hclge_dev *hdev, const char *cmd_buf) { + struct phy_device *phydev = hdev->hw.mac.phydev; struct hclge_config_mac_mode_cmd *req_app; struct hclge_serdes_lb_cmd *req_serdes; struct hclge_desc desc; @@ -1356,6 +1357,10 @@ static void hclge_dbg_dump_loopback(struct hclge_dev *hdev, HCLGE_CMD_SERDES_PARALLEL_INNER_LOOP_B; dev_info(&hdev->pdev->dev, "serdes parallel loopback: %s\n", loopback_en ? "on" : "off"); + + if (phydev) + dev_info(&hdev->pdev->dev, "phy loopback: %s\n", + phydev->loopback_enabled ? "on" : "off"); }

/* hclge_dbg_dump_mac_tnl_status: print message about mac tnl interrupt diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c index f31b2e5..d0247f4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c @@ -278,6 +278,8 @@ void hclge_mac_start_phy(struct hclge_dev *hdev) if (!phydev) return;

+ phy_loopback(phydev, false); + phy_start(phydev); }

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

----------------------------------------------

This patch mainly synchronzies some code from mainline.

Signed-off-by: Guojia Liao liaoguojia@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index be83092..31b928a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -11510,9 +11510,9 @@ struct hnae3_ae_ops hclge_ops = { .get_vf_config = hclge_get_vf_config, .set_vf_link_state = hclge_set_vf_link_state, .set_vf_spoofchk = hclge_set_vf_spoofchk, - .set_vf_mac = hclge_set_vf_mac, .set_vf_trust = hclge_set_vf_trust, .set_vf_rate = hclge_set_vf_rate, + .set_vf_mac = hclge_set_vf_mac, .get_module_eeprom = hclge_get_module_eeprom, };

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index d871fde..6b85e1f 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -940,7 +940,6 @@ struct hclge_vport {

u8 vf_vlan_en; unsigned long vlan_del_fail_bmap[BITS_TO_LONGS(VLAN_N_VID)]; - struct list_head vlan_list; /* Store VF vlan table */ struct hclge_port_base_vlan_config port_base_vlan_cfg; struct hclge_tx_vtag_cfg txvlan_cfg; struct hclge_rx_vtag_cfg rxvlan_cfg; @@ -955,14 +954,15 @@ struct hclge_vport { unsigned long state; unsigned long last_active_jiffies; int mps; /* Max packet size */ + struct hclge_vf_info vf_info;

u8 overflow_promisc_flags; u8 last_promisc_flags; - struct hclge_vf_info vf_info;

spinlock_t mac_list_lock; /* protect mac address need to add/detele */ struct list_head uc_mac_list; /* Store VF unicast table */ struct list_head mc_mac_list; /* Store VF multicast table */ + struct list_head vlan_list; /* Store VF vlan table */ };

int hclge_set_vport_promisc_mode(struct hclge_vport *vport, bool en_uc_pmc, @@ -1026,6 +1026,7 @@ void hclge_modify_mac_node_state(struct list_head *list, const u8 *addr, void hclge_rm_vport_all_mac_table(struct hclge_vport *vport, bool is_del_list, enum HCLGE_MAC_ADDR_TYPE mac_type); void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list); +void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev); void hclge_restore_mac_table_common(struct hclge_vport *vport); void hclge_restore_vport_port_base_vlan_config(struct hclge_dev *hdev); void hclge_restore_vport_vlan_table(struct hclge_vport *vport);

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

-------------------------------------------------

This patch modifies some print messages to clean up code and keep print messages style consistent.

Signed-off-by: Guangbin Huang huangguangbin2@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 10 +++++----- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c index 33a0425..2b85d08 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c @@ -830,7 +830,7 @@ static void hclge_dbg_dump_qos_buf_cfg(struct hclge_dev *hdev)

err_qos_cmd_send: dev_err(&hdev->pdev->dev, - "dump qos buf cfg fail(0x%x), ret = %d\n", cmd, ret); + "dump qos buf cfg fail(0x%x), ret = %d\n", cmd, ret); }

static void hclge_dbg_dump_mac_table(struct hclge_dev *hdev) @@ -1118,8 +1118,8 @@ static void hclge_dbg_fd_tcam(struct hclge_dev *hdev)

rule_cnt = hclge_dbg_get_rules_location(hdev, rule_locs); if (rule_cnt <= 0) { - dev_err(&hdev->pdev->dev, "get error rule number, ret = %d\n", - rule_cnt); + dev_err(&hdev->pdev->dev, + "failed to get rule number, ret = %d\n", rule_cnt); kfree(rule_locs); return; } @@ -1128,7 +1128,7 @@ static void hclge_dbg_fd_tcam(struct hclge_dev *hdev) ret = hclge_dbg_fd_tcam_read(hdev, 0, true, rule_locs[i]); if (ret) { dev_err(&hdev->pdev->dev, - "get fd tcam key x failed, ret = %d\n", ret); + "failed to get fd tcam key x, ret = %d\n", ret); kfree(rule_locs); return; } @@ -1136,7 +1136,7 @@ static void hclge_dbg_fd_tcam(struct hclge_dev *hdev) ret = hclge_dbg_fd_tcam_read(hdev, 0, false, rule_locs[i]); if (ret) { dev_err(&hdev->pdev->dev, - "get fd tcam key y failed, ret = %d\n", ret); + "failed to get fd tcam key y, ret = %d\n", ret); kfree(rule_locs); return; } diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 3e4b5be..e08ae66 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -11528,7 +11528,7 @@ int hclge_init(void)

hclge_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, HCLGE_NAME); if (!hclge_wq) { - pr_err("%s: Failed to create workqueue\n", HCLGE_NAME); + pr_err("%s: failed to create workqueue\n", HCLGE_NAME); return -ENOMEM; }

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index 0ba9fe6..41a3d42 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -3470,7 +3470,7 @@ static int hclgevf_init(void)

hclgevf_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, HCLGEVF_NAME); if (!hclgevf_wq) { - pr_err("%s: Failed to create workqueue\n", HCLGEVF_NAME); + pr_err("%s: failed to create workqueue\n", HCLGEVF_NAME); return -ENOMEM; }

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

-------------------------------------

The HNS3 driver supports to config tc numbers and tc to priority map via "tc" tool. But when delete the rule, will failed, because the HNS3 driver needs at least one tc, but the "tc" tool sets tc number to zero when delete.

This patch make sure that the tc number is at least one.

Signed-off-by: Yonglong Liu liuyonglong@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index bc86846..4eca8cf 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1739,7 +1739,7 @@ static int hns3_setup_tc(struct net_device *netdev, void *type_data) netdev_info(netdev, "setup tc: num_tc=%u\n", tc);

return (kinfo->dcb_ops && kinfo->dcb_ops->setup_tc) ? - kinfo->dcb_ops->setup_tc(h, tc, prio_tc) : -EOPNOTSUPP; + kinfo->dcb_ops->setup_tc(h, tc ? tc : 1, prio_tc) : -EOPNOTSUPP; } #endif

From: shenhao shenhao21@huawei.com

driver inclusion category: bugfix bugzilla: NA CVE: NA

---------------------------------------------------------

Currently, there is a 8s timewindow for PF to know VF being unalive. in this case, when host changes VF mac or VLAN configuration, PF may fail to send mailbox to VF. For VF will query these configuration from PF when reinitialization, so it needn't return error to stack.

Signed-off-by: Jian Shen shenjian15@huawei.com Signed-off-by: shenhao shenhao21@huawei.com Reviewed-by: Zhong Zhaohui zhongzhaohui@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 3f9ed71..c2ae05f 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -8054,11 +8054,17 @@ static int hclge_set_vf_mac(struct hnae3_handle *handle, int vf, }

ether_addr_copy(vport->vf_info.mac, mac_addr); + + /* there is a timewindow for PF to know VF unalive, it may + * cause send mailbox fail, but it doesn't matter, VF will + * query it when reinit. + */ if (test_bit(HCLGE_VPORT_STATE_ALIVE, &vport->state)) { dev_info(&hdev->pdev->dev, "MAC of VF %d has been set to %pM, and it will be reinitialized!\n", vf, mac_addr); - return hclge_inform_reset_assert_to_vf(vport); + (void)hclge_inform_reset_assert_to_vf(vport); + return 0; }

dev_info(&hdev->pdev->dev, "MAC of VF %d has been set to %pM\n", @@ -9186,11 +9192,15 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid, return ret; }

+ /* there is a timewindow for PF to know VF unalive, it may + * cause send mailbox fail, but it doesn't matter, VF will + * query it when reinit. + */ if (test_bit(HCLGE_VPORT_STATE_ALIVE, &vport->state)) - return hclge_push_vf_port_base_vlan_info(&hdev->vport[0], - vport->vport_id, - state, vlan, qos, - ntohs(proto)); + (void)hclge_push_vf_port_base_vlan_info(&hdev->vport[0], + vport->vport_id, + state, vlan, qos, + ntohs(proto));

return 0; }