From 5f44ec9a0096a0c220666d5586618fd718a9a40d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 13:21:02 +0200 Subject: lscpu: backport ARM human-readable names from upstream Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2182169 Signed-off-by: Karel Zak --- sys-utils/lscpu-arm.c | 109 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 13 deletions(-) diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c index 79b8e3aa5..5716f6c51 100644 --- a/sys-utils/lscpu-arm.c +++ b/sys-utils/lscpu-arm.c @@ -64,6 +64,7 @@ static const struct id_part arm_part[] = { { 0xc27, "Cortex-M7" }, { 0xc60, "Cortex-M0+" }, { 0xd01, "Cortex-A32" }, + { 0xd02, "Cortex-A34" }, { 0xd03, "Cortex-A53" }, { 0xd04, "Cortex-A35" }, { 0xd05, "Cortex-A55" }, @@ -77,18 +78,36 @@ static const struct id_part arm_part[] = { { 0xd0d, "Cortex-A77" }, { 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" }, + { 0xd43, "Cortex-A65AE" }, + { 0xd44, "Cortex-X1" }, + { 0xd46, "Cortex-A510" }, + { 0xd47, "Cortex-A710" }, + { 0xd48, "Cortex-X2" }, + { 0xd49, "Neoverse-N2" }, { 0xd4a, "Neoverse-E1" }, { 0xd4b, "Cortex-A78C" }, + { 0xd4c, "Cortex-X1C" }, + { 0xd4d, "Cortex-A715" }, + { 0xd4e, "Cortex-X3" }, + { 0xd4f, "Neoverse-V2" }, + { 0xd80, "Cortex-A520" }, + { 0xd81, "Cortex-A720" }, + { 0xd82, "Cortex-X4" }, { -1, "unknown" }, }; static const struct id_part brcm_part[] = { - { 0x0f, "Brahma B15" }, - { 0x100, "Brahma B53" }, + { 0x0f, "Brahma-B15" }, + { 0x100, "Brahma-B53" }, { 0x516, "ThunderX2" }, { -1, "unknown" }, }; @@ -101,10 +120,18 @@ static const struct id_part dec_part[] = { static const struct id_part cavium_part[] = { { 0x0a0, "ThunderX" }, - { 0x0a1, "ThunderX 88XX" }, - { 0x0a2, "ThunderX 81XX" }, - { 0x0a3, "ThunderX 83XX" }, - { 0x0af, "ThunderX2 99xx" }, + { 0x0a1, "ThunderX-88XX" }, + { 0x0a2, "ThunderX-81XX" }, + { 0x0a3, "ThunderX-83XX" }, + { 0x0af, "ThunderX2-99xx" }, + { 0x0b0, "OcteonTX2" }, + { 0x0b1, "OcteonTX2-98XX" }, + { 0x0b2, "OcteonTX2-96XX" }, + { 0x0b3, "OcteonTX2-95XX" }, + { 0x0b4, "OcteonTX2-95XXN" }, + { 0x0b5, "OcteonTX2-95XXMM" }, + { 0x0b6, "OcteonTX2-95XXO" }, + { 0x0b8, "ThunderX3-T110" }, { -1, "unknown" }, }; @@ -121,8 +148,12 @@ static const struct id_part qcom_part[] = { { 0x201, "Kryo" }, { 0x205, "Kryo" }, { 0x211, "Kryo" }, - { 0x800, "Falkor V1/Kryo" }, - { 0x801, "Kryo V2" }, + { 0x800, "Falkor-V1/Kryo" }, + { 0x801, "Kryo-V2" }, + { 0x802, "Kryo-3XX-Gold" }, + { 0x803, "Kryo-3XX-Silver" }, + { 0x804, "Kryo-4XX-Gold" }, + { 0x805, "Kryo-4XX-Silver" }, { 0xc00, "Falkor" }, { 0xc01, "Saphira" }, { -1, "unknown" }, @@ -130,6 +161,9 @@ static const struct id_part qcom_part[] = { static const struct id_part samsung_part[] = { { 0x001, "exynos-m1" }, + { 0x002, "exynos-m3" }, + { 0x003, "exynos-m4" }, + { 0x004, "exynos-m5" }, { -1, "unknown" }, }; @@ -141,12 +175,52 @@ static const struct id_part nvidia_part[] = { }; static const struct id_part marvell_part[] = { - { 0x131, "Feroceon 88FR131" }, + { 0x131, "Feroceon-88FR131" }, { 0x581, "PJ4/PJ4b" }, { 0x584, "PJ4B-MP" }, { -1, "unknown" }, }; +static const struct id_part apple_part[] = { + { 0x000, "Swift" }, + { 0x001, "Cyclone" }, + { 0x002, "Typhoon" }, + { 0x003, "Typhoon/Capri" }, + { 0x004, "Twister" }, + { 0x005, "Twister/Elba/Malta" }, + { 0x006, "Hurricane" }, + { 0x007, "Hurricane/Myst" }, + { 0x008, "Monsoon" }, + { 0x009, "Mistral" }, + { 0x00b, "Vortex" }, + { 0x00c, "Tempest" }, + { 0x00f, "Tempest-M9" }, + { 0x010, "Vortex/Aruba" }, + { 0x011, "Tempest/Aruba" }, + { 0x012, "Lightning" }, + { 0x013, "Thunder" }, + { 0x020, "Icestorm-A14" }, + { 0x021, "Firestorm-A14" }, + { 0x022, "Icestorm-M1" }, + { 0x023, "Firestorm-M1" }, + { 0x024, "Icestorm-M1-Pro" }, + { 0x025, "Firestorm-M1-Pro" }, + { 0x026, "Thunder-M10" }, + { 0x028, "Icestorm-M1-Max" }, + { 0x029, "Firestorm-M1-Max" }, + { 0x030, "Blizzard-A15" }, + { 0x031, "Avalanche-A15" }, + { 0x032, "Blizzard-M2" }, + { 0x033, "Avalanche-M2" }, + { 0x034, "Blizzard-M2-Pro" }, + { 0x035, "Avalanche-M2-Pro" }, + { 0x036, "Sawtooth-A16" }, + { 0x037, "Everest-A16" }, + { 0x038, "Blizzard-M2-Max" }, + { 0x039, "Avalanche-M2-Max" }, + { -1, "unknown" }, +}; + static const struct id_part faraday_part[] = { { 0x526, "FA526" }, { 0x626, "FA626" }, @@ -185,12 +259,21 @@ static const struct id_part fujitsu_part[] = { static const struct id_part hisi_part[] = { { 0xd01, "Kunpeng-920" }, /* aka tsv110 */ + { 0xd40, "Cortex-A76" }, /* HiSilicon uses this ID though advertises A76 */ + { -1, "unknown" }, +}; + +static const struct id_part ampere_part[] = { + { 0xac3, "Ampere-1" }, + { 0xac4, "Ampere-1a" }, { -1, "unknown" }, }; static const struct id_part ft_part[] = { - { 0x662, "FT-2000+" }, - { 0x663, "S2500" }, + { 0x660, "FTC660" }, + { 0x661, "FTC661" }, + { 0x662, "FTC662" }, + { 0x663, "FTC663" }, { -1, "unknown" }, }; @@ -218,11 +301,11 @@ static const struct hw_impl hw_implementer[] = { { 0x51, qcom_part, "Qualcomm" }, { 0x53, samsung_part, "Samsung" }, { 0x56, marvell_part, "Marvell" }, - { 0x61, unknown_part, "Apple" }, + { 0x61, apple_part, "Apple" }, { 0x66, faraday_part, "Faraday" }, { 0x69, intel_part, "Intel" }, { 0x70, ft_part, "Phytium" }, - { 0xc0, unknown_part, "Ampere" }, + { 0xc0, ampere_part, "Ampere" }, { -1, unknown_part, "unknown" }, }; -- 2.40.1