diff --git a/0013-Support-new-byte-value-of-Processor-Upgrade-field-fr.patch b/0013-Support-new-byte-value-of-Processor-Upgrade-field-fr.patch new file mode 100644 index 0000000000000000000000000000000000000000..7d3ff47f02f7d5ba9510965bc06fa416226d8479 --- /dev/null +++ b/0013-Support-new-byte-value-of-Processor-Upgrade-field-fr.patch @@ -0,0 +1,31 @@ +From 6dceb9b4df4eb4d866bfe2f0de7f92f4e4ad891d Mon Sep 17 00:00:00 2001 +From: wangkaiqiang +Date: Wed, 8 May 2024 17:16:53 +0800 +Subject: [PATCH] Support new byte value of Processor Upgrade field from SMBIOS + 3.5. + +--- + dmidecode.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 202c9bc..54dd69b 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -1358,10 +1358,11 @@ static const char *dmi_processor_upgrade(u8 code) + "Socket BGA1510", + "Socket BGA1528", + "Socket LGA4189", +- "Socket LGA1200" /* 0x3E */ ++ "Socket LGA1200", ++ "Socket LGA4677" /* 0x3F */ + }; + +- if (code >= 0x01 && code <= 0x3E) ++ if (code >= 0x01 && code <= 0x3F) + return upgrade[code - 0x01]; + return out_of_spec; + } +-- +2.31.1 + diff --git a/0014-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch b/0014-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..60e3026fd4f343a51007916e630290975ee75ead --- /dev/null +++ b/0014-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch @@ -0,0 +1,65 @@ +From 9524ba91157444f15f587347700550cc4cd7436c Mon Sep 17 00:00:00 2001 +From: wangkaiqiang +Date: Wed, 8 May 2024 17:12:47 +0800 +Subject: [PATCH 2/3] dmidecode: Add processor support from SMBIOS 3.6.0 + +--- + dmidecode.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 54dd69b..0c6382d 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -967,6 +967,7 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver) + + { 0x100, "ARMv7" }, + { 0x101, "ARMv8" }, ++ { 0x102, "ARMv9" }, + { 0x104, "SH-3" }, + { 0x105, "SH-4" }, + { 0x118, "ARM" }, +@@ -1124,7 +1125,7 @@ static void dmi_processor_id(const struct dmi_header *h) + return; + } + } +- else if ((type >= 0x100 && type <= 0x101) /* ARM */ ++ else if ((type >= 0x100 && type <= 0x102) /* ARM */ + || (type >= 0x118 && type <= 0x119)) /* ARM */ + { + u32 midr = DWORD(p); +@@ -1359,10 +1360,19 @@ static const char *dmi_processor_upgrade(u8 code) + "Socket BGA1528", + "Socket LGA4189", + "Socket LGA1200", +- "Socket LGA4677" /* 0x3F */ ++ "Socket LGA4677", ++ "Socket LGA1700", ++ "Socket BGA1744", ++ "Socket BGA1781", ++ "Socket BGA1211", ++ "Socket BGA2422", ++ "Socket LGA1211", ++ "Socket LGA2422", ++ "Socket LGA5773", ++ "Socket BGA5773" /* 0x48 */ + }; + +- if (code >= 0x01 && code <= 0x3F) ++ if (code >= 0x01 && code <= 0x48) + return upgrade[code - 0x01]; + return out_of_spec; + } +@@ -4311,6 +4321,9 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) + pr_attr("Thread Count", "%u", + h->length >= 0x30 && data[0x25] == 0xFF ? + WORD(data + 0x2E) : data[0x25]); ++ if (h->length >= 0x32 && WORD(data + 0x30) != 0) ++ pr_attr("Thread Enabled", "%u", ++ WORD(data + 0x30)); + dmi_processor_characteristics("Characteristics", + WORD(data + 0x26)); + break; +-- +2.31.1 + diff --git a/0015-dmidecode-Expand-list-of-recognized-CPU-sockets.patch b/0015-dmidecode-Expand-list-of-recognized-CPU-sockets.patch new file mode 100644 index 0000000000000000000000000000000000000000..a8ad23c28aa12f20870a7e5c05cdd51ef9ed3c2d --- /dev/null +++ b/0015-dmidecode-Expand-list-of-recognized-CPU-sockets.patch @@ -0,0 +1,37 @@ +From 8507ddc337130465df62ee0ca9d9f6e8f5ed0efc Mon Sep 17 00:00:00 2001 +From: wangkaiqiang +Date: Wed, 8 May 2024 17:14:20 +0800 +Subject: [PATCH 3/3] dmidecode: Expand list of recognized CPU sockets + +--- + dmidecode.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 0c6382d..4b2f6d2 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -1369,10 +1369,18 @@ static const char *dmi_processor_upgrade(u8 code) + "Socket LGA1211", + "Socket LGA2422", + "Socket LGA5773", +- "Socket BGA5773" /* 0x48 */ ++ "Socket BGA5773", ++ "Socket AM5", ++ "Socket SP5", ++ "Socket SP6", ++ "Socket BGA883", ++ "Socket BGA1190", ++ "Socket BGA4129", ++ "Socket LGA4710", ++ "Socket LGA7529" /* 0x50 */ + }; + +- if (code >= 0x01 && code <= 0x48) ++ if (code >= 0x01 && code <= 0x50) + return upgrade[code - 0x01]; + return out_of_spec; + } +-- +2.31.1 + diff --git a/dmidecode.spec b/dmidecode.spec index 4108f2eb9f278f69e46ad3122bf54ecfd6b7fb7d..19c79fea3de6da3596085c0ac88912774d6d505b 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.5 +%define anolis_release .0.6 Summary: Tool to analyse BIOS DMI data Name: dmidecode Version: 3.3 @@ -20,7 +20,9 @@ Patch8: 0009-dmidecode-Write-the-whole-dump-file-at-once.patch Patch9: 0010-dmidecode-Do-not-let-dump-bin-overwrite-an-existing-.patch Patch10: 0011-dmidecode-Make-dmi_slot_bus_width-reusable.patch Patch11: 0012-dmidecode-Add-missing-bits-from-SMBIOS-3.4.0-specifi.patch - +Patch12: 0013-Support-new-byte-value-of-Processor-Upgrade-field-fr.patch +Patch13: 0014-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch +Patch14: 0015-dmidecode-Expand-list-of-recognized-CPU-sockets.patch BuildRequires: gcc make Requires: glibc @@ -70,6 +72,9 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install- %doc AUTHORS NEWS README %changelog +* Tue May 14 2024 Kaiqiang Wang - 1:3.3-5.0.6 +- https://bugzilla.openanolis.cn/show_bug.cgi?id=8972 +- dmidecode Add processor support from SMBIOS 3.6.0 * Wed May 08 2024 Kaiqiang Wang - 1:3.3-5.0.5 - https://bugzilla.openanolis.cn/show_bug.cgi?id=8962 - dmidecode: Make dmi_slot_bus_width() reusable