net: hns3: Add "manager table" information query function

This patch prints manager table information.

debugfs command:
echo dump mng tbl > cmd

Sample Command:
root@(none)# echo dump mng tbl > cmd
 entry|mac_addr         |mask|ether|mask|vlan|mask|i_map|i_dir|e_type
 00   |01:00:5e:00:00:01|0   |00000|0   |0000|0   |00   |00   |0
 01   |c2:f1:c5:82:68:17|0   |00000|0   |0000|0   |00   |00   |0
root@(none)#

Signed-off-by: liuzhongzhu <liuzhongzhu@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
index 9a026556df0e09f8794b3088a18bb79acf1f1ac5..4c5a421456b7e24f1f4e6f9f291948b5b17bf3c5 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
@@ -48,7 +48,7 @@ static int hns3_dbg_queue_info(struct hnae3_handle *h, char *cmd_buf)
                 * to prevent reference to invalid memory. And need to ensure
                 * that the following code is executed within 100ms.
                 */
-               if (test_bit(HNS3_NIC_STATE_INITED, &priv->state) ||
+               if (!test_bit(HNS3_NIC_STATE_INITED, &priv->state) ||
                    test_bit(HNS3_NIC_STATE_RESETTING, &priv->state))
                        return -EPERM;
 
@@ -210,6 +210,7 @@ static void hns3_dbg_help(struct hnae3_handle *h)
        dev_info(&h->pdev->dev, "dump qos pause cfg\n");
        dev_info(&h->pdev->dev, "dump qos pri map\n");
        dev_info(&h->pdev->dev, "dump qos buf cfg\n");
+       dev_info(&h->pdev->dev, "dump mng tbl\n");
 }
 
 static ssize_t hns3_dbg_cmd_read(struct file *filp, char __user *buffer,
@@ -254,7 +255,7 @@ static ssize_t hns3_dbg_cmd_write(struct file *filp, const char __user *buffer,
                return 0;
 
        /* Judge if the instance is being reset. */
-       if (test_bit(HNS3_NIC_STATE_INITED, &priv->state) ||
+       if (!test_bit(HNS3_NIC_STATE_INITED, &priv->state) ||
            test_bit(HNS3_NIC_STATE_RESETTING, &priv->state))
                return 0;
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
index b1ee6feb0caf319325ce4e324496c64dc236cfe6..dcacfa089b742f203243fcd01acad5f251fa5557 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
@@ -237,6 +237,7 @@ enum hclge_opcode_type {
        HCLGE_TM_QCN_MEM_INT_CFG        = 0x1A14,
        HCLGE_PPP_CMD0_INT_CMD          = 0x2100,
        HCLGE_PPP_CMD1_INT_CMD          = 0x2101,
+       HCLGE_MAC_ETHERTYPE_IDX_RD      = 0x2105,
        HCLGE_NCSI_INT_EN               = 0x2401,
 };
 
@@ -744,6 +745,24 @@ struct hclge_cfg_tx_queue_pointer_cmd {
        u8 rsv[14];
 };
 
+#pragma pack(1)
+struct hclge_mac_ethertype_idx_rd_cmd {
+       u8      flags;
+       u8      resp_code;
+       __le16  vlan_tag;
+       u8      mac_add[6];
+       __le16  index;
+       __le16  ethter_type;
+       __le16  egress_port;
+       __le16  egress_queue;
+       __le16  rev0;
+       u8      i_port_bitmap;
+       u8      i_port_direction;
+       u8      rev1[2];
+};
+
+#pragma pack()
+
 #define HCLGE_TSO_MSS_MIN_S    0
 #define HCLGE_TSO_MSS_MIN_M    GENMASK(13, 0)
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index 14577bbf3e115eaa4eb527f0128daa96ddec241b..77a11618040d973e5fe6baff4f00cabcf28d3aa1 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -407,6 +407,70 @@ err_qos_cmd_send:
                "dump qos buf cfg fail(0x%x), status is %d\n", cmd, ret);
 }
 
+static void hclge_dbg_dump_mng_table(struct hclge_dev *hdev)
+{
+       struct hclge_mac_ethertype_idx_rd_cmd *req0;
+       char printf_buf[HCLGE_DBG_BUF_LEN];
+       struct hclge_desc desc;
+       int ret, i;
+
+       dev_info(&hdev->pdev->dev, "mng tab:\n");
+       memset(printf_buf, 0, HCLGE_DBG_BUF_LEN);
+       strncat(printf_buf,
+               "entry|mac_addr         |mask|ether|mask|vlan|mask",
+               HCLGE_DBG_BUF_LEN - 1);
+       strncat(printf_buf + strlen(printf_buf),
+               "|i_map|i_dir|e_type|pf_id|vf_id|q_id|drop\n",
+               HCLGE_DBG_BUF_LEN - strlen(printf_buf) - 1);
+
+       dev_info(&hdev->pdev->dev, "%s", printf_buf);
+
+       for (i = 0; i < HCLGE_DBG_MNG_TBL_MAX; i++) {
+               hclge_cmd_setup_basic_desc(&desc, HCLGE_MAC_ETHERTYPE_IDX_RD,
+                                          true);
+               req0 = (struct hclge_mac_ethertype_idx_rd_cmd *)&desc.data;
+               req0->index = cpu_to_le16(i);
+
+               ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+               if (ret) {
+                       dev_err(&hdev->pdev->dev,
+                               "call hclge_cmd_send fail, ret = %d\n", ret);
+                       return;
+               }
+
+               if (!req0->resp_code)
+                       continue;
+
+               memset(printf_buf, 0, HCLGE_DBG_BUF_LEN);
+               snprintf(printf_buf, HCLGE_DBG_BUF_LEN,
+                        "%02u   |%02x:%02x:%02x:%02x:%02x:%02x|",
+                        req0->index, req0->mac_add[0], req0->mac_add[1],
+                        req0->mac_add[2], req0->mac_add[3], req0->mac_add[4],
+                        req0->mac_add[5]);
+
+               snprintf(printf_buf + strlen(printf_buf),
+                        HCLGE_DBG_BUF_LEN - strlen(printf_buf),
+                        "%x   |%04x |%x   |%04x|%x   |%02x   |%02x   |",
+                        !!(req0->flags & HCLGE_DBG_MNG_MAC_MASK_B),
+                        req0->ethter_type,
+                        !!(req0->flags & HCLGE_DBG_MNG_ETHER_MASK_B),
+                        req0->vlan_tag & HCLGE_DBG_MNG_VLAN_TAG,
+                        !!(req0->flags & HCLGE_DBG_MNG_VLAN_MASK_B),
+                        req0->i_port_bitmap, req0->i_port_direction);
+
+               snprintf(printf_buf + strlen(printf_buf),
+                        HCLGE_DBG_BUF_LEN - strlen(printf_buf),
+                        "%d     |%d    |%02d   |%04d|%x\n",
+                        !!(req0->egress_port & HCLGE_DBG_MNG_E_TYPE_B),
+                        req0->egress_port & HCLGE_DBG_MNG_PF_ID,
+                        (req0->egress_port >> 3) & HCLGE_DBG_MNG_VF_ID,
+                        req0->egress_queue,
+                        !!(req0->egress_port & HCLGE_DBG_MNG_DROP_B));
+
+               dev_info(&hdev->pdev->dev, "%s", printf_buf);
+       }
+}
+
 static void hclge_dbg_fd_tcam_read(struct hclge_dev *hdev, u8 stage,
                                   bool sel_x, u32 loc)
 {
@@ -478,6 +542,8 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, char *cmd_buf)
                hclge_dbg_dump_qos_pri_map(hdev);
        } else if (strncmp(cmd_buf, "dump qos buf cfg", 16) == 0) {
                hclge_dbg_dump_qos_buf_cfg(hdev);
+       } else if (strncmp(cmd_buf, "dump mng tbl", 12) == 0) {
+               hclge_dbg_dump_mng_table(hdev);
        } else {
                dev_info(&hdev->pdev->dev, "unknown command\n");
                return -EINVAL;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
index 50fd0b15fb8e4fbb4b4099b63169945f33afcfbf..6097cd8580814d32a5917fa92dbb463d0a83626d 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
@@ -4,6 +4,18 @@
 #ifndef __HCLGE_DEBUGFS_H
 #define __HCLGE_DEBUGFS_H
 
+#define HCLGE_DBG_BUF_LEN         256
+#define HCLGE_DBG_MNG_TBL_MAX     64
+
+#define HCLGE_DBG_MNG_VLAN_MASK_B  BIT(0)
+#define HCLGE_DBG_MNG_MAC_MASK_B   BIT(1)
+#define HCLGE_DBG_MNG_ETHER_MASK_B BIT(2)
+#define HCLGE_DBG_MNG_E_TYPE_B    BIT(11)
+#define HCLGE_DBG_MNG_DROP_B      BIT(13)
+#define HCLGE_DBG_MNG_VLAN_TAG    0x0FFF
+#define HCLGE_DBG_MNG_PF_ID       0x0007
+#define HCLGE_DBG_MNG_VF_ID       0x00FF
+
 #pragma pack(1)
 
 struct hclge_qos_pri_map_cmd {