From cec2e4d3d93be170c3bba0de293c1ebc1aa4b21b Mon Sep 17 00:00:00 2001 From: The Tumultuous Unicorn Of Darkness Date: Sun, 2 Apr 2023 20:35:54 +0200 Subject: [PATCH] Support for Extended CPU topology leaf in cpuid_identify_purpose_amd() --- libcpuid/recog_amd.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c index 25b13cf7..4dde2e45 100644 --- a/libcpuid/recog_amd.c +++ b/libcpuid/recog_amd.c @@ -649,10 +649,12 @@ void cpuid_get_list_amd(struct cpu_list_t* list) cpu_purpose_t cpuid_identify_purpose_amd(struct cpu_raw_data_t* raw) { - //FIXME: ext_cpuid[0x26] => index 38 is past the end of the array (which contains 32 elements) - //TODO: leaf CPUID_Fn80000026 needs to be added in cpu_raw_data_t - (void)(raw); -#if 0 + int i; + + /* Check if Extended CPU Topology is supported */ + if (raw->amd_fn80000026h[0][EAX] == 0x0) + return PURPOSE_GENERAL; + /* Check for hybrid architecture From Processor Programming Reference (PPR) for AMD Family 19h Model 70h, Revision A0 Processors Available at https://www.amd.com/system/files/TechDocs/57019-A0-PUB_3.00.zip @@ -663,14 +665,16 @@ cpu_purpose_t cpuid_identify_purpose_amd(struct cpu_raw_data_t* raw) - CPUID_Fn80000026_EBX [Extended CPU Topology][31:28] is CoreType. Only valid while LevelType=Core. */ - if (EXTRACTS_BITS(raw->ext_cpuid[0x26][ECX], 15, 8) == 0x1) { - debugf(3, "Detected AMD CPU hybrid architecture\n"); - switch (EXTRACTS_BITS(raw->ext_cpuid[0x26][EBX], 31, 28)) { - case 0x0: return PURPOSE_PERFORMANCE; - case 0x1: return PURPOSE_EFFICIENCY; - default: return PURPOSE_GENERAL; + for (i = 0; (raw->amd_fn80000026h[i][EBX] != 0x0) && (raw->amd_fn80000026h[i][ECX] != 0x0) && (i < MAX_AMDFN80000026H_LEVEL); i++) { + if (EXTRACTS_BITS(raw->amd_fn80000026h[i][ECX], 15, 8) == 0x1) { + debugf(3, "Detected AMD CPU hybrid architecture\n"); + switch (EXTRACTS_BITS(raw->amd_fn80000026h[i][EBX], 31, 28)) { + case 0x0: return PURPOSE_PERFORMANCE; + case 0x1: return PURPOSE_EFFICIENCY; + default: return PURPOSE_GENERAL; + } } } -#endif + return PURPOSE_GENERAL; }