From f5241830962460cec3cf281b37adefc09e8beca6 Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Mon, 10 Mar 2025 09:31:09 +1100 Subject: [PATCH 1/2] Add snapdragon X series --- include/cpuinfo.h | 2 ++ src/arm/uarch.c | 4 ++++ tools/cpu-info.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/include/cpuinfo.h b/include/cpuinfo.h index ea3c1d07..65f23bd7 100644 --- a/include/cpuinfo.h +++ b/include/cpuinfo.h @@ -522,6 +522,8 @@ enum cpuinfo_uarch { cpuinfo_uarch_falkor = 0x00400103, /** Qualcomm Saphira. */ cpuinfo_uarch_saphira = 0x00400104, + /** Qualcomm Oryon */ + cpuinfo_uarch_oryon = 0x00400105, /** Nvidia Denver. */ cpuinfo_uarch_denver = 0x00500100, diff --git a/src/arm/uarch.c b/src/arm/uarch.c index 68531e4d..4cd270aa 100644 --- a/src/arm/uarch.c +++ b/src/arm/uarch.c @@ -254,6 +254,10 @@ void cpuinfo_arm_decode_vendor_uarch( *vendor = cpuinfo_vendor_qualcomm; switch (midr_get_part(midr)) { #if CPUINFO_ARCH_ARM + case 0x001: + /* Qualcomm Snapdragon X series (Oryon) */ + *uarch = cpuinfo_uarch_oryon; + break; case 0x00F: /* Mostly Scorpions, but some Cortex A5 * may report this value as well diff --git a/tools/cpu-info.c b/tools/cpu-info.c index b896b270..ca3ebfad 100644 --- a/tools/cpu-info.c +++ b/tools/cpu-info.c @@ -222,6 +222,8 @@ static const char* uarch_to_string(enum cpuinfo_uarch uarch) { return "Falkor"; case cpuinfo_uarch_saphira: return "Saphira"; + case cpuinfo_uarch_oryon: + return "Oryon"; case cpuinfo_uarch_denver: return "Denver"; case cpuinfo_uarch_denver2: From 4d9a6aa87d3b2cc400f514b4f49e3f34186521db Mon Sep 17 00:00:00 2001 From: Anthony Shaw Date: Mon, 10 Mar 2025 10:11:20 +1100 Subject: [PATCH 2/2] Move if --- src/arm/uarch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/arm/uarch.c b/src/arm/uarch.c index 4cd270aa..2cfd9959 100644 --- a/src/arm/uarch.c +++ b/src/arm/uarch.c @@ -254,10 +254,6 @@ void cpuinfo_arm_decode_vendor_uarch( *vendor = cpuinfo_vendor_qualcomm; switch (midr_get_part(midr)) { #if CPUINFO_ARCH_ARM - case 0x001: - /* Qualcomm Snapdragon X series (Oryon) */ - *uarch = cpuinfo_uarch_oryon; - break; case 0x00F: /* Mostly Scorpions, but some Cortex A5 * may report this value as well @@ -336,6 +332,10 @@ void cpuinfo_arm_decode_vendor_uarch( *uarch = cpuinfo_uarch_cortex_a55; break; #if CPUINFO_ARCH_ARM64 + case 0x001: + /* Qualcomm Snapdragon X series (Oryon) */ + *uarch = cpuinfo_uarch_oryon; + break; case 0xC00: *uarch = cpuinfo_uarch_falkor; break;