Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: util-li...@packages.debian.org, e...@debian.org
Control: affects -1 + src:util-linux
[ Reason ]
ema@ asked in #1085682 to improve reporting of ARM CPU core names in
lscpu for bookworm.
Just as background: on x86, /proc/cpuinfo provides CPU names etc, but on
ARM it doesn't; instead lscpu has lists in its source code.
[ Impact ]
This is improved hardware support. Without the change, running bookworm
on newer ARM(64) hosts will not show their CPU core name in lscpu
output.
[ Tests ]
ema@ picked the commits from upstream and tested it.
[ Risks ]
The commits are from upstream, have been in unstable for a while, and
they only add entries in lookup tables. IMO there is only a very small
risk for regressions.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Three patches from upstream. Each adds more CPU core names for ARM(64)
platforms.
[ Other info ]
Nothing I'm aware of.
Thanks for considering,
Chris
diff -Nru util-linux-2.38.1/debian/changelog util-linux-2.38.1/debian/changelog
--- util-linux-2.38.1/debian/changelog 2024-03-28 10:52:12.000000000 +0100
+++ util-linux-2.38.1/debian/changelog 2024-10-18 14:56:02.000000000 +0200
@@ -1,3 +1,12 @@
+util-linux (2.38.1-5+deb12u2) bookworm; urgency=medium
+
+ * Add the following upstream patches to identify new Arm cores:
+ - 0027-lscpu-Add-Neoverse-V2-Cortex-R82.patch
+ - 0028-lscpu-Add-2023-Cortex.patch
+ - 0029-lscpu-Add-Neoverse-V3-N3.patch
+
+ -- Emanuele Rocca <e...@debian.org> Fri, 18 Oct 2024 12:56:02 +0000
+
util-linux (2.38.1-5+deb12u1) bookworm-security; urgency=medium
* Add upstream patches to fix CVE-2024-28085 (Closes: #1067849)
diff -Nru util-linux-2.38.1/debian/patches/series
util-linux-2.38.1/debian/patches/series
--- util-linux-2.38.1/debian/patches/series 2024-03-28 10:52:12.000000000
+0100
+++ util-linux-2.38.1/debian/patches/series 2024-10-18 14:56:02.000000000
+0200
@@ -30,6 +30,9 @@
upstream/0024-fsck-Processes-may-kill-other-processes.patch
upstream/0025-libblkid-ntfs-avoid-UB-in-signed-shift.patch
upstream/0026-libblkid-iso9660-allocate-enough-space-for-UTF16-dec.patch
+upstream/0027-lscpu-Add-Neoverse-V2-Cortex-R82.patch
+upstream/0028-lscpu-Add-2023-Cortex.patch
+upstream/0029-lscpu-Add-Neoverse-V3-N3.patch
upstream/PATCH-rfkill-man-List-options-for-supported-device-types.patch
upstream/PATCH-1-2-lib-pty-Put-master-PTY-into-non-blocking-mode-a.patch
upstream/PATCH-2-2-lib-pty-minor-cleanups.patch
diff -Nru
util-linux-2.38.1/debian/patches/upstream/0027-lscpu-Add-Neoverse-V2-Cortex-R82.patch
util-linux-2.38.1/debian/patches/upstream/0027-lscpu-Add-Neoverse-V2-Cortex-R82.patch
---
util-linux-2.38.1/debian/patches/upstream/0027-lscpu-Add-Neoverse-V2-Cortex-R82.patch
1970-01-01 01:00:00.000000000 +0100
+++
util-linux-2.38.1/debian/patches/upstream/0027-lscpu-Add-Neoverse-V2-Cortex-R82.patch
2024-10-18 14:56:02.000000000 +0200
@@ -0,0 +1,29 @@
+From 6857cccbb4157d5da34ca98f77a0ac9d68e1e740 Mon Sep 17 00:00:00 2001
+From: ThomasKaiser <thomaskai...@users.noreply.github.com>
+Date: Sun, 22 Jan 2023 12:37:33 +0100
+Subject: [PATCH] Add missing ARM-cores
+
+https://github.com/ThomasKaiser/sbc-bench/commit/37332238c0a8b7c1555dca9d18a7c98362564416#diff-fdfd2a032c64d6e9ba92a3197cad6b26573c7094433d74efa4ae80f44f65aa99
+---
+ sys-utils/lscpu-arm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
+index 8357253c66c..f65b25ed66d 100644
+--- a/sys-utils/lscpu-arm.c
++++ b/sys-utils/lscpu-arm.c
+@@ -78,6 +78,7 @@ static const struct id_part arm_part[] = {
+ { 0xd0d, "Cortex-A77" },
+ { 0xd0e, "Cortex-A76AE" },
+ { 0xd13, "Cortex-R52" },
++ { 0xd15, "Cortex-R82" },
+ { 0xd20, "Cortex-M23" },
+ { 0xd21, "Cortex-M33" },
+ { 0xd40, "Neoverse-V1" },
+@@ -94,6 +95,7 @@ static const struct id_part arm_part[] = {
+ { 0xd4c, "Cortex-X1C" },
+ { 0xd4d, "Cortex-A715" },
+ { 0xd4e, "Cortex-X3" },
++ { 0xd4f, "Neoverse-V2" },
+ { -1, "unknown" },
+ };
diff -Nru
util-linux-2.38.1/debian/patches/upstream/0028-lscpu-Add-2023-Cortex.patch
util-linux-2.38.1/debian/patches/upstream/0028-lscpu-Add-2023-Cortex.patch
--- util-linux-2.38.1/debian/patches/upstream/0028-lscpu-Add-2023-Cortex.patch
1970-01-01 01:00:00.000000000 +0100
+++ util-linux-2.38.1/debian/patches/upstream/0028-lscpu-Add-2023-Cortex.patch
2024-10-18 14:56:02.000000000 +0200
@@ -0,0 +1,41 @@
+From 6112ade968cbe8728ca25fccdafdb1f9599424db Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.lin...@arm.com>
+Date: Wed, 26 Jul 2023 15:54:20 -0500
+Subject: [PATCH] lscpu: Even more Arm part numbers (early 2023)
+
+There have been further MIDR/part numbers published
+on https://developer.arm.com, they include:
+
+Cortex-X4, Cortex-A520, Cortex-A720, Cortex-M85,
+Cortex-M55 and Cortex-R52+.
+
+Signed-off-by: Jeremy Linton <jeremy.lin...@arm.com>
+---
+ sys-utils/lscpu-arm.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
+index d83e948b0d8..77959836873 100644
+--- a/sys-utils/lscpu-arm.c
++++ b/sys-utils/lscpu-arm.c
+@@ -79,8 +79,11 @@ static const struct id_part arm_part[] = {
+ { 0xd0e, "Cortex-A76AE" },
+ { 0xd13, "Cortex-R52" },
+ { 0xd15, "Cortex-R82" },
++ { 0xd16, "Cortex-R52+" },
+ { 0xd20, "Cortex-M23" },
+ { 0xd21, "Cortex-M33" },
++ { 0xd22, "Cortex-M55" },
++ { 0xd23, "Cortex-M85" },
+ { 0xd40, "Neoverse-V1" },
+ { 0xd41, "Cortex-A78" },
+ { 0xd42, "Cortex-A78AE" },
+@@ -96,6 +99,9 @@ static const struct id_part arm_part[] = {
+ { 0xd4d, "Cortex-A715" },
+ { 0xd4e, "Cortex-X3" },
+ { 0xd4f, "Neoverse-V2" },
++ { 0xd80, "Cortex-A520" },
++ { 0xd81, "Cortex-A720" },
++ { 0xd82, "Cortex-X4" },
+ { -1, "unknown" },
+ };
diff -Nru
util-linux-2.38.1/debian/patches/upstream/0029-lscpu-Add-Neoverse-V3-N3.patch
util-linux-2.38.1/debian/patches/upstream/0029-lscpu-Add-Neoverse-V3-N3.patch
---
util-linux-2.38.1/debian/patches/upstream/0029-lscpu-Add-Neoverse-V3-N3.patch
1970-01-01 01:00:00.000000000 +0100
+++
util-linux-2.38.1/debian/patches/upstream/0029-lscpu-Add-Neoverse-V3-N3.patch
2024-10-18 14:56:02.000000000 +0200
@@ -0,0 +1,22 @@
+From 7be163aa1657c4bd854bde84a83a8c5fcffd25dd Mon Sep 17 00:00:00 2001
+From: Thomas Kaiser <thomaskai...@users.noreply.github.com>
+Date: Mon, 26 Feb 2024 12:20:11 +0100
+Subject: [PATCH] Adding Neoverse-V3/-N3 ARM cores
+
+(cherry picked from commit c91694dd066d07c2ca7d68cbe212b2e1f893e942)
+---
+ sys-utils/lscpu-arm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c
+index 511ab281cd8..b9e8060a92f 100644
+--- a/sys-utils/lscpu-arm.c
++++ b/sys-utils/lscpu-arm.c
+@@ -93,6 +93,8 @@ static const struct id_part arm_part[] = {
+ { 0xd80, "Cortex-A520" },
+ { 0xd81, "Cortex-A720" },
+ { 0xd82, "Cortex-X4" },
++ { 0xd84, "Neoverse-V3" },
++ { 0xd8e, "Neoverse-N3" },
+ { -1, "unknown" },
+ };
