Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1589778 > unrolled thread

[PATCH 0/8] watchdog fixes for COMPILE_TEST change

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/8] watchdog fixes for COMPILE_TEST change Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:10 +0100
    [PATCH 8/8] watchdog: kempld: revert to full dependency Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:20 +0100
      Re: [PATCH 8/8] watchdog: kempld: revert to full dependency Guenter Roeck <linux@roeck-us.net> - 2017-03-01 02:20 +0100
    [PATCH 4/8] watchdog: geode: restore hard CS5535_MFGPT dependency Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:20 +0100
      Re: [PATCH 4/8] watchdog: geode: restore hard CS5535_MFGPT dependency Guenter Roeck <linux@roeck-us.net> - 2017-02-28 22:50 +0100
    [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:20 +0100
      Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface Guenter Roeck <linux@roeck-us.net> - 2017-02-28 22:50 +0100
        Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface Arnd Bergmann <arnd@arndb.de> - 2017-03-01 01:10 +0100
          Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface Guenter Roeck <linux@roeck-us.net> - 2017-03-01 01:40 +0100
          Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface Guenter Roeck <linux@roeck-us.net> - 2017-03-01 04:10 +0100
            Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface Arnd Bergmann <arnd@arndb.de> - 2017-03-01 10:50 +0100
    [PATCH 6/8] watchdog: sp805: add back AMBA dependency Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:20 +0100
      Re: [PATCH 6/8] watchdog: sp805: add back AMBA dependency Guenter Roeck <linux@roeck-us.net> - 2017-02-28 22:50 +0100
    Re: [PATCH 0/8] watchdog fixes for COMPILE_TEST change Guenter Roeck <linux@roeck-us.net> - 2017-02-28 22:40 +0100
    [PATCH 5/8] watchdog: menf21bmc: add I2C dependency Arnd Bergmann <arnd@arndb.de> - 2017-02-28 22:40 +0100
      Re: [PATCH 5/8] watchdog: menf21bmc: add I2C dependency Guenter Roeck <linux@roeck-us.net> - 2017-02-28 22:50 +0100

#1589778 — [PATCH 0/8] watchdog fixes for COMPILE_TEST change

Hi Guenter,

I noticed your change to enable lots of watchdog drivers for compile
testing in linux-next today. While this is generally a great idea,
I'm not entirely sure why this appeared during the merge window.

I case you plan to have this merged into v4.11, please make sure
to get the fixups in. I found eight drivers that now have incorrect
dependencies. For two of them I changed the MFD code, for the others
I just adapted the Kconfig dependencies, mostly by reverting
part of your patch.

    Arnd

[toc] | [next] | [standalone]

#1589779 — [PATCH 8/8] watchdog: kempld: revert to full dependency

The kempld watchdog driver requires the respective MFD driver:

drivers/watchdog/built-in.o: In function `kempld_wdt_probe':
kempld_wdt.c:(.text+0x5c78): undefined reference to `kempld_get_mutex'
kempld_wdt.c:(.text+0x5c84): undefined reference to `kempld_read8'
kempld_wdt.c:(.text+0x5c8e): undefined reference to `kempld_release_mutex'
kempld_wdt.c:(.text+0x5d1c): undefined reference to `kempld_read8'
kempld_wdt.c:(.text+0x5d2c): undefined reference to `kempld_write8'

This adds the Kconfig dependency back.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 8cb9b986ee2d..fcaab3139a5c 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1064,7 +1064,7 @@ config HP_WATCHDOG
 
 config KEMPLD_WDT
 	tristate "Kontron COM Watchdog Timer"
-	depends on MFD_KEMPLD || COMPILE_TEST
+	depends on MFD_KEMPLD
 	select WATCHDOG_CORE
 	help
 	  Support for the PLD watchdog on some Kontron ETX and COMexpress
-- 
2.9.0

[toc] | [prev] | [next] | [standalone]

#1589925 — Re: [PATCH 8/8] watchdog: kempld: revert to full dependency

On Tue, Feb 28, 2017 at 10:01:23PM +0100, Arnd Bergmann wrote:
> The kempld watchdog driver requires the respective MFD driver:
> 
> drivers/watchdog/built-in.o: In function `kempld_wdt_probe':
> kempld_wdt.c:(.text+0x5c78): undefined reference to `kempld_get_mutex'
> kempld_wdt.c:(.text+0x5c84): undefined reference to `kempld_read8'
> kempld_wdt.c:(.text+0x5c8e): undefined reference to `kempld_release_mutex'
> kempld_wdt.c:(.text+0x5d1c): undefined reference to `kempld_read8'
> kempld_wdt.c:(.text+0x5d2c): undefined reference to `kempld_write8'
> 
> This adds the Kconfig dependency back.
> 
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/watchdog/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 8cb9b986ee2d..fcaab3139a5c 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1064,7 +1064,7 @@ config HP_WATCHDOG
>  
>  config KEMPLD_WDT
>  	tristate "Kontron COM Watchdog Timer"
> -	depends on MFD_KEMPLD || COMPILE_TEST
> +	depends on MFD_KEMPLD

Randy suggested:

-       depends on MFD_KEMPLD || COMPILE_TEST
+       depends on MFD_KEMPLD || (MFD_KEMPLD=y && COMPILE_TEST)

... though I guess that boils down to the same.

Guenter

>  	select WATCHDOG_CORE
>  	help
>  	  Support for the PLD watchdog on some Kontron ETX and COMexpress
> -- 
> 2.9.0
> 

[toc] | [prev] | [next] | [standalone]

#1589783 — [PATCH 4/8] watchdog: geode: restore hard CS5535_MFGPT dependency

Wtihout CONFIG_CS5535_MFGPT, the driver does not link right:

drivers/watchdog/built-in.o: In function `geodewdt_probe':
geodewdt.c:(.init.text+0xca3): undefined reference to `cs5535_mfgpt_alloc_timer'
geodewdt.c:(.init.text+0xcd4): undefined reference to `cs5535_mfgpt_write'
geodewdt.c:(.init.text+0xcef): undefined reference to `cs5535_mfgpt_toggle_event'

This adds back the dependency on this base driver.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 34a927703d64..de52495ef150 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -851,7 +851,7 @@ config SP5100_TCO
 
 config GEODE_WDT
 	tristate "AMD Geode CS5535/CS5536 Watchdog"
-	depends on CS5535_MFGPT || (X86 && COMPILE_TEST)
+	depends on CS5535_MFGPT
 	help
 	  This driver enables a watchdog capability built into the
 	  CS5535/CS5536 companion chips for the AMD Geode GX and LX
-- 
2.9.0

[toc] | [prev] | [next] | [standalone]

#1589825 — Re: [PATCH 4/8] watchdog: geode: restore hard CS5535_MFGPT dependency

On Tue, Feb 28, 2017 at 10:01:19PM +0100, Arnd Bergmann wrote:
> Wtihout CONFIG_CS5535_MFGPT, the driver does not link right:
> 
> drivers/watchdog/built-in.o: In function `geodewdt_probe':
> geodewdt.c:(.init.text+0xca3): undefined reference to `cs5535_mfgpt_alloc_timer'
> geodewdt.c:(.init.text+0xcd4): undefined reference to `cs5535_mfgpt_write'
> geodewdt.c:(.init.text+0xcef): undefined reference to `cs5535_mfgpt_toggle_event'
> 
> This adds back the dependency on this base driver.
> 
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 34a927703d64..de52495ef150 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -851,7 +851,7 @@ config SP5100_TCO
>  
>  config GEODE_WDT
>  	tristate "AMD Geode CS5535/CS5536 Watchdog"
> -	depends on CS5535_MFGPT || (X86 && COMPILE_TEST)
> +	depends on CS5535_MFGPT
>  	help
>  	  This driver enables a watchdog capability built into the
>  	  CS5535/CS5536 companion chips for the AMD Geode GX and LX
> -- 
> 2.9.0
> 

[toc] | [prev] | [next] | [standalone]

#1589786 — [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface

When the db8500 watchdog is enabled without the PRCMU, we get a lot of
warnings about duplicate or missing helper functions:

In file included from drivers/watchdog/ux500_wdt.c:21:0:
include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
 static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)

This removes the duplicate function definitions and moves the helpers in
dbx500-prcmu outside of the #ifdef that hides them.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/mfd/db8500-prcmu.h | 27 ----------------------
 include/linux/mfd/dbx500-prcmu.h | 49 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index 7ba67b55b312..ac9b8a6b8e9c 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -500,17 +500,12 @@ void prcmu_configure_auto_pm(struct prcmu_auto_pm_config *sleep,
 	struct prcmu_auto_pm_config *idle);
 bool prcmu_is_auto_pm_enabled(void);
 
-int prcmu_config_clkout(u8 clkout, u8 source, u8 div);
 int prcmu_set_clock_divider(u8 clock, u8 divider);
 int db8500_prcmu_config_hotdog(u8 threshold);
 int db8500_prcmu_config_hotmon(u8 low, u8 high);
 int db8500_prcmu_start_temp_sense(u16 cycles32k);
 int db8500_prcmu_stop_temp_sense(void);
-int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
-int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
 
-int prcmu_ac_wake_req(void);
-void prcmu_ac_sleep_req(void);
 void db8500_prcmu_modem_reset(void);
 
 int db8500_prcmu_config_a9wdog(u8 num, bool sleep_auto_off);
@@ -608,11 +603,6 @@ static inline bool prcmu_is_auto_pm_enabled(void)
 	return false;
 }
 
-static inline int prcmu_config_clkout(u8 clkout, u8 source, u8 div)
-{
-	return 0;
-}
-
 static inline int prcmu_set_clock_divider(u8 clock, u8 divider)
 {
 	return 0;
@@ -638,23 +628,6 @@ static inline int db8500_prcmu_stop_temp_sense(void)
 	return 0;
 }
 
-static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
-{
-	return -ENOSYS;
-}
-
-static inline int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
-{
-	return -ENOSYS;
-}
-
-static inline int prcmu_ac_wake_req(void)
-{
-	return 0;
-}
-
-static inline void prcmu_ac_sleep_req(void) {}
-
 static inline void db8500_prcmu_modem_reset(void) {}
 
 static inline void db8500_prcmu_system_reset(u16 reset_code) {}
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index 2e2c6a63a065..533459c7ad08 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -376,30 +376,6 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value)
 	db8500_prcmu_write_masked(reg, mask, value);
 }
 
-static inline int prcmu_enable_a9wdog(u8 id)
-{
-	return db8500_prcmu_enable_a9wdog(id);
-}
-
-static inline int prcmu_disable_a9wdog(u8 id)
-{
-	return db8500_prcmu_disable_a9wdog(id);
-}
-
-static inline int prcmu_kick_a9wdog(u8 id)
-{
-	return db8500_prcmu_kick_a9wdog(id);
-}
-
-static inline int prcmu_load_a9wdog(u8 id, u32 timeout)
-{
-	return db8500_prcmu_load_a9wdog(id, timeout);
-}
-
-static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
-{
-	return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
-}
 #else
 
 static inline void prcmu_early_init(u32 phy_base, u32 size) {}
@@ -569,6 +545,31 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
 
 #endif
 
+static inline int prcmu_enable_a9wdog(u8 id)
+{
+	return db8500_prcmu_enable_a9wdog(id);
+}
+
+static inline int prcmu_disable_a9wdog(u8 id)
+{
+	return db8500_prcmu_disable_a9wdog(id);
+}
+
+static inline int prcmu_kick_a9wdog(u8 id)
+{
+	return db8500_prcmu_kick_a9wdog(id);
+}
+
+static inline int prcmu_load_a9wdog(u8 id, u32 timeout)
+{
+	return db8500_prcmu_load_a9wdog(id, timeout);
+}
+
+static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
+{
+	return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
+}
+
 static inline void prcmu_set(unsigned int reg, u32 bits)
 {
 	prcmu_write_masked(reg, bits, bits);
-- 
2.9.0

[toc] | [prev] | [next] | [standalone]

#1589826 — Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface

On Tue, Feb 28, 2017 at 10:01:17PM +0100, Arnd Bergmann wrote:
> When the db8500 watchdog is enabled without the PRCMU, we get a lot of
> warnings about duplicate or missing helper functions:
> 
> In file included from drivers/watchdog/ux500_wdt.c:21:0:
> include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
>  static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
> 
> This removes the duplicate function definitions and moves the helpers in
> dbx500-prcmu outside of the #ifdef that hides them.
> 

Is that appropriate ? Maybe we should just disable COMPILE_TEST
for this driver instead.

> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  include/linux/mfd/db8500-prcmu.h | 27 ----------------------
>  include/linux/mfd/dbx500-prcmu.h | 49 ++++++++++++++++++++--------------------
>  2 files changed, 25 insertions(+), 51 deletions(-)
> 
> diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
> index 7ba67b55b312..ac9b8a6b8e9c 100644
> --- a/include/linux/mfd/db8500-prcmu.h
> +++ b/include/linux/mfd/db8500-prcmu.h
> @@ -500,17 +500,12 @@ void prcmu_configure_auto_pm(struct prcmu_auto_pm_config *sleep,
>  	struct prcmu_auto_pm_config *idle);
>  bool prcmu_is_auto_pm_enabled(void);
>  
> -int prcmu_config_clkout(u8 clkout, u8 source, u8 div);
>  int prcmu_set_clock_divider(u8 clock, u8 divider);
>  int db8500_prcmu_config_hotdog(u8 threshold);
>  int db8500_prcmu_config_hotmon(u8 low, u8 high);
>  int db8500_prcmu_start_temp_sense(u16 cycles32k);
>  int db8500_prcmu_stop_temp_sense(void);
> -int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
> -int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
>  
> -int prcmu_ac_wake_req(void);
> -void prcmu_ac_sleep_req(void);
>  void db8500_prcmu_modem_reset(void);
>  
>  int db8500_prcmu_config_a9wdog(u8 num, bool sleep_auto_off);
> @@ -608,11 +603,6 @@ static inline bool prcmu_is_auto_pm_enabled(void)
>  	return false;
>  }
>  
> -static inline int prcmu_config_clkout(u8 clkout, u8 source, u8 div)
> -{
> -	return 0;
> -}
> -
>  static inline int prcmu_set_clock_divider(u8 clock, u8 divider)
>  {
>  	return 0;
> @@ -638,23 +628,6 @@ static inline int db8500_prcmu_stop_temp_sense(void)
>  	return 0;
>  }
>  
> -static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
> -{
> -	return -ENOSYS;
> -}
> -
> -static inline int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
> -{
> -	return -ENOSYS;
> -}
> -
> -static inline int prcmu_ac_wake_req(void)
> -{
> -	return 0;
> -}
> -
> -static inline void prcmu_ac_sleep_req(void) {}
> -
>  static inline void db8500_prcmu_modem_reset(void) {}
>  
>  static inline void db8500_prcmu_system_reset(u16 reset_code) {}
> diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
> index 2e2c6a63a065..533459c7ad08 100644
> --- a/include/linux/mfd/dbx500-prcmu.h
> +++ b/include/linux/mfd/dbx500-prcmu.h
> @@ -376,30 +376,6 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value)
>  	db8500_prcmu_write_masked(reg, mask, value);
>  }
>  
> -static inline int prcmu_enable_a9wdog(u8 id)
> -{
> -	return db8500_prcmu_enable_a9wdog(id);
> -}
> -
> -static inline int prcmu_disable_a9wdog(u8 id)
> -{
> -	return db8500_prcmu_disable_a9wdog(id);
> -}
> -
> -static inline int prcmu_kick_a9wdog(u8 id)
> -{
> -	return db8500_prcmu_kick_a9wdog(id);
> -}
> -
> -static inline int prcmu_load_a9wdog(u8 id, u32 timeout)
> -{
> -	return db8500_prcmu_load_a9wdog(id, timeout);
> -}
> -
> -static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
> -{
> -	return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
> -}
>  #else
>  
>  static inline void prcmu_early_init(u32 phy_base, u32 size) {}
> @@ -569,6 +545,31 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
>  
>  #endif
>  
> +static inline int prcmu_enable_a9wdog(u8 id)
> +{
> +	return db8500_prcmu_enable_a9wdog(id);
> +}
> +
> +static inline int prcmu_disable_a9wdog(u8 id)
> +{
> +	return db8500_prcmu_disable_a9wdog(id);
> +}
> +
> +static inline int prcmu_kick_a9wdog(u8 id)
> +{
> +	return db8500_prcmu_kick_a9wdog(id);
> +}
> +
> +static inline int prcmu_load_a9wdog(u8 id, u32 timeout)
> +{
> +	return db8500_prcmu_load_a9wdog(id, timeout);
> +}
> +
> +static inline int prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
> +{
> +	return db8500_prcmu_config_a9wdog(num, sleep_auto_off);
> +}
> +
>  static inline void prcmu_set(unsigned int reg, u32 bits)
>  {
>  	prcmu_write_masked(reg, bits, bits);
> -- 
> 2.9.0
> 

[toc] | [prev] | [next] | [standalone]

#1589890 — Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface

On Tue, Feb 28, 2017 at 10:42 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> On Tue, Feb 28, 2017 at 10:01:17PM +0100, Arnd Bergmann wrote:
>> When the db8500 watchdog is enabled without the PRCMU, we get a lot of
>> warnings about duplicate or missing helper functions:
>>
>> In file included from drivers/watchdog/ux500_wdt.c:21:0:
>> include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
>>  static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
>>
>> This removes the duplicate function definitions and moves the helpers in
>> dbx500-prcmu outside of the #ifdef that hides them.
>>
>
> Is that appropriate ? Maybe we should just disable COMPILE_TEST
> for this driver instead.

Or we could do both. The MFD driver was written to support this in principle,
it just hasn't worked in a long time.

     Arnd

[toc] | [prev] | [next] | [standalone]

#1589907 — Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface

On Tue, Feb 28, 2017 at 10:47:02PM +0100, Arnd Bergmann wrote:
> On Tue, Feb 28, 2017 at 10:42 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > On Tue, Feb 28, 2017 at 10:01:17PM +0100, Arnd Bergmann wrote:
> >> When the db8500 watchdog is enabled without the PRCMU, we get a lot of
> >> warnings about duplicate or missing helper functions:
> >>
> >> In file included from drivers/watchdog/ux500_wdt.c:21:0:
> >> include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
> >>  static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
> >>
> >> This removes the duplicate function definitions and moves the helpers in
> >> dbx500-prcmu outside of the #ifdef that hides them.
> >>
> >
> > Is that appropriate ? Maybe we should just disable COMPILE_TEST
> > for this driver instead.
> 
> Or we could do both. The MFD driver was written to support this in principle,
> it just hasn't worked in a long time.
> 
Both sounds better to me at this point.

Guenter

[toc] | [prev] | [next] | [standalone]

#1589960 — Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface

On Tue, Feb 28, 2017 at 10:47:02PM +0100, Arnd Bergmann wrote:
> On Tue, Feb 28, 2017 at 10:42 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> > On Tue, Feb 28, 2017 at 10:01:17PM +0100, Arnd Bergmann wrote:
> >> When the db8500 watchdog is enabled without the PRCMU, we get a lot of
> >> warnings about duplicate or missing helper functions:
> >>
> >> In file included from drivers/watchdog/ux500_wdt.c:21:0:
> >> include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
> >>  static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
> >>
> >> This removes the duplicate function definitions and moves the helpers in
> >> dbx500-prcmu outside of the #ifdef that hides them.
> >>
> >
> > Is that appropriate ? Maybe we should just disable COMPILE_TEST
> > for this driver instead.
> 
> Or we could do both. The MFD driver was written to support this in principle,
> it just hasn't worked in a long time.
> 

Can you send me patches to disable COMPILE_TEST for this driver and for retu ?

Thanks,
Guenter

[toc] | [prev] | [next] | [standalone]

#1590143 — Re: [PATCH 2/8] mfd: db8500-prcmu: fix stub helper interface

On Wed, Mar 1, 2017 at 12:24 AM, Guenter Roeck <linux@roeck-us.net> wrote:
> On Tue, Feb 28, 2017 at 10:47:02PM +0100, Arnd Bergmann wrote:
>> On Tue, Feb 28, 2017 at 10:42 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> > On Tue, Feb 28, 2017 at 10:01:17PM +0100, Arnd Bergmann wrote:
>> >> When the db8500 watchdog is enabled without the PRCMU, we get a lot of
>> >> warnings about duplicate or missing helper functions:
>> >>
>> >> In file included from drivers/watchdog/ux500_wdt.c:21:0:
>> >> include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of 'prcmu_abb_read'
>> >>  static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
>> >>
>> >> This removes the duplicate function definitions and moves the helpers in
>> >> dbx500-prcmu outside of the #ifdef that hides them.
>> >>
>> >
>> > Is that appropriate ? Maybe we should just disable COMPILE_TEST
>> > for this driver instead.
>>
>> Or we could do both. The MFD driver was written to support this in principle,
>> it just hasn't worked in a long time.
>>
>
> Can you send me patches to disable COMPILE_TEST for this driver and for retu ?

Done.

[toc] | [prev] | [next] | [standalone]

#1589792 — [PATCH 6/8] watchdog: sp805: add back AMBA dependency

The driver fails to link if ARM_AMBA is disabled:

drivers/watchdog/sp805_wdt.o: In function `sp805_wdt_driver_init':
sp805_wdt.c:(.init.text+0x4): undefined reference to `amba_driver_register'

It seems that the COMPILE_TEST was added in the wrong place, as there
is no architecture dependency, but a bus dependency. This moves
the dependency accordingly.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index ab0ec389e436..3216012170fa 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -218,7 +218,7 @@ config ZIIRAVE_WATCHDOG
 
 config ARM_SP805_WATCHDOG
 	tristate "ARM SP805 Watchdog"
-	depends on (ARM || ARM64) && (ARM_AMBA || COMPILE_TEST)
+	depends on (ARM || ARM64 || COMPILE_TEST) && ARM_AMBA
 	select WATCHDOG_CORE
 	help
 	  ARM Primecell SP805 Watchdog timer. This will reboot your system when
-- 
2.9.0

[toc] | [prev] | [next] | [standalone]

#1589819 — Re: [PATCH 6/8] watchdog: sp805: add back AMBA dependency

On Tue, Feb 28, 2017 at 10:01:21PM +0100, Arnd Bergmann wrote:
> The driver fails to link if ARM_AMBA is disabled:
> 
> drivers/watchdog/sp805_wdt.o: In function `sp805_wdt_driver_init':
> sp805_wdt.c:(.init.text+0x4): undefined reference to `amba_driver_register'
> 
> It seems that the COMPILE_TEST was added in the wrong place, as there
> is no architecture dependency, but a bus dependency. This moves
> the dependency accordingly.
> 
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index ab0ec389e436..3216012170fa 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -218,7 +218,7 @@ config ZIIRAVE_WATCHDOG
>  
>  config ARM_SP805_WATCHDOG
>  	tristate "ARM SP805 Watchdog"
> -	depends on (ARM || ARM64) && (ARM_AMBA || COMPILE_TEST)
> +	depends on (ARM || ARM64 || COMPILE_TEST) && ARM_AMBA
>  	select WATCHDOG_CORE
>  	help
>  	  ARM Primecell SP805 Watchdog timer. This will reboot your system when
> -- 
> 2.9.0
> 

[toc] | [prev] | [next] | [standalone]

#1589807

On Tue, Feb 28, 2017 at 10:01:15PM +0100, Arnd Bergmann wrote:
> Hi Guenter,
> 
> I noticed your change to enable lots of watchdog drivers for compile
> testing in linux-next today. While this is generally a great idea,
> I'm not entirely sure why this appeared during the merge window.
> 
Problem is that Wim doesn't apply patches to a tree which gets exposed
to -next. I'll have to discuss with him how to change that. The tree
has been exposed to 0day for quite some time, though, which did not
report any errors (nor did my own build tests). No idea how both me
and 0day missed all those problems.

Sorry :-(

Guenter

> I case you plan to have this merged into v4.11, please make sure
> to get the fixups in. I found eight drivers that now have incorrect
> dependencies. For two of them I changed the MFD code, for the others
> I just adapted the Kconfig dependencies, mostly by reverting
> part of your patch.
> 
>     Arnd
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[toc] | [prev] | [next] | [standalone]

#1589817 — [PATCH 5/8] watchdog: menf21bmc: add I2C dependency

This driver fails to link when CONFIG_I2C is disabled or a loadable module while
the watchdog is built-in:

drivers/watchdog/built-in.o: In function `menf21bmc_wdt_shutdown':
menf21bmc_wdt.c:(.text+0x9b44): undefined reference to `i2c_smbus_write_word_data'
menf21bmc_wdt.c:(.text+0x9b44): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `i2c_smbus_write_word_data'

This adds a Kconfig dependency for it, to enforce a valid configuration.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/watchdog/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index de52495ef150..ab0ec389e436 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -142,6 +142,7 @@ config GPIO_WATCHDOG_ARCH_INITCALL
 config MENF21BMC_WATCHDOG
 	tristate "MEN 14F021P00 BMC Watchdog"
 	depends on MFD_MENF21BMC || COMPILE_TEST
+	depends on I2C
 	select WATCHDOG_CORE
 	help
 	  Say Y here to include support for the MEN 14F021P00 BMC Watchdog.
-- 
2.9.0

[toc] | [prev] | [next] | [standalone]

#1589821 — Re: [PATCH 5/8] watchdog: menf21bmc: add I2C dependency

On Tue, Feb 28, 2017 at 10:01:20PM +0100, Arnd Bergmann wrote:
> This driver fails to link when CONFIG_I2C is disabled or a loadable module while
> the watchdog is built-in:
> 
> drivers/watchdog/built-in.o: In function `menf21bmc_wdt_shutdown':
> menf21bmc_wdt.c:(.text+0x9b44): undefined reference to `i2c_smbus_write_word_data'
> menf21bmc_wdt.c:(.text+0x9b44): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `i2c_smbus_write_word_data'
> 
> This adds a Kconfig dependency for it, to enforce a valid configuration.
> 
> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index de52495ef150..ab0ec389e436 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -142,6 +142,7 @@ config GPIO_WATCHDOG_ARCH_INITCALL
>  config MENF21BMC_WATCHDOG
>  	tristate "MEN 14F021P00 BMC Watchdog"
>  	depends on MFD_MENF21BMC || COMPILE_TEST
> +	depends on I2C
>  	select WATCHDOG_CORE
>  	help
>  	  Say Y here to include support for the MEN 14F021P00 BMC Watchdog.
> -- 
> 2.9.0
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web