@@ -211,6 +211,7 @@ static void hns3_dbg_help(struct hnae3_handle *h)
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 mac tbl\n");
+ dev_info(&h->pdev->dev, "dump port vlan tbl\n");
}
static ssize_t hns3_dbg_cmd_read(struct file *filp, char __user *buffer,
@@ -530,6 +530,84 @@ static void hclge_dbg_dump_mac_table(struct hclge_dev *hdev)
kfree(mc_mac_tbl);
}
+static void hclge_dbg_dump_port_vlan_table(struct hclge_dev *hdev)
+{
+ struct hclge_vlan_filter_pf_cfg_cmd *req;
+ char printf_buf[HCLGE_DBG_BUF_LEN];
+ struct hclge_desc desc;
+ u32 *vlan_bitmap;
+ u8 vlan_byte_val;
+ u8 vlan_offset;
+ u8 vlan_byte;
+ int vlan_len;
+ u32 vlan_id;
+ int ret, i;
+ bool flag;
+
+ vlan_len = HCLGE_DBG_VLAN_ID_MAX / 8;
+ vlan_bitmap = kzalloc(vlan_len, GFP_KERNEL);
+ if (!vlan_bitmap) {
+ dev_err(&hdev->pdev->dev,
+ "port vlan table alloc memory failed\n");
+ return;
+ }
+
+ for (vlan_id = 0; vlan_id < HCLGE_DBG_VLAN_ID_MAX; vlan_id++) {
+ /* Prevent long-term occupation of the command channel. */
+ if ((vlan_id % 100) == 0)
+ msleep(100);
+
+ hclge_cmd_setup_basic_desc(&desc,
+ HCLGE_OPC_VLAN_FILTER_PF_CFG, true);
+
+ vlan_offset = vlan_id / 160;
+ vlan_byte = (vlan_id % 160) / 8;
+ vlan_byte_val = 1 << (vlan_id % 8);
+
+ req = (struct hclge_vlan_filter_pf_cfg_cmd *)desc.data;
+ req->vlan_offset = vlan_offset;
+ req->vlan_offset_bitmap[vlan_byte] = vlan_byte_val;
+
+ ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+ if (ret) {
+ dev_err(&hdev->pdev->dev,
+ "call hclge_cmd_send fail, ret = %d\n", ret);
+ kfree(vlan_bitmap);
+ return;
+ }
+
+ if (req->vlan_cfg != 0)
+ continue;
+
+ vlan_bitmap[(u32)(vlan_id / 32)] |= 1 << (vlan_id % 32);
+ }
+
+ dev_info(&hdev->pdev->dev, "vlan | port filter bitMap:\n");
+
+ for (vlan_id = 0; vlan_id < HCLGE_DBG_VLAN_ID_MAX / 32;
+ vlan_id += 8) {
+ memset(printf_buf, 0, HCLGE_DBG_BUF_LEN);
+ snprintf(printf_buf, HCLGE_DBG_BUF_LEN,
+ "%04d | ", vlan_id * 32);
+ flag = false;
+
+ for (i = 7; i >= 0; i--) {
+ snprintf(printf_buf + strlen(printf_buf),
+ HCLGE_DBG_BUF_LEN - strlen(printf_buf),
+ "%08x:", vlan_bitmap[(u32)(vlan_id + i)]);
+
+ if (vlan_bitmap[(u32)(vlan_id + i)] > 0)
+ flag = true;
+ }
+
+ printf_buf[strlen(printf_buf) - 1] = '\n';
+ if (flag)
+ dev_info(&hdev->pdev->dev, "%s", printf_buf);
+ }
+
+ kfree(vlan_bitmap);
+}
+
static void hclge_dbg_fd_tcam_read(struct hclge_dev *hdev, u8 stage,
bool sel_x, u32 loc)
{
@@ -603,6 +681,8 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, char *cmd_buf)
hclge_dbg_dump_qos_buf_cfg(hdev);
} else if (strncmp(cmd_buf, "dump mac tbl", 12) == 0) {
hclge_dbg_dump_mac_table(hdev);
+ } else if (strncmp(cmd_buf, "dump port vlan tbl", 18) == 0) {
+ hclge_dbg_dump_port_vlan_table(hdev);
} else {
dev_info(&hdev->pdev->dev, "unknown command\n");
return -EINVAL;
@@ -14,6 +14,9 @@
#define HCLGE_DBG_MAC_TBL_E_PORT 0x3FF
#define HCLGE_DBG_MAC_TBL_E_PORT_B BIT(11)
+#define HCLGE_DBG_VLAN_ID_MAX 4096
+#define HCLGE_DBG_MNG_TBL_MAX 64
+
#pragma pack(1)
struct hclge_qos_pri_map_cmd {