From 05180b58318918e60f806764ddb912fc81247eeb Mon Sep 17 00:00:00 2001 From: veega2022 Date: Thu, 23 May 2024 23:14:01 +0800 Subject: [PATCH] hikptool: Add dfx reg of the ECAM for PCIE dump cmd The DFX register of the ECAM is added when the PCIe dumps registers Signed-off-by: veega2022 (cherry picked from commit 24ef5e839f9a6cbd324c1c88060be5e0b04ea45b) --- ...m-register-is-added-to-the-PCIe-dump.patch | 44 +++++++++++++++++++ hikptool.spec | 6 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0062-hikptool-The-ecam-register-is-added-to-the-PCIe-dump.patch diff --git a/0062-hikptool-The-ecam-register-is-added-to-the-PCIe-dump.patch b/0062-hikptool-The-ecam-register-is-added-to-the-PCIe-dump.patch new file mode 100644 index 0000000..991d717 --- /dev/null +++ b/0062-hikptool-The-ecam-register-is-added-to-the-PCIe-dump.patch @@ -0,0 +1,44 @@ +From 87b58805e41ccb47c313266e76219d9b0bb5f05e Mon Sep 17 00:00:00 2001 +From: m30045533 +Date: Mon, 20 May 2024 14:13:24 +0800 +Subject: [PATCH] hikptool: The ecam register is added to the PCIe dumpreg. + +The ecam register is added to facilitate fault locating. + +Updated the tool version to 1.1.2. + +Signed-off-by: m30045533 moubingquan@huawei.com +--- + pcie/func_lib/pcie_func/pcie_reg_dump.c | 2 ++ + tool_lib/tool_lib.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/pcie/func_lib/pcie_func/pcie_reg_dump.c b/pcie/func_lib/pcie_func/pcie_reg_dump.c +index b8c2241..535807c 100644 +--- a/pcie/func_lib/pcie_func/pcie_reg_dump.c ++++ b/pcie/func_lib/pcie_func/pcie_reg_dump.c +@@ -144,6 +144,8 @@ struct pcie_dumpreg_info g_reg_table_pcs[] = { + }; + + struct pcie_dumpreg_info g_reg_table_iob_tx[] = { ++ {0, "IOB_TX_ECAM_CONTROL0"}, ++ {0, "IOB_TX_ECAM_CONTROL1"}, + {0, "IOB_TX_ECAM_BASE_ADDR_L"}, + {0, "IOB_TX_ECAM_BASE_ADDR_H"}, + {0, "IOB_TX_CXL_BASE_BUS_0"}, +diff --git a/tool_lib/tool_lib.h b/tool_lib/tool_lib.h +index 72a99c6..644a08e 100644 +--- a/tool_lib/tool_lib.h ++++ b/tool_lib/tool_lib.h +@@ -18,7 +18,7 @@ + + #define TOOL_NAME "hikptool" + +-#define TOOL_VER "1.1.1" ++#define TOOL_VER "1.1.2" + + #define HI_GET_BITFIELD(value, start, mask) (((value) >> (start)) & (mask)) + #define HI_SET_FIELD(origin, shift, val) ((origin) |= (val) << (shift)) +-- +2.45.0.windows.1 + diff --git a/hikptool.spec b/hikptool.spec index 422705e..72c968d 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: 14 +Release: 15 License: MulanPSL2 Source: %{name}-%{version}.tar.gz ExclusiveOS: linux @@ -77,6 +77,7 @@ Patch0058: 0058-hikptool-The-nic_port-command-is-adapted-to-display-.patch Patch0059: 0059-hikptool-fix-cleancode-codecheck-alarm.patch Patch0060: 0060-hikptool-Delete-meaningless-printing.patch Patch0061: 0061-hikptool-Update-the-tool-version-number-to-1.1.1.patch +Patch0062: 0062-hikptool-The-ecam-register-is-added-to-the-PCIe-dump.patch %description This package contains the hikptool @@ -129,6 +130,9 @@ fi /sbin/ldconfig %changelog +* Thu May 23 2024 veega2022 1.0.0-15 +- Synchronize code, the DFX register of the ECAM is added when the PCIe dumps registers + * Wed Apr 24 2024 veega2022 1.0.0-14 - Synchronize code, fix some issues with ROH, PCIE and NIC modules -- Gitee