Message ID | 20210421135723.3601743-1-arnd@kernel.org |
---|---|
State | New |
Headers | show |
Series | cpuidle: qcom_scm: fix Kconfig dependencies again | expand |
On Wed, 21 Apr 2021 at 15:57, Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > The previous compile time fix was incomplete and still results in > warnings like: > > WARNING: unmet direct dependencies detected for ARM_CPU_SUSPEND > Depends on [n]: ARCH_SUSPEND_POSSIBLE [=n] > Selected by [y]: > - ARM_QCOM_SPM_CPUIDLE [=y] && CPU_IDLE [=y] && (ARM [=y] || ARM64) && (ARCH_QCOM [=n] || COMPILE_TEST [=y]) && !ARM64 && MMU [=y] > > WARNING: unmet direct dependencies detected for QCOM_SCM > Depends on [n]: (ARM [=y] || ARM64) && HAVE_ARM_SMCCC [=n] > Selected by [y]: > - ARM_QCOM_SPM_CPUIDLE [=y] && CPU_IDLE [=y] && (ARM [=y] || ARM64) && (ARCH_QCOM [=n] || COMPILE_TEST [=y]) && !ARM64 && MMU [=y] > > Use a dependency on ARCH_SUSPEND_POSSIBLE as a prerequisite for > selecting ARM_CPU_SUSPEND, and a dependency on HAVE_ARM_SMCCC > for QCOM_SCM. > > Fixes: 498ba2a8a275 ("cpuidle: Fix ARM_QCOM_SPM_CPUIDLE configuration") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Looks like this isn't applied yet, feel free to add: Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > drivers/cpuidle/Kconfig.arm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm > index 334f83e56120..fc596494251c 100644 > --- a/drivers/cpuidle/Kconfig.arm > +++ b/drivers/cpuidle/Kconfig.arm > @@ -107,7 +107,8 @@ config ARM_TEGRA_CPUIDLE > > config ARM_QCOM_SPM_CPUIDLE > bool "CPU Idle Driver for Qualcomm Subsystem Power Manager (SPM)" > - depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64 && MMU > + depends on ARCH_QCOM || (ARCH_SUSPEND_POSSIBLE && COMPILE_TEST) > + depends on ARM && HAVE_ARM_SMCCC > select ARM_CPU_SUSPEND > select CPU_IDLE_MULTIPLE_DRIVERS > select DT_IDLE_STATES > -- > 2.29.2 >
Hi-- Can we get Arnd's patch merged, please? It's been awhile... On 4/21/21 06:57, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The previous compile time fix was incomplete and still results in > warnings like: > > WARNING: unmet direct dependencies detected for ARM_CPU_SUSPEND > Depends on [n]: ARCH_SUSPEND_POSSIBLE [=n] > Selected by [y]: > - ARM_QCOM_SPM_CPUIDLE [=y] && CPU_IDLE [=y] && (ARM [=y] || ARM64) && (ARCH_QCOM [=n] || COMPILE_TEST [=y]) && !ARM64 && MMU [=y] > > WARNING: unmet direct dependencies detected for QCOM_SCM > Depends on [n]: (ARM [=y] || ARM64) && HAVE_ARM_SMCCC [=n] > Selected by [y]: > - ARM_QCOM_SPM_CPUIDLE [=y] && CPU_IDLE [=y] && (ARM [=y] || ARM64) && (ARCH_QCOM [=n] || COMPILE_TEST [=y]) && !ARM64 && MMU [=y] > > Use a dependency on ARCH_SUSPEND_POSSIBLE as a prerequisite for > selecting ARM_CPU_SUSPEND, and a dependency on HAVE_ARM_SMCCC > for QCOM_SCM. > > Fixes: 498ba2a8a275 ("cpuidle: Fix ARM_QCOM_SPM_CPUIDLE configuration") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> > --- > drivers/cpuidle/Kconfig.arm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm > index 334f83e56120..fc596494251c 100644 > --- a/drivers/cpuidle/Kconfig.arm > +++ b/drivers/cpuidle/Kconfig.arm > @@ -107,7 +107,8 @@ config ARM_TEGRA_CPUIDLE > > config ARM_QCOM_SPM_CPUIDLE > bool "CPU Idle Driver for Qualcomm Subsystem Power Manager (SPM)" > - depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64 && MMU > + depends on ARCH_QCOM || (ARCH_SUSPEND_POSSIBLE && COMPILE_TEST) > + depends on ARM && HAVE_ARM_SMCCC > select ARM_CPU_SUSPEND > select CPU_IDLE_MULTIPLE_DRIVERS > select DT_IDLE_STATES Thanks.
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 334f83e56120..fc596494251c 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -107,7 +107,8 @@ config ARM_TEGRA_CPUIDLE config ARM_QCOM_SPM_CPUIDLE bool "CPU Idle Driver for Qualcomm Subsystem Power Manager (SPM)" - depends on (ARCH_QCOM || COMPILE_TEST) && !ARM64 && MMU + depends on ARCH_QCOM || (ARCH_SUSPEND_POSSIBLE && COMPILE_TEST) + depends on ARM && HAVE_ARM_SMCCC select ARM_CPU_SUSPEND select CPU_IDLE_MULTIPLE_DRIVERS select DT_IDLE_STATES