From patchwork Sat Nov 2 03:23:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 840287 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C94F1DFE4; Sat, 2 Nov 2024 03:24:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730517845; cv=none; b=aoOVamDBN6uYmbf4T0+bBGqeeIngkRo44gJ9xDPIP43PF/yEu+fxPIY+I9B8wNSom9g/uoDGW1/87c82ht7um7U9Amqfzasc9M2IDNcs6xj5/jB99nWs4lvxPBT+ShH1vkB2+U70F2T7OQu9iUQ215nQbJGL5k/r3cPnOAP1/Pw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730517845; c=relaxed/simple; bh=n8Vv+Z6+NIqGCZw5suI3S/XCZD0NN/HIjS04JYWvY3g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JdIAHhle18tn8ZFREpVuE+TVmmEfCS+odIWZ3mkDiHt0NGKhk4gwTbpTqLn594JISX6BlRfdrw2OIL3Tenv9evdCn7AFfDW7rx8N5r3AdlXTsNJkYwjHCJoByzmGJ0nWUKbSSb+DAN9gsp6SiOo1lqT97M2Fb5fp3kBZBeO8INo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iaj0x7uy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iaj0x7uy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5985EC4CEC3; Sat, 2 Nov 2024 03:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730517844; bh=n8Vv+Z6+NIqGCZw5suI3S/XCZD0NN/HIjS04JYWvY3g=; h=From:To:Cc:Subject:Date:From; b=iaj0x7uy2+inhHIfFx43iqUx1d0sMjniYkb855EyYPYcfPIWGo9G22gysbaGNPIH/ niWmdsEvYw7a2cw9Xg8UH6LK8izbSoAeilyyWYZ7OHS7eBWmxUSp/si1pT9XKNMr5C ydo17CWaRPo4DZ2xTf5ClLSvdV5f/fxYUIq1ubIF9ZY0CZBXZJGjuuMxTeHOt/Qscb nKnAmTXD8YtckIaxJXLNu99nGlQCcZt8BvpFbzlSibnGBZRGi/6eLs5FwZ4thjenbl ObOrlpw4KLJOjjooAPjVEjLmrOYcV1QVX25aRQDDoplqpzIZVd79XnTFsqLAmlHS7j HMi5yWhLCVBSA== From: Mario Limonciello To: Borislav Petkov , "Rafael J . Wysocki" Cc: Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H . Peter Anvin" , Len Brown , Peter Zijlstra , Mario Limonciello , "Gautham R . Shenoy" , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)), linux-acpi@vger.kernel.org (open list:ACPI), Ivan Shapovalov , Oleksandr Natalenko Subject: [PATCH v2] ACPI: processor: Move arch_init_invariance_cppc() call later Date: Fri, 1 Nov 2024 22:23:53 -0500 Message-ID: <20241102032353.2372544-1-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Mario Limonciello 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 21fb59ab4b97 ("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 279f838a61f9 ("x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()") which exposed the issue. To fix this problem, push the call to the arch_init_invariance_cppc() macro to the end of acpi_processor_driver_init(). Fixes: 279f838a61f9 ("x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()") Reported-by: Ivan Shapovalov Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219431 Tested-by: Oleksandr Natalenko Signed-off-by: Mario Limonciello --- v1->v2: * Fix LKP robot issue when CONFIG_ACPI_CPPC_LIB not defined --- arch/x86/include/asm/topology.h | 2 ++ drivers/acpi/cppc_acpi.c | 6 ------ drivers/acpi/processor_driver.c | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index abe3a8f22cbd..b04c5db7e945 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -295,6 +295,8 @@ extern void arch_scale_freq_tick(void); #ifdef CONFIG_ACPI_CPPC_LIB void init_freq_invariance_cppc(void); #define arch_init_invariance_cppc init_freq_invariance_cppc +#else +static inline void arch_init_invariance_cppc(void) { } #endif #endif /* _ASM_X86_TOPOLOGY_H */ diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index ed91dfd4fdca..9d48cd706659 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -671,10 +671,6 @@ static int pcc_data_alloc(int pcc_ss_id) * ) */ -#ifndef arch_init_invariance_cppc -static inline void arch_init_invariance_cppc(void) { } -#endif - /** * acpi_cppc_processor_probe - Search for per CPU _CPC objects. * @pr: Ptr to acpi_processor containing this CPU's logical ID. @@ -905,8 +901,6 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) goto out_free; } - arch_init_invariance_cppc(); - kfree(output.pointer); return 0; diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index cb52dd000b95..59620e7bc664 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -270,6 +270,7 @@ static int __init acpi_processor_driver_init(void) NULL, acpi_soft_cpu_dead); acpi_processor_throttling_init(); + arch_init_invariance_cppc(); return 0; err: driver_unregister(&acpi_processor_driver);