maillist inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICM2CV CVE: NA Reference: https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=196c36... ---------------------------------------------------------------------- The addresses of mac_addr_h and mac_addr_l are wrong, they need to be swapped. Signed-off-by: Donghua Huang <huangdonghua3@h-partners.com> --- ...in-pretty-print-of-ethtool-d-command.patch | 32 +++++++++++++++++++ ethtool.spec | 9 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ethtool-hibmcge-fix-wrong-register-address-in-pretty-print-of-ethtool-d-command.patch diff --git a/ethtool-hibmcge-fix-wrong-register-address-in-pretty-print-of-ethtool-d-command.patch b/ethtool-hibmcge-fix-wrong-register-address-in-pretty-print-of-ethtool-d-command.patch new file mode 100644 index 0000000..0ae9252 --- /dev/null +++ b/ethtool-hibmcge-fix-wrong-register-address-in-pretty-print-of-ethtool-d-command.patch @@ -0,0 +1,32 @@ +From 196c3609ad9b8ad7a675d36cb2c5672d12ef3293 Mon Sep 17 00:00:00 2001 +From: Jijie Shao <shaojijie@huawei.com> +Date: Mon, 16 Jun 2025 21:18:40 +0800 +Subject: ethtool: hibmcge: fix wrong register address in pretty print of + ethtool -d command + +The addresses of mac_addr_h and mac_addr_l are wrong, +they need to be swapped. + +Fixes: d89f6ee9c12a ("hibmcge: add support dump registers for hibmcge driver") +Signed-off-by: Jijie Shao <shaojijie@huawei.com> +--- + hibmcge.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hibmcge.c b/hibmcge.c +index 921efd2..ca81bc0 100644 +--- a/hibmcge.c ++++ b/hibmcge.c +@@ -36,8 +36,8 @@ static const struct hbg_offset_name_map hbg_spec_maps[] = { + {0x0004, "event_req"}, + {0x0008, "mac_id"}, + {0x000c, "phy_addr"}, +- {0x0010, "mac_addr_h"}, +- {0x0014, "mac_addr_l"}, ++ {0x0010, "mac_addr_l"}, ++ {0x0014, "mac_addr_h"}, + {0x0018, "uc_max_num"}, + {0x0024, "mdio_freq"}, + {0x0028, "max_mtu"}, +-- +cgit 1.2.3-korg \ No newline at end of file diff --git a/ethtool.spec b/ethtool.spec index fb2e3ca..4022bab 100644 --- a/ethtool.spec +++ b/ethtool.spec @@ -1,7 +1,7 @@ Name: ethtool Epoch: 2 Version: 6.6 -Release: 4 +Release: 5 Summary: Settings tool for Ethernet NICs License: GPL-2.0-only AND GPL-2.0-or-later URL: https://www.kernel.org/pub/software/network/ethtool @@ -10,6 +10,7 @@ Source0: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}. Patch0: netlink-fix-typo.patch patch1: ethtool-add-suppport-specifications-for-vxlan-by-eth.patch patch2: backport-ethtool-add-support-dump-registers-for-hibmcge-drive.patch +patch3: ethtool-hibmcge-fix-wrong-register-address-in-pretty.patch BuildRequires: gcc BuildRequires: libmnl-devel @@ -57,6 +58,12 @@ make check %{_mandir}/man8/%{name}.8* %changelog +* Mon Jul 14 2025 Donghua Huang <huangdonghua3@h-partners.com> - 2:6.6-5 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:fix wrong regs for hibmcge driver + * Wed Apr 16 2025 Hao Chen <chenhao418@huawei.com> - 2:6.6-4 - Type:bugfix - Id:NA -- 2.33.0