diff --git a/0111-hikptool-hccs-Fix-the-usage-description.patch b/0111-hikptool-hccs-Fix-the-usage-description.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e9a006861f9a4132d21477a88e578c8ddb08d46 --- /dev/null +++ b/0111-hikptool-hccs-Fix-the-usage-description.patch @@ -0,0 +1,42 @@ +From c5330c4445ef85eaf98376e52e8b6d95f0281369 Mon Sep 17 00:00:00 2001 +From: Huisong Li +Date: Wed, 27 Aug 2025 15:21:14 +0800 +Subject: [PATCH 1/2] hikptool:hccs: Fix the usage description + +Fix the usage description to make it more readable. + +Signed-off-by: Huisong Li +--- + hccs/hikp_hccs.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/hccs/hikp_hccs.c b/hccs/hikp_hccs.c +index f6ef003..347f76b 100644 +--- a/hccs/hikp_hccs.c ++++ b/hccs/hikp_hccs.c +@@ -71,14 +71,16 @@ static int hikp_hccs_cmd_help(struct major_cmd_ctrl *self, const char *argv) + printf("\n %s\n", self->cmd_ptr->help_info); + printf("\n Options:\n\n"); + printf(" %s, %-25s %s\n", "-h", "--help", "display this help and exit"); +- printf(" %s, %-25s %s\n", "-c", "--chip_id=", "target chip"); +- printf(" %s, %-25s %s\n", "-d", "--die_id=", "target die"); +- printf(" %s, %-25s %s\n", "-p", "--port_id=", "target port"); ++ printf(" %s, %-25s %s\n", "-c", "--chip_id=", "target chip ID which is from 'X' in chipX"); ++ printf(" %s, %-25s %s\n", "-d", "--die_id=", "target die ID which is from 'Y' in dieY"); ++ printf(" %s, %-25s %s\n", "-p", "--port_id=", "target port ID which from 'Z' in hccsZ"); + printf(" %s\n", + "[-g/--get ]\n" +- " topo : get hccs_typo info, no target specified.\n" +- " fixed_attr : get fixed attributes for port specified by -c X -d X -p X.\n" +- " dfx_info : get dfx info for port specified by -c X -d X -p X.\n"); ++ " topo : get HCCS topology information, no target specified.\n" ++ " fixed_attr : get fixed attributes of one port specified by -c X -d Y -p Z.\n" ++ " dfx_info : get dfx info of one port specified by -c X -d Y -p Z.\n" ++ "\n" ++ " eg: hikptool hccs -g dfx_info -c 0 -d 2 -p 1\n"); + return 0; + } + +-- +2.34.1 + diff --git a/0112-hikptool-hccs-enable-HCCS-dfx-for-HIP11.patch b/0112-hikptool-hccs-enable-HCCS-dfx-for-HIP11.patch new file mode 100644 index 0000000000000000000000000000000000000000..152e1cecd3b12afb6c4abcb9fd93b519466bc3de --- /dev/null +++ b/0112-hikptool-hccs-enable-HCCS-dfx-for-HIP11.patch @@ -0,0 +1,25 @@ +From e62fbbf6a8a969f6c9d700b1471d9ab53167584c Mon Sep 17 00:00:00 2001 +From: Huisong Li +Date: Fri, 22 Aug 2025 11:56:49 +0800 +Subject: [PATCH 2/2] hikptool:hccs: enable HCCS dfx for HIP11 + +Signed-off-by: Huisong Li +--- + hikp_init_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hikp_init_main.c b/hikp_init_main.c +index 7b63e9b..acbed8c 100644 +--- a/hikp_init_main.c ++++ b/hikp_init_main.c +@@ -100,6 +100,7 @@ const struct cmd_list_info g_chip_hip09_hip10_cmd_list[] = { + + const struct cmd_list_info g_chip_hip11_cmd_list[] = { + {g_core_ring_cmd_list, HIKP_ARRAY_SIZE(g_core_ring_cmd_list)}, ++ {g_hccs_cmd_list, HIKP_ARRAY_SIZE(g_hccs_cmd_list)}, + {g_log_collect_cmd_list, HIKP_ARRAY_SIZE(g_log_collect_cmd_list)}, + {g_nic_cmd_list, HIKP_ARRAY_SIZE(g_nic_cmd_list)}, + {g_pcie_cmd_list, HIKP_ARRAY_SIZE(g_pcie_cmd_list)}, +-- +2.34.1 + diff --git a/hikptool.spec b/hikptool.spec index d206c407e5ec693d50da884fe9fdf80e85d4b7ea..3863b75334ddd11b9bd630717d477310ca06a0d7 100644 --- a/hikptool.spec +++ b/hikptool.spec @@ -3,7 +3,7 @@ Name: hikptool Summary: A userspace tool for Linux providing problem location on Kunpeng chips Version: 1.0.0 -Release: 24 +Release: 25 License: MulanPSL2 Source: %{name}-%{version}.tar.gz ExclusiveOS: linux @@ -126,6 +126,8 @@ Patch0107: 0107-hikptool-Optimize-the-ROCE-SCC-module-register-dump-.patch Patch0108: 0108-hikptool-solve-some-code-review-comments.patch Patch0109: 0109-hikptool-optimization-tool-help-information.patch Patch0110: 0110-hikptool-ras-do-some-cleanup-and-refactoring-of-rasd.patch +Patch0111: 0111-hikptool-hccs-Fix-the-usage-description.patch +Patch0112: 0112-hikptool-hccs-enable-HCCS-dfx-for-HIP11.patch %description This package contains the hikptool @@ -178,6 +180,9 @@ fi /sbin/ldconfig %changelog +* Wed Sep 24 2025 Huisong Li 1.0.0-25 +- hccs: support HCCS dfx for HIP11 + * Tue Sep 16 2025 Junhao He 1.0.0-24 - ras: do some cleanup and refactoring of rasdfx dump