Skip to contentSkip to conversation

drivers/watchdog/Kconfig: Update CONFIG_WATCHDOG_RTAS dependencies

PATCH Superseded Murilo Opsfelder Araujo 3 participants 4 messages May 27, 2017 – May 29, 2017 Watchdog device drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/watchdog/Kconfig: Update CONFIG_WATCHDOG_RTAS dependencies

drivers/watchdog/wdrtas.c uses symbols defined in arch/powerpc/kernel/rtas.c, which are exported iff CONFIG_PPC_RTAS is selected. Building wdrtas.c without setting CONFIG_PPC_RTAS throws the following errors:

ERROR: ".rtas_token" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: "rtas_data_buf" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: "rtas_data_buf_lock" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: ".rtas_get_sensor" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: ".rtas_call" [drivers/watchdog/wdrtas.ko] undefined!

This was identified during a randconfig build where CONFIG_WATCHDOG_RTAS=m and CONFIG_PPC_RTAS was not set. Logs are here:

    http://kisskb.ellerman.id.au/kisskb/buildresult/12982152/

This patch fixes the issue by selecting CONFIG_PPC_RTAS when CONFIG_WATCHDOG_RTAS is set.

---
 drivers/watchdog/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/watchdog/Kconfig +1 -0
index 8b9049d..5d872145 100644
@@ -1689,6 +1689,7 @@ config MEN_A21_WDT
 config WATCHDOG_RTAS
 	tristate "RTAS watchdog"
 	depends on PPC_RTAS || (PPC64 && COMPILE_TEST)
+	select PPC_RTAS
 	help
 	  This driver adds watchdog support for the RTAS watchdog.
 
Signature · 6 lines
2.9.4

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#1 lore raw
Quoted 28 lines · Murilo Opsfelder Araujo

drivers/watchdog/wdrtas.c uses symbols defined in arch/powerpc/kernel/rtas.c, which are exported iff CONFIG_PPC_RTAS is selected. Building wdrtas.c without setting CONFIG_PPC_RTAS throws the following errors:

ERROR: ".rtas_token" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: "rtas_data_buf" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: "rtas_data_buf_lock" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: ".rtas_get_sensor" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: ".rtas_call" [drivers/watchdog/wdrtas.ko] undefined!

This was identified during a randconfig build where CONFIG_WATCHDOG_RTAS=m and CONFIG_PPC_RTAS was not set. Logs are here:

     http://kisskb.ellerman.id.au/kisskb/buildresult/12982152/

This patch fixes the issue by selecting CONFIG_PPC_RTAS when CONFIG_WATCHDOG_RTAS is set.

---
  drivers/watchdog/Kconfig | 1 +
  1 file changed, 1 insertion(+)
drivers/watchdog/Kconfig +0 -0
index 8b9049d..5d872145 100644

drivers/watchdog/Kconfig config MEN_A21_WDT · line 1692

Quoted 4 lines
drivers/watchdog/Kconfig +1 -0
@@ -1689,6 +1689,7 @@ config MEN_A21_WDT
  config WATCHDOG_RTAS
  	tristate "RTAS watchdog"
  	depends on PPC_RTAS || (PPC64 && COMPILE_TEST)
+	select PPC_RTAS

This can not at the same time depend on PPC_RTAS and select it. Guess we'll have to drop COMPILE_TEST entirely.

Guenter

#2 lore raw
Quoted 24 lines · Guenter Roeck
Quoted 23 lines · Murilo Opsfelder Araujo

drivers/watchdog/wdrtas.c uses symbols defined in arch/powerpc/kernel/rtas.c, which are exported iff CONFIG_PPC_RTAS is selected. Building wdrtas.c without setting CONFIG_PPC_RTAS throws the following errors:

ERROR: ".rtas_token" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: "rtas_data_buf" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: "rtas_data_buf_lock" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: ".rtas_get_sensor" [drivers/watchdog/wdrtas.ko] undefined!
ERROR: ".rtas_call" [drivers/watchdog/wdrtas.ko] undefined!

This was identified during a randconfig build where CONFIG_WATCHDOG_RTAS=m and CONFIG_PPC_RTAS was not set. Logs are here:

     http://kisskb.ellerman.id.au/kisskb/buildresult/12982152/

This patch fixes the issue by selecting CONFIG_PPC_RTAS when CONFIG_WATCHDOG_RTAS is set.

---
  drivers/watchdog/Kconfig | 1 +
  1 file changed, 1 insertion(+)
Quoted 12 lines

drivers/watchdog/Kconfig config MEN_A21_WDT · line 1692

Quoted 9 lines
drivers/watchdog/Kconfig +1 -0
index 8b9049d..5d872145 100644
@@ -1689,6 +1689,7 @@ config MEN_A21_WDT
  config WATCHDOG_RTAS
  	tristate "RTAS watchdog"
  	depends on PPC_RTAS || (PPC64 && COMPILE_TEST)
+	select PPC_RTAS

This can not at the same time depend on PPC_RTAS and select it. Guess we'll have to drop COMPILE_TEST entirely.

We could stub out the RTAS pieces it needs. But I don't think it buys us much, for compile testing you may as well just build a config which has PPC_RTAS enabled, there are several.

So I think it should just depend on PPC_RTAS.

Murilo can you send a v2?

cheers

#3 lore raw

On 05/28/2017 11:08 PM, Michael Ellerman wrote:
[...]

Quoted 9 lines

We could stub out the RTAS pieces it needs. But I don't think it buys us much, for compile testing you may as well just build a config which has PPC_RTAS enabled, there are several.

So I think it should just depend on PPC_RTAS.

Murilo can you send a v2?

cheers

Thanks, Guenter and Michael, for reviewing!

I sent out a v2.

Signature · 1 line
Murilo