support query tx timeout threshold by debugfs

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 ++++

1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

@@ -XXX,XX +XXX,XX @@ hns3_dbg_dev_specs(struct hnae3_handle *h, char *buf, int len, int *pos)

    struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev);

    struct hnae3_dev_specs *dev_specs = &ae_dev->dev_specs;

    struct hnae3_knic_private_info *kinfo = &h->kinfo;

+    struct net_device *dev = kinfo->netdev;

    *pos += scnprintf(buf + *pos, len - *pos, "dev_spec:\n");

    *pos += scnprintf(buf + *pos, len - *pos, "MAC entry num: %u\n",

@@ -XXX,XX +XXX,XX @@ hns3_dbg_dev_specs(struct hnae3_handle *h, char *buf, int len, int *pos)

             dev_specs->mc_mac_size);

    *pos += scnprintf(buf + *pos, len - *pos, "MAC statistics number: %u\n",

             dev_specs->mac_stats_num);

+    *pos += scnprintf(buf + *pos, len - *pos,

+             "TX timeout threshold: %d seconds\n",

+             dev->watchdog_timeo / HZ);

}

static int hns3_dbg_dev_info(struct hnae3_handle *h, char *buf, int len)

--

2.30.0

From: Hao Chen <chenhao418@huawei.com>

req1->tcam_data is defined as "u8 tcam_data[8]", and we convert it as

(u32 *) without considerring byte order conversion,

it may result in printing wrong data for tcam_data.

Convert tcam_data to (__le32 *) first to fix it.

Fixes: b5a0b70d77b9 ("net: hns3: refactor dump fd tcam of debugfs")

Signed-off-by: Hao Chen <chenhao418@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

.../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 14 +++++++-------

1 file 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 XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c

@@ -XXX,XX +XXX,XX @@ static int hclge_dbg_fd_tcam_read(struct hclge_dev *hdev, bool sel_x,

    struct hclge_desc desc[3];

    int pos = 0;

    int ret, i;

-    u32 *req;

+    __le32 *req;

    hclge_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_FD_TCAM_OP, true);

    desc[0].flag |= cpu_to_le16(HCLGE_COMM_CMD_FLAG_NEXT);

@@ -XXX,XX +XXX,XX @@ static int hclge_dbg_fd_tcam_read(struct hclge_dev *hdev, bool sel_x,

             tcam_msg.loc);

    /* tcam_data0 ~ tcam_data1 */

-    req = (u32 *)req1->tcam_data;

+    req = (__le32 *)req1->tcam_data;

    for (i = 0; i < 2; i++)

        pos += scnprintf(tcam_buf + pos, HCLGE_DBG_TCAM_BUF_SIZE - pos,

-                 "%08x\n", *req++);

+                 "%08x\n", le32_to_cpu(*req++));

    /* tcam_data2 ~ tcam_data7 */

-    req = (u32 *)req2->tcam_data;

+    req = (__le32 *)req2->tcam_data;

    for (i = 0; i < 6; i++)

        pos += scnprintf(tcam_buf + pos, HCLGE_DBG_TCAM_BUF_SIZE - pos,

-                 "%08x\n", *req++);

+                 "%08x\n", le32_to_cpu(*req++));

    /* tcam_data8 ~ tcam_data12 */

-    req = (u32 *)req3->tcam_data;

+    req = (__le32 *)req3->tcam_data;

    for (i = 0; i < 5; i++)

        pos += scnprintf(tcam_buf + pos, HCLGE_DBG_TCAM_BUF_SIZE - pos,

-                 "%08x\n", *req++);

+                 "%08x\n", le32_to_cpu(*req++));

    return ret;

}

--

2.30.0

From: Hao Chen <chenhao418@huawei.com>

Now in hns3_dbg_uninit(), there may be concurrency between

kfree buffer and read, it may result in memory error.

Moving debugfs_remove_recursive() in front of kfree buffer to ensure

they don't happen at the same time.

Fixes: 5e69ea7ee2a6 ("net: hns3: refactor the debugfs process")

Signed-off-by: Hao Chen <chenhao418@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

@@ -XXX,XX +XXX,XX @@ int hns3_dbg_init(struct hnae3_handle *handle)

    return 0;

out:

-    mutex_destroy(&handle->dbgfs_lock);

    debugfs_remove_recursive(handle->hnae3_dbgfs);

    handle->hnae3_dbgfs = NULL;

+    mutex_destroy(&handle->dbgfs_lock);

    return ret;

}

@@ -XXX,XX +XXX,XX @@ void hns3_dbg_uninit(struct hnae3_handle *handle)

{

    u32 i;

+    debugfs_remove_recursive(handle->hnae3_dbgfs);

+    handle->hnae3_dbgfs = NULL;

+

    for (i = 0; i < ARRAY_SIZE(hns3_dbg_cmd); i++)

        if (handle->dbgfs_buf[i]) {

            kvfree(handle->dbgfs_buf[i]);

@@ -XXX,XX +XXX,XX @@ void hns3_dbg_uninit(struct hnae3_handle *handle)

        }

    mutex_destroy(&handle->dbgfs_lock);

-    debugfs_remove_recursive(handle->hnae3_dbgfs);

-    handle->hnae3_dbgfs = NULL;

}

void hns3_dbg_register_debugfs(const char *debugfs_dir_name)

--

2.30.0

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ struct hnae3_tc_info {

    u8 max_tc; /* Total number of TCs */

    u8 num_tc; /* Total number of enabled TCs */

    bool mqprio_active;

+    bool dcb_ets_active;

};

#define HNAE3_MAX_DSCP            64

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c

@@ -XXX,XX +XXX,XX @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets)

    int ret;

    if (!(hdev->dcbx_cap & DCB_CAP_DCBX_VER_IEEE) ||

-     hdev->flag & HCLGE_FLAG_MQPRIO_ENABLE)

+     h->kinfo.tc_info.mqprio_active)

        return -EINVAL;

    ret = hclge_ets_validate(hdev, ets, &num_tc, &map_changed);

@@ -XXX,XX +XXX,XX @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets)

    }

    hclge_tm_schd_info_update(hdev, num_tc);

-    if (num_tc > 1)

-        hdev->flag |= HCLGE_FLAG_DCB_ENABLE;

-    else

-        hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;

+    h->kinfo.tc_info.dcb_ets_active = num_tc > 1;

    ret = hclge_ieee_ets_to_tm_info(hdev, ets);

    if (ret)

@@ -XXX,XX +XXX,XX @@ static u8 hclge_getdcbx(struct hnae3_handle *h)

    struct hclge_vport *vport = hclge_get_vport(h);

    struct hclge_dev *hdev = vport->back;

-    if (hdev->flag & HCLGE_FLAG_MQPRIO_ENABLE)

+    if (h->kinfo.tc_info.mqprio_active)

        return 0;

    return hdev->dcbx_cap;

@@ -XXX,XX +XXX,XX @@ static int hclge_setup_tc(struct hnae3_handle *h,

    if (!test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state))

        return -EBUSY;

-    if (hdev->flag & HCLGE_FLAG_DCB_ENABLE)

+    kinfo = &vport->nic.kinfo;

+    if (kinfo->tc_info.dcb_ets_active)

        return -EINVAL;

    ret = hclge_mqprio_qopt_check(hdev, mqprio_qopt);

@@ -XXX,XX +XXX,XX @@ static int hclge_setup_tc(struct hnae3_handle *h,

    if (ret)

        return ret;

-    kinfo = &vport->nic.kinfo;

    memcpy(&old_tc_info, &kinfo->tc_info, sizeof(old_tc_info));

    hclge_sync_mqprio_qopt(&kinfo->tc_info, mqprio_qopt);

    kinfo->tc_info.mqprio_active = tc > 0;

@@ -XXX,XX +XXX,XX @@ static int hclge_setup_tc(struct hnae3_handle *h,

    if (ret)

        goto err_out;

-    hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;

-

-    if (tc > 1)

-        hdev->flag |= HCLGE_FLAG_MQPRIO_ENABLE;

-    else

-        hdev->flag &= ~HCLGE_FLAG_MQPRIO_ENABLE;

-

    return hclge_notify_init_up(hdev);

err_out:

From: Yisen Zhuang <yisen.zhuang@huawei.com>

When sfp is absent or unidentified, the port type should be

displayed as PORT_OTHERS, rather than PORT_FIBRE.

Fixes: 88d10bd6f730 ("net: hns3: add support for multiple media type")

Signed-off-by: Yisen Zhuang <yisen.zhuang@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

@@ -XXX,XX +XXX,XX @@ static int hns3_get_link_ksettings(struct net_device *netdev,

        hns3_get_ksettings(h, cmd);

        break;

    case HNAE3_MEDIA_TYPE_FIBER:

-        if (module_type == HNAE3_MODULE_TYPE_CR)

+        if (module_type == HNAE3_MODULE_TYPE_UNKNOWN)

+            cmd->base.port = PORT_OTHER;

+        else if (module_type == HNAE3_MODULE_TYPE_CR)

            cmd->base.port = PORT_DA;

        else

            cmd->base.port = PORT_FIBRE;

--

2.30.0