| Message ID | 20200729135718.1871-1-valentin.schneider@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | fcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6 |
| Headers | show |
| Series | arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE | expand |
On Wed, Jul 29, 2020 at 02:57:18PM +0100, Valentin Schneider wrote: > Qian reported that the current setup forgoes the Kconfig dependencies and > results in warnings such as: > > WARNING: unmet direct dependencies detected for SCHED_THERMAL_PRESSURE > Depends on [n]: SMP [=y] && CPU_FREQ_THERMAL [=n] > Selected by [y]: > - ARM64 [=y] > > Revert commit > > e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE") > > and re-implement it by making the option default to 'y' for arm64 and arm, > which respects Kconfig dependencies (i.e. will remain 'n' if > CPU_FREQ_THERMAL=n). > > Fixes: e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE") > Reported-by: Qian Cai <cai@lca.pw> > Signed-off-by: Valentin Schneider <valentin.schneider@arm.com> > --- > arch/arm/Kconfig | 1 - > arch/arm64/Kconfig | 1 - > init/Kconfig | 2 ++ > 3 files changed, 2 insertions(+), 2 deletions(-) Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6cd0f9f086f6..809e8047d669 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -47,7 +47,6 @@ config ARM select EDAC_ATOMIC_SCRUB select GENERIC_ALLOCATOR select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY - select SCHED_THERMAL_PRESSURE if ARM_CPU_TOPOLOGY select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_AUTOPROBE diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 2d4abbc9f8d0..baffe8b66da2 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -192,7 +192,6 @@ config ARM64 select PCI_SYSCALL if PCI select POWER_RESET select POWER_SUPPLY - select SCHED_THERMAL_PRESSURE select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE diff --git a/init/Kconfig b/init/Kconfig index 37b089f87804..f2244892d7a8 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -493,6 +493,8 @@ config HAVE_SCHED_AVG_IRQ config SCHED_THERMAL_PRESSURE bool + default y if ARM && ARM_CPU_TOPOLOGY + default y if ARM64 depends on SMP depends on CPU_FREQ_THERMAL help
Qian reported that the current setup forgoes the Kconfig dependencies and results in warnings such as: WARNING: unmet direct dependencies detected for SCHED_THERMAL_PRESSURE Depends on [n]: SMP [=y] && CPU_FREQ_THERMAL [=n] Selected by [y]: - ARM64 [=y] Revert commit e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE") and re-implement it by making the option default to 'y' for arm64 and arm, which respects Kconfig dependencies (i.e. will remain 'n' if CPU_FREQ_THERMAL=n). Fixes: e17ae7fea871 ("arm, arm64: Select CONFIG_SCHED_THERMAL_PRESSURE") Reported-by: Qian Cai <cai@lca.pw> Signed-off-by: Valentin Schneider <valentin.schneider@arm.com> --- arch/arm/Kconfig | 1 - arch/arm64/Kconfig | 1 - init/Kconfig | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-)