Skip to contentSkip to conversation

Detect max performance values for heterogeneous AMD designs

PATCH In review Mario Limonciello 4 participants 12 messages Oct 3, 2024 – Oct 21, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Detect max performance values for heterogeneous AMD designs

From: Mario Limonciello <[email protected]>

AMD heterogeneous designs such as the Ryzen AI 300 series processors have multiple core types that can reach different maximum clock values.

This series uses the CPUID Fn_0x80000026 to detect such designs and to correct configure the boost numerator that is used to calculate maximum frequency.

Mario Limonciello (1):
CPPC: Use heterogeneous core topology for identifying boost numerator

Perry Yuan (1):
x86/cpufeatures: Add feature bits for AMD heterogeneous processor

 arch/x86/include/asm/cpufeatures.h |  1 +
 arch/x86/include/asm/processor.h   | 13 +++++++++++++
 arch/x86/kernel/acpi/cppc.c        | 30 ++++++++++++++++++++++++++++++
 arch/x86/kernel/cpu/amd.c          | 29 +++++++++++++++++++++++++++++
 arch/x86/kernel/cpu/scattered.c    |  1 +
 5 files changed, 74 insertions(+)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 x86/cpufeatures: Add feature bits for AMD heterogeneous processor

From: Perry Yuan <[email protected]>

CPUID leaf 0x80000026 advertises core types with different efficiency rankings.

Bit 30 indicates the heterogeneous core topology feature, if the bit set, it means not all instances at the current hierarchical level have the same core topology.

This is described in the AMD64 Architecture Programmers Manual Volume 2 and 3, doc ID #25493 and #25494.

---
 arch/x86/include/asm/cpufeatures.h | 1 +
 arch/x86/kernel/cpu/scattered.c    | 1 +
 2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +1 -0
index dd4682857c12..cea1ed82aeb4 100644
@@ -473,6 +473,7 @@
 #define X86_FEATURE_CLEAR_BHB_HW	(21*32+ 3) /* BHI_DIS_S HW control enabled */
 #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch history at vmexit using SW loop */
 #define X86_FEATURE_FAST_CPPC		(21*32 + 5) /* AMD Fast CPPC */
+#define X86_FEATURE_HETERO_CORE_TOPOLOGY	(21*32 + 6) /* Heterogeneous Core Topology */
 
 /*
  * BUG word(s)
arch/x86/kernel/cpu/scattered.c +1 -0
index c84c30188fdf..3bba55323163 100644
@@ -52,6 +52,7 @@ static const struct cpuid_bit cpuid_bits[] = {
 	{ X86_FEATURE_PERFMON_V2,	CPUID_EAX,  0, 0x80000022, 0 },
 	{ X86_FEATURE_AMD_LBR_V2,	CPUID_EAX,  1, 0x80000022, 0 },
 	{ X86_FEATURE_AMD_LBR_PMC_FREEZE,	CPUID_EAX,  2, 0x80000022, 0 },
+	{ X86_FEATURE_HETERO_CORE_TOPOLOGY,	CPUID_EAX,  30, 0x80000026, 0 },
 	{ 0, 0, 0, 0, 0 }
 };
 
Signature · 1 line
2.43.0
#8 lore raw

PATCH 2/2 CPPC: Use heterogeneous core topology for identifying boost numerator

In reply to Mario Limonciello

From: Mario Limonciello <[email protected]>

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.

X86_FEATURE_HETERO_CORE_TOPOLOGY is used to identify whether the SoC supports heterogeneous core type by reading CPUID leaf Fn_0x80000026.

On performance cores the scaling factor of 196 is used. On efficiency cores the scaling factor is the value reported as the highest perf. Efficiency cores have the same preferred core rankings.

---
 arch/x86/include/asm/processor.h | 13 +++++++++++++
 arch/x86/kernel/acpi/cppc.c      | 30 ++++++++++++++++++++++++++++++
 arch/x86/kernel/cpu/amd.c        | 29 +++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
arch/x86/include/asm/processor.h +13 -0
index 4a686f0e5dbf..d81a6efa81bb 100644
@@ -691,6 +691,14 @@ static inline u32 per_cpu_l2c_id(unsigned int cpu)
 	return per_cpu(cpu_info.topo.l2c_id, cpu);
 }
 
+/* defined by CPUID_Fn80000026_EBX BIT [31:28] */
+enum amd_core_type {
+	CPU_CORE_TYPE_NO_HETERO_SUP = -1,
+	CPU_CORE_TYPE_PERFORMANCE = 0,
+	CPU_CORE_TYPE_EFFICIENCY = 1,
+	CPU_CORE_TYPE_UNDEFINED = 2,
+};
+
 #ifdef CONFIG_CPU_SUP_AMD
 /*
  * Issue a DIV 0/1 insn to clear any division data from previous DIV
@@ -703,9 +711,14 @@ static __always_inline void amd_clear_divider(void)
 }
 
 extern void amd_check_microcode(void);
+extern enum amd_core_type amd_get_core_type(void);
 #else
 static inline void amd_clear_divider(void)		{ }
 static inline void amd_check_microcode(void)		{ }
+static inline enum amd_core_type amd_get_core_type(void)
+{
+	return CPU_CORE_TYPE_NO_HETERO_SUP;
+}
 #endif
 
 extern unsigned long arch_align_stack(unsigned long sp);
arch/x86/kernel/acpi/cppc.c +30 -0
index 956984054bf3..ca289e6ec82c 100644
@@ -217,6 +217,12 @@ int amd_detect_prefcore(bool *detected)
 }
 EXPORT_SYMBOL_GPL(amd_detect_prefcore);
 
+static void amd_do_get_core_type(void *data)
+{
+	enum amd_core_type *core_type = data;
+	*core_type = amd_get_core_type();
+}
+
 /**
  * amd_get_boost_ratio_numerator: Get the numerator to use for boost ratio calculation
  * @cpu: CPU to get numerator for.
@@ -234,7 +240,9 @@ EXPORT_SYMBOL_GPL(amd_detect_prefcore);
  */
 int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
 {
+	enum amd_core_type core_type;
 	bool prefcore;
+	u32 tmp;
 	int ret;
 
 	ret = amd_detect_prefcore(&prefcore);
@@ -261,6 +269,28 @@ int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
 			break;
 		}
 	}
+
+	/* detect if running on heterogeneous design */
+	smp_call_function_single(cpu, amd_do_get_core_type, &core_type, 1);
+	switch (core_type) {
+	case CPU_CORE_TYPE_NO_HETERO_SUP:
+		break;
+	case CPU_CORE_TYPE_PERFORMANCE:
+		/* use the max scale for performance cores */
+		*numerator = CPPC_HIGHEST_PERF_PERFORMANCE;
+		return 0;
+	case CPU_CORE_TYPE_EFFICIENCY:
+		/* use the highest perf value for efficiency cores */
+		ret = amd_get_highest_perf(cpu, &tmp);
+		if (ret)
+			return ret;
+		*numerator = tmp;
+		return 0;
+	default:
+		pr_warn("WARNING: Undefined core type %d found\n", core_type);
+		break;
+	}
+
 	*numerator = CPPC_HIGHEST_PERF_PREFCORE;
 
 	return 0;
arch/x86/kernel/cpu/amd.c +29 -0
index 015971adadfc..8ad5f1385f0e 100644
@@ -1204,3 +1204,32 @@ void amd_check_microcode(void)
 
 	on_each_cpu(zenbleed_check_cpu, NULL, 1);
 }
+
+/**
+ * amd_get_core_type - Heterogeneous core type identification
+ *
+ * Returns the CPU type [31:28] (i.e., performance or efficient) of
+ * a CPU in the processor.
+ *
+ * If the processor has no core type support, returns
+ * CPU_CORE_TYPE_NO_HETERO_SUP.
+ */
+enum amd_core_type amd_get_core_type(void)
+{
+	struct {
+		u32  num_processors             :16,
+		     power_efficiency_ranking   :8,
+		     native_model_id            :4,
+		     core_type                  :4;
+	} props;
+
+	if (!cpu_feature_enabled(X86_FEATURE_HETERO_CORE_TOPOLOGY))
+		return CPU_CORE_TYPE_NO_HETERO_SUP;
+
+	cpuid_leaf_reg(0x80000026, CPUID_EBX, &props);
+	if (props.core_type >= CPU_CORE_TYPE_UNDEFINED)
+		return CPU_CORE_TYPE_UNDEFINED;
+
+	return props.core_type;
+}
+EXPORT_SYMBOL_GPL(amd_get_core_type);
Signature · 1 line
2.43.0
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] x86/cpufeatures: Add feature bits for AMD heterogeneous processor

In reply to Mario Limonciello
Quoted 9 lines · Mario Limonciello

From: Perry Yuan <[email protected]>

CPUID leaf 0x80000026 advertises core types with different efficiency rankings.

Bit 30 indicates the heterogeneous core topology feature, if the bit set, it means not all instances at the current hierarchical level have the same core topology.

Quoted 6 lines

This is described in the AMD64 Architecture Programmers Manual Volume 2 and 3, doc ID #25493 and #25494.

Quoted 32 lines
---
 arch/x86/include/asm/cpufeatures.h | 1 +
 arch/x86/kernel/cpu/scattered.c    | 1 +
 2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +1 -0
index dd4682857c12..cea1ed82aeb4 100644
@@ -473,6 +473,7 @@
 #define X86_FEATURE_CLEAR_BHB_HW	(21*32+ 3) /* BHI_DIS_S HW control enabled */
 #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch history at vmexit using SW loop */
 #define X86_FEATURE_FAST_CPPC		(21*32 + 5) /* AMD Fast CPPC */
+#define X86_FEATURE_HETERO_CORE_TOPOLOGY	(21*32 + 6) /* Heterogeneous Core Topology */
 
 /*
  * BUG word(s)
arch/x86/kernel/cpu/scattered.c +1 -0
index c84c30188fdf..3bba55323163 100644
@@ -52,6 +52,7 @@ static const struct cpuid_bit cpuid_bits[] = {
 	{ X86_FEATURE_PERFMON_V2,	CPUID_EAX,  0, 0x80000022, 0 },
 	{ X86_FEATURE_AMD_LBR_V2,	CPUID_EAX,  1, 0x80000022, 0 },
 	{ X86_FEATURE_AMD_LBR_PMC_FREEZE,	CPUID_EAX,  2, 0x80000022, 0 },
+	{ X86_FEATURE_HETERO_CORE_TOPOLOGY,	CPUID_EAX,  30, 0x80000026, 0 },
 	{ 0, 0, 0, 0, 0 }
 };
 
Signature · 1 line
2.43.0
Reviewed-by on v1 2/2
#9 lore raw

Re: [PATCH 2/2] CPPC: Use heterogeneous core topology for identifying boost numerator

In reply to Mario Limonciello

Hello Mario,

Quoted 143 lines · Mario Limonciello

From: Mario Limonciello <[email protected]>

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.

X86_FEATURE_HETERO_CORE_TOPOLOGY is used to identify whether the SoC supports heterogeneous core type by reading CPUID leaf Fn_0x80000026.

On performance cores the scaling factor of 196 is used. On efficiency cores the scaling factor is the value reported as the highest perf. Efficiency cores have the same preferred core rankings.

---
 arch/x86/include/asm/processor.h | 13 +++++++++++++
 arch/x86/kernel/acpi/cppc.c      | 30 ++++++++++++++++++++++++++++++
 arch/x86/kernel/cpu/amd.c        | 29 +++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
arch/x86/include/asm/processor.h +13 -0
index 4a686f0e5dbf..d81a6efa81bb 100644
@@ -691,6 +691,14 @@ static inline u32 per_cpu_l2c_id(unsigned int cpu)
 	return per_cpu(cpu_info.topo.l2c_id, cpu);
 }
 
+/* defined by CPUID_Fn80000026_EBX BIT [31:28] */
+enum amd_core_type {
+	CPU_CORE_TYPE_NO_HETERO_SUP = -1,
+	CPU_CORE_TYPE_PERFORMANCE = 0,
+	CPU_CORE_TYPE_EFFICIENCY = 1,
+	CPU_CORE_TYPE_UNDEFINED = 2,
+};
+
 #ifdef CONFIG_CPU_SUP_AMD
 /*
  * Issue a DIV 0/1 insn to clear any division data from previous DIV
@@ -703,9 +711,14 @@ static __always_inline void amd_clear_divider(void)
 }
 
 extern void amd_check_microcode(void);
+extern enum amd_core_type amd_get_core_type(void);
 #else
 static inline void amd_clear_divider(void)		{ }
 static inline void amd_check_microcode(void)		{ }
+static inline enum amd_core_type amd_get_core_type(void)
+{
+	return CPU_CORE_TYPE_NO_HETERO_SUP;
+}
 #endif
 
 extern unsigned long arch_align_stack(unsigned long sp);
arch/x86/kernel/acpi/cppc.c +30 -0
index 956984054bf3..ca289e6ec82c 100644
@@ -217,6 +217,12 @@ int amd_detect_prefcore(bool *detected)
 }
 EXPORT_SYMBOL_GPL(amd_detect_prefcore);
 
+static void amd_do_get_core_type(void *data)
+{
+	enum amd_core_type *core_type = data;
+	*core_type = amd_get_core_type();
+}
+
 /**
  * amd_get_boost_ratio_numerator: Get the numerator to use for boost ratio calculation
  * @cpu: CPU to get numerator for.
@@ -234,7 +240,9 @@ EXPORT_SYMBOL_GPL(amd_detect_prefcore);
  */
 int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
 {
+	enum amd_core_type core_type;
 	bool prefcore;
+	u32 tmp;
 	int ret;
 
 	ret = amd_detect_prefcore(&prefcore);
@@ -261,6 +269,28 @@ int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
 			break;
 		}
 	}
+
+	/* detect if running on heterogeneous design */
+	smp_call_function_single(cpu, amd_do_get_core_type, &core_type, 1);
+	switch (core_type) {
+	case CPU_CORE_TYPE_NO_HETERO_SUP:
+		break;
+	case CPU_CORE_TYPE_PERFORMANCE:
+		/* use the max scale for performance cores */
+		*numerator = CPPC_HIGHEST_PERF_PERFORMANCE;
+		return 0;
+	case CPU_CORE_TYPE_EFFICIENCY:
+		/* use the highest perf value for efficiency cores */
+		ret = amd_get_highest_perf(cpu, &tmp);
+		if (ret)
+			return ret;
+		*numerator = tmp;
+		return 0;
+	default:
+		pr_warn("WARNING: Undefined core type %d found\n", core_type);
+		break;
+	}
+
 	*numerator = CPPC_HIGHEST_PERF_PREFCORE;
 
 	return 0;
arch/x86/kernel/cpu/amd.c +19 -0
index 015971adadfc..8ad5f1385f0e 100644
@@ -1204,3 +1204,32 @@ void amd_check_microcode(void)
 
 	on_each_cpu(zenbleed_check_cpu, NULL, 1);
 }
+
+/**
+ * amd_get_core_type - Heterogeneous core type identification
+ *
+ * Returns the CPU type [31:28] (i.e., performance or efficient) of
+ * a CPU in the processor.
+ *
+ * If the processor has no core type support, returns
+ * CPU_CORE_TYPE_NO_HETERO_SUP.
+ */
+enum amd_core_type amd_get_core_type(void)
+{
+	struct {
+		u32  num_processors             :16,
+		     power_efficiency_ranking   :8,
+		     native_model_id            :4,
+		     core_type                  :4;
+	} props;
+

arch/x86/kernel/cpu/amd.c void amd_check_microcode(void) · line 1235

Quoted 10 lines
arch/x86/kernel/cpu/amd.c +10 -0
+	if (!cpu_feature_enabled(X86_FEATURE_HETERO_CORE_TOPOLOGY))
+		return CPU_CORE_TYPE_NO_HETERO_SUP;
+
+	cpuid_leaf_reg(0x80000026, CPUID_EBX, &props);
+	if (props.core_type >= CPU_CORE_TYPE_UNDEFINED)
+		return CPU_CORE_TYPE_UNDEFINED;
+
+	return props.core_type;
+}
+EXPORT_SYMBOL_GPL(amd_get_core_type);

LGTM,

--
Thanks and Regards
gautham.

maintainer
#3 lore raw

Re: [PATCH 1/2] x86/cpufeatures: Add feature bits for AMD heterogeneous processor

In reply to Mario Limonciello
Quoted 25 lines · Mario Limonciello

From: Perry Yuan <[email protected]>

CPUID leaf 0x80000026 advertises core types with different efficiency rankings.

Bit 30 indicates the heterogeneous core topology feature, if the bit set, it means not all instances at the current hierarchical level have the same core topology.

This is described in the AMD64 Architecture Programmers Manual Volume 2 and 3, doc ID #25493 and #25494.

---
 arch/x86/include/asm/cpufeatures.h | 1 +
 arch/x86/kernel/cpu/scattered.c    | 1 +
 2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +0 -0
index dd4682857c12..cea1ed82aeb4 100644

arch/x86/include/asm/cpufeatures.h line 476

Quoted 4 lines
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -473,6 +473,7 @@
 #define X86_FEATURE_CLEAR_BHB_HW	(21*32+ 3) /* BHI_DIS_S HW control enabled */
 #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch history at vmexit using SW loop */
 #define X86_FEATURE_FAST_CPPC		(21*32 + 5) /* AMD Fast CPPC */
+#define X86_FEATURE_HETERO_CORE_TOPOLOGY	(21*32 + 6) /* Heterogeneous Core Topology */

So this is an AMD-specific feature bit and so it should have "AMD" in the name:

#define X86_FEATURE_AMD_HETERO_CORE_TOPOLOGY (21*32 + 6) /* Heterogeneous Core Topology */

Also, as clarified offlist, please do not take x86 patches without an Ack at least through some other tree.

arch/x86/kernel/cpu/scattered.c static const struct cpuid_bit cpuid_bits[] = { · line 55

Quoted 9 lines
arch/x86/kernel/cpu/scattered.c +1 -0
index c84c30188fdf..3bba55323163 100644
@@ -52,6 +52,7 @@ static const struct cpuid_bit cpuid_bits[] = {
 	{ X86_FEATURE_PERFMON_V2,	CPUID_EAX,  0, 0x80000022, 0 },
 	{ X86_FEATURE_AMD_LBR_V2,	CPUID_EAX,  1, 0x80000022, 0 },
 	{ X86_FEATURE_AMD_LBR_PMC_FREEZE,	CPUID_EAX,  2, 0x80000022, 0 },
+	{ X86_FEATURE_HETERO_CORE_TOPOLOGY,	CPUID_EAX,  30, 0x80000026, 0 },

So my APM calls this bit: "HeterogeneousCores".

Why aren't you calling it this?

IOW: X86_FEATURE_AMD_HETEROGENEOUS_CORES

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#4 lore raw

Re: [PATCH 1/2] x86/cpufeatures: Add feature bits for AMD heterogeneous processor

Quoted 34 lines · Borislav Petkov
Quoted 25 lines · Mario Limonciello

From: Perry Yuan <[email protected]>

CPUID leaf 0x80000026 advertises core types with different efficiency rankings.

Bit 30 indicates the heterogeneous core topology feature, if the bit set, it means not all instances at the current hierarchical level have the same core topology.

This is described in the AMD64 Architecture Programmers Manual Volume 2 and 3, doc ID #25493 and #25494.

---
  arch/x86/include/asm/cpufeatures.h | 1 +
  arch/x86/kernel/cpu/scattered.c    | 1 +
  2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +0 -0
index dd4682857c12..cea1ed82aeb4 100644

arch/x86/include/asm/cpufeatures.h line 476

Quoted 4 lines
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -473,6 +473,7 @@
  #define X86_FEATURE_CLEAR_BHB_HW	(21*32+ 3) /* BHI_DIS_S HW control enabled */
  #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch history at vmexit using SW loop */
  #define X86_FEATURE_FAST_CPPC		(21*32 + 5) /* AMD Fast CPPC */
+#define X86_FEATURE_HETERO_CORE_TOPOLOGY	(21*32 + 6) /* Heterogeneous Core Topology */

So this is an AMD-specific feature bit and so it should have "AMD" in the name:

Quoted 4 lines

#define X86_FEATURE_AMD_HETERO_CORE_TOPOLOGY (21*32 + 6) /* Heterogeneous Core Topology */

Also, as clarified offlist, please do not take x86 patches without an Ack at least through some other tree.

Yes; sorry about this, the R-b was not sufficient and should have explicitly pinged for an A-b.

Quoted 13 lines

arch/x86/kernel/cpu/scattered.c static const struct cpuid_bit cpuid_bits[] = { · line 55

Quoted 10 lines
arch/x86/kernel/cpu/scattered.c +1 -0
index c84c30188fdf..3bba55323163 100644
@@ -52,6 +52,7 @@ static const struct cpuid_bit cpuid_bits[] = {
  	{ X86_FEATURE_PERFMON_V2,	CPUID_EAX,  0, 0x80000022, 0 },
  	{ X86_FEATURE_AMD_LBR_V2,	CPUID_EAX,  1, 0x80000022, 0 },
  	{ X86_FEATURE_AMD_LBR_PMC_FREEZE,	CPUID_EAX,  2, 0x80000022, 0 },
+	{ X86_FEATURE_HETERO_CORE_TOPOLOGY,	CPUID_EAX,  30, 0x80000026, 0 },

So my APM calls this bit: "HeterogeneousCores".

Quoted 6 lines

Why aren't you calling it this?

IOW: X86_FEATURE_AMD_HETEROGENEOUS_CORES

Thx.

OK - I'll adjust accordingly.

There is other content in linux-pm/linux-next that uses this.

As this patch is already in linux-pm/linux-next, I see 3 options:

1) I can bring a revert through superm1/linux.git to PR to linux-pm/linux-next and resubmit with fixes for you to take through tip.

2) Rafael can drop this and the follow on and I'll resubmit with your feedback and we can bring through tip

3) I can amend with the fixes we take through linux-pm/linux-next to avoid the acrobatics of 1 or 2.

Please let me know your preference.

maintainer
#5 lore raw

Re: [PATCH 1/2] x86/cpufeatures: Add feature bits for AMD heterogeneous processor

Quoted 5 lines · Mario Limonciello

2) Rafael can drop this and the follow on and I'll resubmit with your feedback and we can bring through tip

3) I can amend with the fixes we take through linux-pm/linux-next to avoid the acrobatics of 1 or 2.

Since I don't see any conflicts with tip yet and you have other stuff which is cross-tree, I could review the tip bits and then Rafael can pick them all up and route them through the pm tree.

Alternatively, I can route the tip bits through the tip tree and I can give Rafael an immutable tip branch he can merge and then rebase the remaining pm changes ontop.

Rafael?

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#6 lore raw

Re: [PATCH 1/2] x86/cpufeatures: Add feature bits for AMD heterogeneous processor

Quoted 12 lines · Borislav Petkov
Quoted 5 lines · Mario Limonciello

2) Rafael can drop this and the follow on and I'll resubmit with your feedback and we can bring through tip

3) I can amend with the fixes we take through linux-pm/linux-next to avoid the acrobatics of 1 or 2.

Since I don't see any conflicts with tip yet and you have other stuff which is cross-tree, I could review the tip bits and then Rafael can pick them all up and route them through the pm tree.

Quoted 5 lines

Alternatively, I can route the tip bits through the tip tree and I can give Rafael an immutable tip branch he can merge and then rebase the remaining pm changes ontop.

Rafael?

I'd prefer the former.

maintainer
#7 lore raw

Re: [PATCH 1/2] x86/cpufeatures: Add feature bits for AMD heterogeneous processor

Quoted 1 line · Rafael J. Wysocki

I'd prefer the former.

Ok, lemme look at those patches.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
maintainer
#10 lore raw

Re: [PATCH 2/2] CPPC: Use heterogeneous core topology for identifying boost numerator

In reply to Mario Limonciello
Quoted 1 line · Mario Limonciello

Subject: Re: [PATCH 2/2] CPPC: Use heterogeneous core topology for identifying boost numerator

The tip tree preferred format for patch subject prefixes is 'subsys/component:', e.g. 'x86/apic:', 'x86/mm/fault:', 'sched/fair:', 'genirq/core:'. Please do not use file names or complete file paths as prefix. 'git log path/to/file' should give you a reasonable hint in most cases.

The condensed patch description in the subject line should start with a uppercase letter and should be written in imperative tone.

arch/x86/include/asm/processor.h static inline u32 per_cpu_l2c_id(unsigned int cpu) · line 696

Quoted 11 lines
arch/x86/include/asm/processor.h +3 -0
index 4a686f0e5dbf..d81a6efa81bb 100644
@@ -691,6 +691,14 @@ static inline u32 per_cpu_l2c_id(unsigned int cpu)
 	return per_cpu(cpu_info.topo.l2c_id, cpu);
 }
 
+/* defined by CPUID_Fn80000026_EBX BIT [31:28] */
+enum amd_core_type {
+	CPU_CORE_TYPE_NO_HETERO_SUP = -1,

Why?

Why isn't this the last value in the enum without explicitly enumerating them?

arch/x86/include/asm/processor.h static inline u32 per_cpu_l2c_id(unsigned int cpu) · line 700

Quoted 4 lines
arch/x86/include/asm/processor.h +4 -0
+	CPU_CORE_TYPE_PERFORMANCE = 0,
+	CPU_CORE_TYPE_EFFICIENCY = 1,
+	CPU_CORE_TYPE_UNDEFINED = 2,
+};

That thing goes...

arch/x86/include/asm/processor.h static inline u32 per_cpu_l2c_id(unsigned int cpu) · line 702

Quoted 2 lines
arch/x86/include/asm/processor.h +1 -0
+
 #ifdef CONFIG_CPU_SUP_AMD

... in here.

Quoted 2 lines
arch/x86/include/asm/processor.h +0 -0
 /*
  * Issue a DIV 0/1 insn to clear any division data from previous DIV

...

Quoted 16 lines
arch/x86/kernel/cpu/amd.c +8 -0
index 015971adadfc..8ad5f1385f0e 100644
@@ -1204,3 +1204,32 @@ void amd_check_microcode(void)
 
 	on_each_cpu(zenbleed_check_cpu, NULL, 1);
 }
+
+/**
+ * amd_get_core_type - Heterogeneous core type identification
+ *
+ * Returns the CPU type [31:28] (i.e., performance or efficient) of
+ * a CPU in the processor.
+ *
+ * If the processor has no core type support, returns

arch/x86/kernel/cpu/amd.c void amd_check_microcode(void) · line 1224

Quoted 10 lines
arch/x86/kernel/cpu/amd.c +10 -0
+ * CPU_CORE_TYPE_NO_HETERO_SUP.
+ */
+enum amd_core_type amd_get_core_type(void)
+{
+	struct {
+		u32  num_processors             :16,
+		     power_efficiency_ranking   :8,
+		     native_model_id            :4,
+		     core_type                  :4;
+	} props;

So this thing wants to use this stuff here:

https://lore.kernel.org/r/[email protected]

and add the AMD part to the union. Instead of calling CPUID each time and adding an ugly export...

Quoted 14 lines
arch/x86/kernel/cpu/amd.c +11 -0
+
+	if (!cpu_feature_enabled(X86_FEATURE_HETERO_CORE_TOPOLOGY))
+		return CPU_CORE_TYPE_NO_HETERO_SUP;
+
+	cpuid_leaf_reg(0x80000026, CPUID_EBX, &props);
+	if (props.core_type >= CPU_CORE_TYPE_UNDEFINED)
+		return CPU_CORE_TYPE_UNDEFINED;
+
+	return props.core_type;
+}
+EXPORT_SYMBOL_GPL(amd_get_core_type);
Signature · 1 line
2.43.0
Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#11 lore raw

Re: [PATCH 2/2] CPPC: Use heterogeneous core topology for identifying boost numerator

Quoted 38 lines · Borislav Petkov
Quoted 1 line · Mario Limonciello

Subject: Re: [PATCH 2/2] CPPC: Use heterogeneous core topology for identifying boost numerator

The tip tree preferred format for patch subject prefixes is 'subsys/component:', e.g. 'x86/apic:', 'x86/mm/fault:', 'sched/fair:', 'genirq/core:'. Please do not use file names or complete file paths as prefix. 'git log path/to/file' should give you a reasonable hint in most cases.

The condensed patch description in the subject line should start with a uppercase letter and should be written in imperative tone.

arch/x86/include/asm/processor.h static inline u32 per_cpu_l2c_id(unsigned int cpu) · line 696

Quoted 11 lines
arch/x86/include/asm/processor.h +3 -0
index 4a686f0e5dbf..d81a6efa81bb 100644
@@ -691,6 +691,14 @@ static inline u32 per_cpu_l2c_id(unsigned int cpu)
  	return per_cpu(cpu_info.topo.l2c_id, cpu);
  }
 
+/* defined by CPUID_Fn80000026_EBX BIT [31:28] */
+enum amd_core_type {
+	CPU_CORE_TYPE_NO_HETERO_SUP = -1,

Why?

Why isn't this the last value in the enum without explicitly enumerating them?

arch/x86/include/asm/processor.h static inline u32 per_cpu_l2c_id(unsigned int cpu) · line 700

Quoted 4 lines
arch/x86/include/asm/processor.h +4 -0
+	CPU_CORE_TYPE_PERFORMANCE = 0,
+	CPU_CORE_TYPE_EFFICIENCY = 1,
+	CPU_CORE_TYPE_UNDEFINED = 2,
+};

That thing goes...

arch/x86/include/asm/processor.h static inline u32 per_cpu_l2c_id(unsigned int cpu) · line 702

Quoted 2 lines
arch/x86/include/asm/processor.h +1 -0
+
  #ifdef CONFIG_CPU_SUP_AMD
Quoted 7 lines

... in here.

Quoted 2 lines
arch/x86/include/asm/processor.h +0 -0
  /*
   * Issue a DIV 0/1 insn to clear any division data from previous DIV

...

Ack; will drop a series momentarily fixing this and your other above feedback.

Thx.

Quoted 29 lines
Quoted 16 lines
arch/x86/kernel/cpu/amd.c +8 -0
index 015971adadfc..8ad5f1385f0e 100644
@@ -1204,3 +1204,32 @@ void amd_check_microcode(void)
 
  	on_each_cpu(zenbleed_check_cpu, NULL, 1);
  }
+
+/**
+ * amd_get_core_type - Heterogeneous core type identification
+ *
+ * Returns the CPU type [31:28] (i.e., performance or efficient) of
+ * a CPU in the processor.
+ *
+ * If the processor has no core type support, returns

arch/x86/kernel/cpu/amd.c void amd_check_microcode(void) · line 1224

Quoted 10 lines
arch/x86/kernel/cpu/amd.c +10 -0
+ * CPU_CORE_TYPE_NO_HETERO_SUP.
+ */
+enum amd_core_type amd_get_core_type(void)
+{
+	struct {
+		u32  num_processors             :16,
+		     power_efficiency_ranking   :8,
+		     native_model_id            :4,
+		     core_type                  :4;
+	} props;

So this thing wants to use this stuff here:

Quoted 4 lines

https://lore.kernel.org/r/[email protected]

and add the AMD part to the union. Instead of calling CPUID each time and adding an ugly export...

Due to the cross tree landing complexity I'll rip this and the symbol out after that one lands (probably next cycle).

Quoted 16 lines
Quoted 15 lines
arch/x86/kernel/cpu/amd.c +11 -0
+
+	if (!cpu_feature_enabled(X86_FEATURE_HETERO_CORE_TOPOLOGY))
+		return CPU_CORE_TYPE_NO_HETERO_SUP;
+
+	cpuid_leaf_reg(0x80000026, CPUID_EBX, &props);
+	if (props.core_type >= CPU_CORE_TYPE_UNDEFINED)
+		return CPU_CORE_TYPE_UNDEFINED;
+
+	return props.core_type;
+}
+EXPORT_SYMBOL_GPL(amd_get_core_type);
Signature · 1 line
2.43.0