Skip to content

Commit fce3121

Browse files
jcfaraccojcfaracco
committed
Merge: x86/cpu: Add CPU type to cpuinfo_topology and Use heterogeneous core topology
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/749 Description: AMD heterogeneous designs include two types of cores: * Performance * Efficiency Each core type has different highest performance values configured by the platform. Drivers such as amd_pstate need to identify the type of core to correctly set an appropriate boost numerator to calculate the maximum frequency. JIRA: https://issues.redhat.com/browse/RHEL-64636 Build Info: 67325607 Tested: Successful test results on Intel (intel-arrowlake-s-02) and AMD (amd-asrock-ryzen-zen5-01) systems. Signed-off-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents eebf098 + 372bdb1 commit fce3121

File tree

7 files changed

+94
-0
lines changed

7 files changed

+94
-0
lines changed

‎arch/x86/include/asm/intel-family.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,10 @@
182182
/* Family 19 */
183183
#define INTEL_PANTHERCOVE_X IFM(19, 0x01) /* Diamond Rapids */
184184

185+
/* CPU core types */
186+
enum intel_cpu_type {
187+
INTEL_CPU_TYPE_ATOM = 0x20,
188+
INTEL_CPU_TYPE_CORE = 0x40,
189+
};
190+
185191
#endif /* _ASM_X86_INTEL_FAMILY_H */

‎arch/x86/include/asm/processor.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,24 @@ struct cpuinfo_topology {
105105
// Cache level topology IDs
106106
u32 llc_id;
107107
u32 l2c_id;
108+
109+
// Hardware defined CPU-type
110+
union {
111+
u32 cpu_type;
112+
struct {
113+
// CPUID.1A.EAX[23-0]
114+
u32 intel_native_model_id :24;
115+
// CPUID.1A.EAX[31-24]
116+
u32 intel_type :8;
117+
};
118+
struct {
119+
// CPUID 0x80000026.EBX
120+
u32 amd_num_processors :16,
121+
amd_power_eff_ranking :8,
122+
amd_native_model_id :4,
123+
amd_type :4;
124+
};
125+
};
108126
};
109127

110128
struct cpuinfo_x86 {

‎arch/x86/include/asm/topology.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ enum x86_topology_domains {
114114
TOPO_MAX_DOMAIN,
115115
};
116116

117+
enum x86_topology_cpu_type {
118+
TOPO_CPU_TYPE_PERFORMANCE,
119+
TOPO_CPU_TYPE_EFFICIENCY,
120+
TOPO_CPU_TYPE_UNKNOWN,
121+
};
122+
117123
struct x86_topology_system {
118124
unsigned int dom_shifts[TOPO_MAX_DOMAIN];
119125
unsigned int dom_size[TOPO_MAX_DOMAIN];
@@ -149,6 +155,9 @@ extern unsigned int __max_threads_per_core;
149155
extern unsigned int __num_threads_per_package;
150156
extern unsigned int __num_cores_per_package;
151157

158+
const char *get_topology_cpu_type_name(struct cpuinfo_x86 *c);
159+
enum x86_topology_cpu_type get_topology_cpu_type(struct cpuinfo_x86 *c);
160+
152161
static inline unsigned int topology_max_packages(void)
153162
{
154163
return __max_logical_packages;

‎arch/x86/kernel/acpi/cppc.c‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,10 @@ EXPORT_SYMBOL_GPL(amd_detect_prefcore);
239239
*/
240240
int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
241241
{
242+
enum x86_topology_cpu_type core_type = get_topology_cpu_type(&cpu_data(cpu));
242243
bool prefcore;
243244
int ret;
245+
u32 tmp;
244246

245247
ret = amd_detect_prefcore(&prefcore);
246248
if (ret)
@@ -266,6 +268,27 @@ int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
266268
break;
267269
}
268270
}
271+
272+
/* detect if running on heterogeneous design */
273+
if (cpu_feature_enabled(X86_FEATURE_AMD_HETEROGENEOUS_CORES)) {
274+
switch (core_type) {
275+
case TOPO_CPU_TYPE_UNKNOWN:
276+
pr_warn("Undefined core type found for cpu %d\n", cpu);
277+
break;
278+
case TOPO_CPU_TYPE_PERFORMANCE:
279+
/* use the max scale for performance cores */
280+
*numerator = CPPC_HIGHEST_PERF_PERFORMANCE;
281+
return 0;
282+
case TOPO_CPU_TYPE_EFFICIENCY:
283+
/* use the highest perf value for efficiency cores */
284+
ret = amd_get_highest_perf(cpu, &tmp);
285+
if (ret)
286+
return ret;
287+
*numerator = tmp;
288+
return 0;
289+
}
290+
}
291+
269292
*numerator = CPPC_HIGHEST_PERF_PREFCORE;
270293

271294
return 0;

‎arch/x86/kernel/cpu/debugfs.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ static int cpu_debug_show(struct seq_file *m, void *p)
2222
seq_printf(m, "die_id: %u\n", c->topo.die_id);
2323
seq_printf(m, "cu_id: %u\n", c->topo.cu_id);
2424
seq_printf(m, "core_id: %u\n", c->topo.core_id);
25+
seq_printf(m, "cpu_type: %s\n", get_topology_cpu_type_name(c));
2526
seq_printf(m, "logical_pkg_id: %u\n", c->topo.logical_pkg_id);
2627
seq_printf(m, "logical_die_id: %u\n", c->topo.logical_die_id);
2728
seq_printf(m, "llc_id: %u\n", c->topo.llc_id);

‎arch/x86/kernel/cpu/topology_amd.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ static void parse_topology_amd(struct topo_scan *tscan)
182182
if (cpu_feature_enabled(X86_FEATURE_TOPOEXT))
183183
has_topoext = cpu_parse_topology_ext(tscan);
184184

185+
if (cpu_feature_enabled(X86_FEATURE_AMD_HETEROGENEOUS_CORES))
186+
tscan->c->topo.cpu_type = cpuid_ebx(0x80000026);
187+
185188
if (!has_topoext && !parse_8000_0008(tscan))
186189
return;
187190

‎arch/x86/kernel/cpu/topology_common.c‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <xen/xen.h>
55

6+
#include <asm/intel-family.h>
67
#include <asm/apic.h>
78
#include <asm/processor.h>
89
#include <asm/smp.h>
@@ -27,6 +28,36 @@ void topology_set_dom(struct topo_scan *tscan, enum x86_topology_domains dom,
2728
}
2829
}
2930

31+
enum x86_topology_cpu_type get_topology_cpu_type(struct cpuinfo_x86 *c)
32+
{
33+
if (c->x86_vendor == X86_VENDOR_INTEL) {
34+
switch (c->topo.intel_type) {
35+
case INTEL_CPU_TYPE_ATOM: return TOPO_CPU_TYPE_EFFICIENCY;
36+
case INTEL_CPU_TYPE_CORE: return TOPO_CPU_TYPE_PERFORMANCE;
37+
}
38+
}
39+
if (c->x86_vendor == X86_VENDOR_AMD) {
40+
switch (c->topo.amd_type) {
41+
case 0: return TOPO_CPU_TYPE_PERFORMANCE;
42+
case 1: return TOPO_CPU_TYPE_EFFICIENCY;
43+
}
44+
}
45+
46+
return TOPO_CPU_TYPE_UNKNOWN;
47+
}
48+
49+
const char *get_topology_cpu_type_name(struct cpuinfo_x86 *c)
50+
{
51+
switch (get_topology_cpu_type(c)) {
52+
case TOPO_CPU_TYPE_PERFORMANCE:
53+
return "performance";
54+
case TOPO_CPU_TYPE_EFFICIENCY:
55+
return "efficiency";
56+
default:
57+
return "unknown";
58+
}
59+
}
60+
3061
static unsigned int __maybe_unused parse_num_cores_legacy(struct cpuinfo_x86 *c)
3162
{
3263
struct {
@@ -87,6 +118,7 @@ static void parse_topology(struct topo_scan *tscan, bool early)
87118
.cu_id = 0xff,
88119
.llc_id = BAD_APICID,
89120
.l2c_id = BAD_APICID,
121+
.cpu_type = TOPO_CPU_TYPE_UNKNOWN,
90122
};
91123
struct cpuinfo_x86 *c = tscan->c;
92124
struct {
@@ -132,6 +164,8 @@ static void parse_topology(struct topo_scan *tscan, bool early)
132164
case X86_VENDOR_INTEL:
133165
if (!IS_ENABLED(CONFIG_CPU_SUP_INTEL) || !cpu_parse_topology_ext(tscan))
134166
parse_legacy(tscan);
167+
if (c->cpuid_level >= 0x1a)
168+
c->topo.cpu_type = cpuid_eax(0x1a);
135169
break;
136170
case X86_VENDOR_HYGON:
137171
if (IS_ENABLED(CONFIG_CPU_SUP_HYGON))

0 commit comments

Comments
 (0)