代码拉取完成，页面将自动刷新
From 8b3b68347165b602cded484d090509426f88cc75 Mon Sep 17 00:00:00 2001
From: Junxian Huang <huangjunxian6@hisilicon.com>
Date: Mon, 31 Jul 2023 21:19:46 +0800
Subject: hikptool/roce: Add a common frame for hikptool roce register query
Add a common frame for hikptool roce register query.
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
---
net/roce/roce_caep/hikp_roce_caep.h | 2 +-
.../roce_ext_common/hikp_roce_ext_common.c | 178 ++++++++++++++++++
.../roce_ext_common/hikp_roce_ext_common.h | 52 +++++
net/roce/roce_gmv/hikp_roce_gmv.h | 2 +-
net/roce/roce_mdb/hikp_roce_mdb.h | 2 +-
net/roce/roce_pkt/hikp_roce_pkt.h | 2 +-
net/roce/roce_qmm/hikp_roce_qmm.h | 2 +-
net/roce/roce_scc/hikp_roce_scc.h | 2 +-
net/roce/roce_timer/hikp_roce_timer.h | 2 +-
net/roce/roce_trp/hikp_roce_trp.h | 2 +-
net/roce/roce_tsp/hikp_roce_tsp.h | 2 +-
11 files changed, 239 insertions(+), 9 deletions(-)
create mode 100644 net/roce/roce_ext_common/hikp_roce_ext_common.c
create mode 100644 net/roce/roce_ext_common/hikp_roce_ext_common.h
diff --git a/net/roce/roce_caep/hikp_roce_caep.h b/net/roce/roce_caep/hikp_roce_caep.h
index 3c494b1..804d2df 100644
--- a/net/roce/roce_caep/hikp_roce_caep.h
+++ b/net/roce/roce_caep/hikp_roce_caep.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_CAEP_H__
#define __HIKP_ROCE_CAEP_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_CAEP_REG_NUM 29
#define PER_REG_NUM 2
diff --git a/net/roce/roce_ext_common/hikp_roce_ext_common.c b/net/roce/roce_ext_common/hikp_roce_ext_common.c
new file mode 100644
index 0000000..ec47dce
--- /dev/null
+++ b/net/roce/roce_ext_common/hikp_roce_ext_common.c
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2023 Hisilicon Technologies Co., Ltd.
+ * Hikptool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *
+ * See the Mulan PSL v2 for more details.
+ */
+
+#include "hikp_roce_ext_common.h"
+
+static void hikp_roce_ext_reg_data_free(struct reg_data *reg)
+{
+ if (reg->offset)
+ free(reg->offset);
+
+ if (reg->data)
+ free(reg->data);
+}
+
+static void hikp_roce_ext_cmd_ret_free(struct hikp_cmd_ret *cmd_ret)
+{
+ if (cmd_ret)
+ free(cmd_ret);
+}
+
+static const struct cmd_type_info {
+ enum roce_cmd_type cmd_type;
+ const char *cmd_name;
+ uint8_t reg_array_length;
+} cmd_info_table[] = {
+ {GET_ROCEE_MDB_CMD, "MDB", ROCE_HIKP_MDB_REG_NUM_EXT},
+ {GET_ROCEE_GMV_CMD, "GMV", ROCE_HIKP_GMV_REG_NUM_EXT},
+ {GET_ROCEE_CAEP_CMD, "CAEP", ROCE_HIKP_CAEP_REG_NUM_EXT},
+ {GET_ROCEE_PKT_CMD, "PKT", ROCE_HIKP_PKT_REG_NUM_EXT},
+ {GET_ROCEE_SCC_CMD, "SCC", ROCE_HIKP_SCC_REG_NUM_EXT},
+ {GET_ROCEE_QMM_CMD, "QMM", ROCE_HIKP_QMM_REG_NUM_EXT},
+ {GET_ROCEE_TIMER_CMD, "TIMER", ROCE_HIKP_TIMER_REG_NUM_EXT},
+ {GET_ROCEE_TRP_CMD, "TRP", ROCE_HIKP_TRP_REG_NUM_EXT},
+ {GET_ROCEE_TSP_CMD, "TSP", ROCE_HIKP_TSP_REG_NUM_EXT},
+};
+
+static int get_cmd_info_table_idx(enum roce_cmd_type cmd_type)
+{
+ int array_size = sizeof(cmd_info_table) / sizeof(struct cmd_type_info);
+ int i;
+
+ for (i = 0; i < array_size; i++)
+ if (cmd_type == cmd_info_table[i].cmd_type)
+ return i;
+
+ return -ENOENT;
+}
+
+static const char *get_cmd_name(enum roce_cmd_type cmd_type)
+{
+ int idx;
+
+ idx = get_cmd_info_table_idx(cmd_type);
+ if (idx >= 0)
+ return cmd_info_table[idx].cmd_name;
+
+ printf("Failed to get cmd name, cmd_type = %d\n", cmd_type);
+ return NULL;
+}
+
+static int get_cmd_reg_array_length(enum roce_cmd_type cmd_type)
+{
+ int idx;
+
+ idx = get_cmd_info_table_idx(cmd_type);
+ if (idx >= 0)
+ return cmd_info_table[idx].reg_array_length;
+
+ printf("Failed to get cmd reg array length, cmd_type = %d\n", cmd_type);
+ return idx;
+}
+
+static int hikp_roce_ext_get_res(enum roce_cmd_type cmd_type,
+ uint32_t block_id,
+ struct roce_ext_head *res_head,
+ struct reg_data *reg,
+ int (*get_data)(struct hikp_cmd_ret **cmd_ret,
+ uint32_t block_id))
+{
+ int reg_array_length = get_cmd_reg_array_length(cmd_type);
+ const char *cmd_name = get_cmd_name(cmd_type);
+ struct roce_ext_res_param *roce_ext_res;
+ struct hikp_cmd_ret *cmd_ret;
+ size_t max_size;
+ size_t cur_size;
+ int ret;
+
+ /* reg_array_length greater than or equal to 0 ensures that cmd_name
+ * is not NULL, so cmd_name does not need to be checked.
+ */
+ if (reg_array_length < 0)
+ return reg_array_length;
+
+ ret = get_data(&cmd_ret, block_id);
+ if (ret) {
+ printf("hikptool roce_%s get data failed!\n", cmd_name);
+ goto get_data_error;
+ }
+
+ roce_ext_res = (struct roce_ext_res_param *)cmd_ret->rsp_data;
+ *res_head = roce_ext_res->head;
+ max_size = res_head->total_block_num * sizeof(uint32_t);
+
+ if (block_id == 0) {
+ reg->offset = (uint32_t *)malloc(max_size);
+ reg->data = (uint32_t *)malloc(max_size);
+ if ((reg->offset == NULL) || (reg->data == NULL)) {
+ printf("hikptool roce_%s alloc log memmory 0x%x failed!\n",
+ cmd_name, max_size);
+ ret = -ENOMEM;
+ hikp_roce_ext_reg_data_free(reg);
+ goto get_data_error;
+ }
+ }
+
+ cur_size = res_head->cur_block_num * sizeof(uint32_t);
+ if (cur_size > max_size) {
+ printf("hikptool roce_%s log data copy size error, data size: 0x%x, max size: 0x%x\n",
+ cmd_name, cur_size, max_size);
+ ret = -EINVAL;
+ hikp_roce_ext_reg_data_free(reg);
+ goto get_data_error;
+ }
+
+ memcpy(reg->offset + block_id,
+ (uint32_t *)&roce_ext_res->reg_data, cur_size);
+ memcpy(reg->data + block_id,
+ (uint32_t *)&roce_ext_res->reg_data + reg_array_length, cur_size);
+
+get_data_error:
+ hikp_roce_ext_cmd_ret_free(cmd_ret);
+ return ret;
+}
+
+static void hikp_roce_ext_print(const char *cmd_name, uint32_t total_block_num,
+ const uint32_t *offset, const uint32_t *data)
+{
+ int i;
+
+ printf("**************%s INFO*************\n", cmd_name);
+ for (i = 0; i < total_block_num; i++)
+ printf("[0x%08X] : 0x%08X\n", offset[i], data[i]);
+ printf("************************************\n");
+}
+
+void hikp_roce_ext_execute(struct major_cmd_ctrl *self,
+ enum roce_cmd_type cmd_type,
+ int (*get_data)(struct hikp_cmd_ret **cmd_ret,
+ uint32_t block_id))
+{
+ uint32_t queried_block_id = 0;
+ struct roce_ext_head res_head;
+ struct reg_data reg = { 0 };
+
+ do {
+ self->err_no = hikp_roce_ext_get_res(cmd_type, queried_block_id,
+ &res_head, ®, get_data);
+ if (self->err_no)
+ return;
+
+ queried_block_id += res_head.cur_block_num;
+ } while (queried_block_id < res_head.total_block_num);
+
+ hikp_roce_ext_print(get_cmd_name(cmd_type), res_head.total_block_num,
+ reg.offset, reg.data);
+
+ hikp_roce_ext_reg_data_free(®);
+}
diff --git a/net/roce/roce_ext_common/hikp_roce_ext_common.h b/net/roce/roce_ext_common/hikp_roce_ext_common.h
new file mode 100644
index 0000000..1e8063d
--- /dev/null
+++ b/net/roce/roce_ext_common/hikp_roce_ext_common.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023 Hisilicon Technologies Co., Ltd.
+ * Hikptool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *
+ * See the Mulan PSL v2 for more details.
+ */
+
+#ifndef __HIKP_ROCE_EXT_COMMON_H__
+#define __HIKP_ROCE_EXT_COMMON_H__
+
+#include "hikp_net_lib.h"
+
+#define ROCE_MAX_REG_NUM (NET_MAX_REQ_DATA_NUM - 1)
+
+#define ROCE_HIKP_CAEP_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_GMV_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_MDB_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_PKT_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_QMM_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_SCC_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_TIMER_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_TRP_REG_NUM_EXT ROCE_MAX_REG_NUM
+#define ROCE_HIKP_TSP_REG_NUM_EXT ROCE_MAX_REG_NUM
+
+struct roce_ext_head {
+ uint8_t total_block_num;
+ uint8_t cur_block_num;
+ uint16_t reserved;
+};
+
+struct roce_ext_res_param {
+ struct roce_ext_head head;
+ uint32_t reg_data[0];
+};
+
+struct reg_data {
+ uint32_t *offset;
+ uint32_t *data;
+};
+
+void hikp_roce_ext_execute(struct major_cmd_ctrl *self,
+ enum roce_cmd_type cmd_type,
+ int (*get_data)(struct hikp_cmd_ret **cmd_ret,
+ uint32_t block_id));
+
+#endif /* __HIKP_ROCE_EXT_COMMON_H__ */
diff --git a/net/roce/roce_gmv/hikp_roce_gmv.h b/net/roce/roce_gmv/hikp_roce_gmv.h
index 30f37fb..1ef5b93 100644
--- a/net/roce/roce_gmv/hikp_roce_gmv.h
+++ b/net/roce/roce_gmv/hikp_roce_gmv.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_GMV_H__
#define __HIKP_ROCE_GMV_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_GMV_REG_NUM 7
#define ROCE_HIKP_GMV_REG_SWICTH 2
diff --git a/net/roce/roce_mdb/hikp_roce_mdb.h b/net/roce/roce_mdb/hikp_roce_mdb.h
index 8e7da03..7643dff 100644
--- a/net/roce/roce_mdb/hikp_roce_mdb.h
+++ b/net/roce/roce_mdb/hikp_roce_mdb.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_MDB_H__
#define __HIKP_ROCE_MDB_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_MDB_REG_NUM 22
#define ROCE_HIKP_REG_SWICTH 2
diff --git a/net/roce/roce_pkt/hikp_roce_pkt.h b/net/roce/roce_pkt/hikp_roce_pkt.h
index 5f438b7..0200c44 100644
--- a/net/roce/roce_pkt/hikp_roce_pkt.h
+++ b/net/roce/roce_pkt/hikp_roce_pkt.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_PKT_H__
#define __HIKP_ROCE_PKT_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_PKT_REG_NUM 29
#define PKT_PER_REG_NUM 2
diff --git a/net/roce/roce_qmm/hikp_roce_qmm.h b/net/roce/roce_qmm/hikp_roce_qmm.h
index 08cb5d2..0645ab3 100644
--- a/net/roce/roce_qmm/hikp_roce_qmm.h
+++ b/net/roce/roce_qmm/hikp_roce_qmm.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_QMM_H__
#define __HIKP_ROCE_QMM_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_QMM_REG_NUM 36
#define QMM_BANK_NUM 0x7
diff --git a/net/roce/roce_scc/hikp_roce_scc.h b/net/roce/roce_scc/hikp_roce_scc.h
index de8772e..5d37a11 100644
--- a/net/roce/roce_scc/hikp_roce_scc.h
+++ b/net/roce/roce_scc/hikp_roce_scc.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_SCC_H__
#define __HIKP_ROCE_SCC_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_SCC_REG_NUM 29
#define MAX_SCC_MODULE_NAME_LEN 20
diff --git a/net/roce/roce_timer/hikp_roce_timer.h b/net/roce/roce_timer/hikp_roce_timer.h
index a4a32b1..7f7deb6 100644
--- a/net/roce/roce_timer/hikp_roce_timer.h
+++ b/net/roce/roce_timer/hikp_roce_timer.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_TIMER_H__
#define __HIKP_ROCE_TIMER_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_TIMER_REG_NUM 25
#define ROCE_TIMER_CMD_CLEAR (1 << 0)
diff --git a/net/roce/roce_trp/hikp_roce_trp.h b/net/roce/roce_trp/hikp_roce_trp.h
index 80d28af..97f1838 100644
--- a/net/roce/roce_trp/hikp_roce_trp.h
+++ b/net/roce/roce_trp/hikp_roce_trp.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_TRP_H__
#define __HIKP_ROCE_TRP_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define TRP_DIV_NUM_T 4
#define ROCE_HIKP_TRP_REG_NUM 29
diff --git a/net/roce/roce_tsp/hikp_roce_tsp.h b/net/roce/roce_tsp/hikp_roce_tsp.h
index ae864ba..43d0d0d 100644
--- a/net/roce/roce_tsp/hikp_roce_tsp.h
+++ b/net/roce/roce_tsp/hikp_roce_tsp.h
@@ -14,7 +14,7 @@
#ifndef __HIKP_ROCE_TSP_H__
#define __HIKP_ROCE_TSP_H__
-#include "hikp_net_lib.h"
+#include "hikp_roce_ext_common.h"
#define ROCE_HIKP_TSP_REG_NUM 29
#define TSP_PER_REG_NUM 2
--
2.30.0
此处可能存在不合适展示的内容，页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容，可点击提交进行申诉，我们将尽快为您处理。
马建仓 AI 助手