Skip to content

Commit b79276d

Browse files
superm1rafaeljw
authored andcommitted
ACPI: processor: Move arch_init_invariance_cppc() call later
arch_init_invariance_cppc() is called at the end of acpi_cppc_processor_probe() in order to configure frequency invariance based upon the values from _CPC. This however doesn't work on AMD CPPC shared memory designs that have AMD preferred cores enabled because _CPC needs to be analyzed from all cores to judge if preferred cores are enabled. This issue manifests to users as a warning since commit 21fb59a ("ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn"): ``` Could not retrieve highest performance (-19) ``` However the warning isn't the cause of this, it was actually commit 279f838 ("x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()") which exposed the issue. To fix this problem, change arch_init_invariance_cppc() into a new weak symbol that is called at the end of acpi_processor_driver_init(). Each architecture that supports it can declare the symbol to override the weak one. Define it for x86, in arch/x86/kernel/acpi/cppc.c, and for all of the architectures using the generic arch_topology.c code. Fixes: 279f838 ("x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()") Reported-by: Ivan Shapovalov <intelfx@intelfx.name> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219431 Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Link: https://patch.msgid.link/20241104222855.3959267-1-superm1@kernel.org [ rjw: Changelog edit ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 59b723c commit b79276d

File tree

8 files changed

+22
-21
lines changed

8 files changed

+22
-21
lines changed

arch/arm64/include/asm/topology.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ void update_freq_counters_refs(void);
2626
#define arch_scale_freq_invariant topology_scale_freq_invariant
2727
#define arch_scale_freq_ref topology_get_freq_ref
2828

29-
#ifdef CONFIG_ACPI_CPPC_LIB
30-
#define arch_init_invariance_cppc topology_init_cpu_capacity_cppc
31-
#endif
32-
3329
/* Replace task scheduler's default cpu-invariant accounting */
3430
#define arch_scale_cpu_capacity topology_get_cpu_scale
3531

arch/x86/include/asm/topology.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,4 @@ static inline void freq_invariance_set_perf_ratio(u64 ratio, bool turbo_disabled
305305
extern void arch_scale_freq_tick(void);
306306
#define arch_scale_freq_tick arch_scale_freq_tick
307307

308-
#ifdef CONFIG_ACPI_CPPC_LIB
309-
void init_freq_invariance_cppc(void);
310-
#define arch_init_invariance_cppc init_freq_invariance_cppc
311-
#endif
312-
313308
#endif /* _ASM_X86_TOPOLOGY_H */

arch/x86/kernel/acpi/cppc.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static void amd_set_max_freq_ratio(void)
110110

111111
static DEFINE_MUTEX(freq_invariance_lock);
112112

113-
void init_freq_invariance_cppc(void)
113+
static inline void init_freq_invariance_cppc(void)
114114
{
115115
static bool init_done;
116116

@@ -127,6 +127,11 @@ void init_freq_invariance_cppc(void)
127127
mutex_unlock(&freq_invariance_lock);
128128
}
129129

130+
void acpi_processor_init_invariance_cppc(void)
131+
{
132+
init_freq_invariance_cppc();
133+
}
134+
130135
/*
131136
* Get the highest performance register value.
132137
* @cpu: CPU from which to get highest performance.

drivers/acpi/cppc_acpi.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,10 +671,6 @@ static int pcc_data_alloc(int pcc_ss_id)
671671
* )
672672
*/
673673

674-
#ifndef arch_init_invariance_cppc
675-
static inline void arch_init_invariance_cppc(void) { }
676-
#endif
677-
678674
/**
679675
* acpi_cppc_processor_probe - Search for per CPU _CPC objects.
680676
* @pr: Ptr to acpi_processor containing this CPU's logical ID.
@@ -905,8 +901,6 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
905901
goto out_free;
906902
}
907903

908-
arch_init_invariance_cppc();
909-
910904
kfree(output.pointer);
911905
return 0;
912906

drivers/acpi/processor_driver.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ static struct notifier_block acpi_processor_notifier_block = {
237237
.notifier_call = acpi_processor_notifier,
238238
};
239239

240+
void __weak acpi_processor_init_invariance_cppc(void)
241+
{ }
242+
240243
/*
241244
* We keep the driver loaded even when ACPI is not running.
242245
* This is needed for the powernow-k8 driver, that works even without
@@ -270,6 +273,12 @@ static int __init acpi_processor_driver_init(void)
270273
NULL, acpi_soft_cpu_dead);
271274

272275
acpi_processor_throttling_init();
276+
277+
/*
278+
* Frequency invariance calculations on AMD platforms can't be run until
279+
* after acpi_cppc_processor_probe() has been called for all online CPUs
280+
*/
281+
acpi_processor_init_invariance_cppc();
273282
return 0;
274283
err:
275284
driver_unregister(&acpi_processor_driver);

drivers/base/arch_topology.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ void __weak freq_inv_set_max_ratio(int cpu, u64 max_rate)
366366
#ifdef CONFIG_ACPI_CPPC_LIB
367367
#include <acpi/cppc_acpi.h>
368368

369-
void topology_init_cpu_capacity_cppc(void)
369+
static inline void topology_init_cpu_capacity_cppc(void)
370370
{
371371
u64 capacity, capacity_scale = 0;
372372
struct cppc_perf_caps perf_caps;
@@ -417,6 +417,10 @@ void topology_init_cpu_capacity_cppc(void)
417417
exit:
418418
free_raw_capacity();
419419
}
420+
void acpi_processor_init_invariance_cppc(void)
421+
{
422+
topology_init_cpu_capacity_cppc();
423+
}
420424
#endif
421425

422426
#ifdef CONFIG_CPU_FREQ

include/acpi/processor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,4 +465,6 @@ extern int acpi_processor_ffh_lpi_probe(unsigned int cpu);
465465
extern int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi);
466466
#endif
467467

468+
void acpi_processor_init_invariance_cppc(void);
469+
468470
#endif

include/linux/arch_topology.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
void topology_normalize_cpu_scale(void);
1212
int topology_update_cpu_topology(void);
1313

14-
#ifdef CONFIG_ACPI_CPPC_LIB
15-
void topology_init_cpu_capacity_cppc(void);
16-
#endif
17-
1814
struct device_node;
1915
bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu);
2016

0 commit comments

Comments
 (0)