* [PATCH] arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
@ 2020-07-29 13:57 ` Valentin Schneider
0 siblings, 0 replies; 5+ messages in thread
From: Valentin Schneider @ 2020-07-29 13:57 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel, linux-pm
Cc: Qian Cai, Russell King, Thara Gopinath, Sudeep Holla,
Amit Daniel Kachhap, Daniel Lezcano, Viresh Kumar, Ingo Molnar,
Peter Zijlstra, Juri Lelli, Vincent Guittot, Dietmar Eggemann,
Quentin Perret
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(-)
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
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
@ 2020-07-29 13:57 ` Valentin Schneider
0 siblings, 0 replies; 5+ messages in thread
From: Valentin Schneider @ 2020-07-29 13:57 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel, linux-pm
Cc: Juri Lelli, Vincent Guittot, Quentin Perret, Peter Zijlstra,
Viresh Kumar, Amit Daniel Kachhap, Daniel Lezcano, Russell King,
Thara Gopinath, Dietmar Eggemann, Qian Cai, Sudeep Holla,
Ingo Molnar
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(-)
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
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [tip: sched/core] arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
2020-07-29 13:57 ` Valentin Schneider
(?)
@ 2020-07-29 14:33 ` tip-bot2 for Valentin Schneider
-1 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Valentin Schneider @ 2020-07-29 14:33 UTC (permalink / raw)
To: linux-tip-commits
Cc: Qian Cai, Valentin Schneider, Peter Zijlstra (Intel), x86, LKML
The following commit has been merged into the sched/core branch of tip:
Commit-ID: fcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6
Gitweb: https://git.kernel.org/tip/fcd7c9c3c35aed58aba2eea6d375f0e5b03bd6d6
Author: Valentin Schneider <valentin.schneider@arm.com>
AuthorDate: Wed, 29 Jul 2020 14:57:18 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 29 Jul 2020 16:14:16 +02:00
arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
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>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200729135718.1871-1-valentin.schneider@arm.com
---
arch/arm/Kconfig | 1 -
arch/arm64/Kconfig | 1 -
init/Kconfig | 2 ++
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 939c4d6..2ac7490 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -46,7 +46,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 c403e6f..66dc41f 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 0a97d85..9f7f249 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
2020-07-29 13:57 ` Valentin Schneider
@ 2020-07-30 10:23 ` Catalin Marinas
-1 siblings, 0 replies; 5+ messages in thread
From: Catalin Marinas @ 2020-07-30 10:23 UTC (permalink / raw)
To: Valentin Schneider
Cc: linux-kernel, linux-arm-kernel, linux-pm, Juri Lelli,
Vincent Guittot, Quentin Perret, Peter Zijlstra, Viresh Kumar,
Amit Daniel Kachhap, Daniel Lezcano, Russell King,
Thara Gopinath, Dietmar Eggemann, Qian Cai, Sudeep Holla,
Ingo Molnar
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE
@ 2020-07-30 10:23 ` Catalin Marinas
0 siblings, 0 replies; 5+ messages in thread
From: Catalin Marinas @ 2020-07-30 10:23 UTC (permalink / raw)
To: Valentin Schneider
Cc: Juri Lelli, Daniel Lezcano, Vincent Guittot, Quentin Perret,
Peter Zijlstra, Viresh Kumar, Amit Daniel Kachhap, linux-pm,
linux-kernel, Thara Gopinath, Russell King, Ingo Molnar,
Qian Cai, Sudeep Holla, Dietmar Eggemann, linux-arm-kernel
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>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-30 10:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 13:57 [PATCH] arm, arm64: Fix selection of CONFIG_SCHED_THERMAL_PRESSURE Valentin Schneider
2020-07-29 13:57 ` Valentin Schneider
2020-07-29 14:33 ` [tip: sched/core] " tip-bot2 for Valentin Schneider
2020-07-30 10:23 ` [PATCH] " Catalin Marinas
2020-07-30 10:23 ` Catalin Marinas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.