thermal: hisilicon: fix COMPILE_TEST dependencies
diff mbox

Message ID 20160826154434.992160-1-arnd@arndb.de
State Superseded, archived
Delegated to: Zhang Rui
Headers show

Commit Message

Arnd Bergmann Aug. 26, 2016, 3:44 p.m. UTC
As we now 'select STUB_CLK_HI6220', all dependencies for that driver have
to be present in order to enable HISI_THERMAL, as pointed out by
Kconfig:

warning: (HISI_THERMAL) selects STUB_CLK_HI6220 which has unmet direct dependencies (COMMON_CLK && COMMON_CLK_HI6220 && MAILBOX)

This rearranges the dependencies for this symbol, so all the dependencies
aside from ARCH_HISI are always met when building it for compile testing.
This mainly helps for randconfig testing, as an "allmodconfig" kernel will
enable them anyway.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5f63581ce68e ("thermal: hisilicon: Add dependency on the clock driver to allow frequency scaling")
---
 drivers/thermal/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Amit Kucheria Aug. 26, 2016, 5:12 p.m. UTC | #1
On Fri, Aug 26, 2016 at 9:14 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> As we now 'select STUB_CLK_HI6220', all dependencies for that driver have
> to be present in order to enable HISI_THERMAL, as pointed out by
> Kconfig:
>
> warning: (HISI_THERMAL) selects STUB_CLK_HI6220 which has unmet direct dependencies (COMMON_CLK && COMMON_CLK_HI6220 && MAILBOX)
>
> This rearranges the dependencies for this symbol, so all the dependencies
> aside from ARCH_HISI are always met when building it for compile testing.
> This mainly helps for randconfig testing, as an "allmodconfig" kernel will
> enable them anyway.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 5f63581ce68e ("thermal: hisilicon: Add dependency on the clock driver to allow frequency scaling")

Acked-by: Amit Kucheria <amit.kucheria@linaro.org>

> ---
>  drivers/thermal/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 5cba072c3a62..3c8607c07352 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -177,7 +177,8 @@ config THERMAL_EMULATION
>
>  config HISI_THERMAL
>         tristate "Hisilicon thermal driver"
> -       depends on (ARCH_HISI && CPU_THERMAL && OF) || COMPILE_TEST
> +       depends on ARCH_HISI || COMPILE_TEST
> +       depends on CPU_THERMAL && OF && COMMON_CLK_HI6220 && MAILBOX
>         depends on HAS_IOMEM
>         select STUB_CLK_HI6220
>         help
> --
> 2.9.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zhang Rui Aug. 29, 2016, 2 a.m. UTC | #2
On 五, 2016-08-26 at 17:44 +0200, Arnd Bergmann wrote:
> As we now 'select STUB_CLK_HI6220', all dependencies for that driver
> have
> to be present in order to enable HISI_THERMAL, as pointed out by
> Kconfig:
> 
> warning: (HISI_THERMAL) selects STUB_CLK_HI6220 which has unmet
> direct dependencies (COMMON_CLK && COMMON_CLK_HI6220 && MAILBOX)
> 
> This rearranges the dependencies for this symbol, so all the
> dependencies
> aside from ARCH_HISI are always met when building it for compile
> testing.
> This mainly helps for randconfig testing, as an "allmodconfig" kernel
> will
> enable them anyway.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 5f63581ce68e ("thermal: hisilicon: Add dependency on the clock
> driver to allow frequency scaling")

As commit 5f63581ce68e has not been shipped in upstream yet, please
fold this patch into the original one. I'd prefer one good patch
instead of a broken patch + a fix.

thanks,
rui
> ---
>  drivers/thermal/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 5cba072c3a62..3c8607c07352 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -177,7 +177,8 @@ config THERMAL_EMULATION
>  
>  config HISI_THERMAL
>  	tristate "Hisilicon thermal driver"
> -	depends on (ARCH_HISI && CPU_THERMAL && OF) || COMPILE_TEST
> +	depends on ARCH_HISI || COMPILE_TEST
> +	depends on CPU_THERMAL && OF && COMMON_CLK_HI6220 && MAILBOX
>  	depends on HAS_IOMEM
>  	select STUB_CLK_HI6220
>  	help
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Leo Yan Aug. 29, 2016, 2:25 a.m. UTC | #3
On Mon, Aug 29, 2016 at 10:00:52AM +0800, Zhang Rui wrote:
> On 五, 2016-08-26 at 17:44 +0200, Arnd Bergmann wrote:
> > As we now 'select STUB_CLK_HI6220', all dependencies for that driver
> > have
> > to be present in order to enable HISI_THERMAL, as pointed out by
> > Kconfig:
> > 
> > warning: (HISI_THERMAL) selects STUB_CLK_HI6220 which has unmet
> > direct dependencies (COMMON_CLK && COMMON_CLK_HI6220 && MAILBOX)
> > 
> > This rearranges the dependencies for this symbol, so all the
> > dependencies
> > aside from ARCH_HISI are always met when building it for compile
> > testing.
> > This mainly helps for randconfig testing, as an "allmodconfig" kernel
> > will
> > enable them anyway.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Fixes: 5f63581ce68e ("thermal: hisilicon: Add dependency on the clock
> > driver to allow frequency scaling")
> 
> As commit 5f63581ce68e has not been shipped in upstream yet, please
> fold this patch into the original one. I'd prefer one good patch
> instead of a broken patch + a fix.

Amit has one discussion with me, we have a more clear method to enable
Hisilicon thermal driver [1]: we are planning to enable
CONFIG_CPU_THERMAL in defconfig, and enable stub clock driver and
thermal driver depend on ARCH_HISI; so can resolve all dependency
issue.

I will prepare related patches and send out review ASAP, sorry for my
late.

[1] https://lkml.org/lkml/2016/8/8/879

Thanks,
Leo Yan

> > ---
> >  drivers/thermal/Kconfig | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> > index 5cba072c3a62..3c8607c07352 100644
> > --- a/drivers/thermal/Kconfig
> > +++ b/drivers/thermal/Kconfig
> > @@ -177,7 +177,8 @@ config THERMAL_EMULATION
> >  
> >  config HISI_THERMAL
> >  	tristate "Hisilicon thermal driver"
> > -	depends on (ARCH_HISI && CPU_THERMAL && OF) || COMPILE_TEST
> > +	depends on ARCH_HISI || COMPILE_TEST
> > +	depends on CPU_THERMAL && OF && COMMON_CLK_HI6220 && MAILBOX
> >  	depends on HAS_IOMEM
> >  	select STUB_CLK_HI6220
> >  	help
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 5cba072c3a62..3c8607c07352 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -177,7 +177,8 @@  config THERMAL_EMULATION
 
 config HISI_THERMAL
 	tristate "Hisilicon thermal driver"
-	depends on (ARCH_HISI && CPU_THERMAL && OF) || COMPILE_TEST
+	depends on ARCH_HISI || COMPILE_TEST
+	depends on CPU_THERMAL && OF && COMMON_CLK_HI6220 && MAILBOX
 	depends on HAS_IOMEM
 	select STUB_CLK_HI6220
 	help