Skip to contentSkip to conversation

rtc: bd70528: fix BD71815 watchdog dependency

PATCH Superseded Arnd Bergmann 2 participants 3 messages Apr 22, 2021 Real time clock (RTC)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 rtc: bd70528: fix BD71815 watchdog dependency

From: Arnd Bergmann <[email protected]>

The added Kconfig dependency is slightly incorrect, which can lead to a link failure when the watchdog is a loadable module:

arm-linux-gnueabi-ld: drivers/rtc/rtc-bd70528.o: in function `bd70528_set_rtc_based_timers':
rtc-bd70528.c:(.text+0x6cc): undefined reference to `bd70528_wdt_set'
arm-linux-gnueabi-ld: drivers/rtc/rtc-bd70528.o: in function `bd70528_set_time':
rtc-bd70528.c:(.text+0xaa0): undefined reference to `bd70528_wdt_lock'
arm-linux-gnueabi-ld: rtc-bd70528.c:(.text+0xab8): undefined reference to `bd70528_wdt_unlock'
arm-linux-gnueabi-ld: drivers/rtc/rtc-bd70528.o: in function `bd70528_alm_enable':
rtc-bd70528.c:(.text+0xfc0): undefined reference to `bd70528_wdt_lock'
arm-linux-gnueabi-ld: rtc-bd70528.c:(.text+0x1030): undefined reference to `bd70528_wdt_unlock'

The problem is that it allows to be built-in if any of the other drivers are built-in, even when the watchdog is a loadable module.

Rework this so that having the watchdog as a loadable module always forces the rtc to be a module as well instead of built-in, regardless of the other ones.

Fixes c56dc069f268 ("rtc: bd70528: Support RTC on ROHM BD71815")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/rtc/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/Kconfig +2 -1
index d8c13fded164..91cc106e2bf6 100644
@@ -502,7 +502,8 @@ config RTC_DRV_M41T80_WDT
 
 config RTC_DRV_BD70528
 	tristate "ROHM BD70528, BD71815 and BD71828 PMIC RTC"
-	depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
+	depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 || BD70528_WATCHDOG
+	depends on BD70528_WATCHDOG || !BD70528_WATCHDOG
 	help
 	  If you say Y here you will get support for the RTC
 	  block on ROHM BD70528, BD71815 and BD71828 Power Management IC.
Signature · 1 line
2.29.2
#1 lore raw
Quoted 32 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The added Kconfig dependency is slightly incorrect, which can lead to a link failure when the watchdog is a loadable module:

arm-linux-gnueabi-ld: drivers/rtc/rtc-bd70528.o: in function `bd70528_set_rtc_based_timers':
rtc-bd70528.c:(.text+0x6cc): undefined reference to `bd70528_wdt_set'
arm-linux-gnueabi-ld: drivers/rtc/rtc-bd70528.o: in function `bd70528_set_time':
rtc-bd70528.c:(.text+0xaa0): undefined reference to `bd70528_wdt_lock'
arm-linux-gnueabi-ld: rtc-bd70528.c:(.text+0xab8): undefined reference to `bd70528_wdt_unlock'
arm-linux-gnueabi-ld: drivers/rtc/rtc-bd70528.o: in function `bd70528_alm_enable':
rtc-bd70528.c:(.text+0xfc0): undefined reference to `bd70528_wdt_lock'
arm-linux-gnueabi-ld: rtc-bd70528.c:(.text+0x1030): undefined reference to `bd70528_wdt_unlock'

The problem is that it allows to be built-in if any of the other drivers are built-in, even when the watchdog is a loadable module.

Rework this so that having the watchdog as a loadable module always forces the rtc to be a module as well instead of built-in, regardless of the other ones.

Fixes c56dc069f268 ("rtc: bd70528: Support RTC on ROHM BD71815")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/rtc/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/Kconfig +0 -0
index d8c13fded164..91cc106e2bf6 100644

drivers/rtc/Kconfig config RTC_DRV_M41T80_WDT · line 505

Quoted 5 lines
drivers/rtc/Kconfig +1 -1
@@ -502,7 +502,8 @@ config RTC_DRV_M41T80_WDT
 
 config RTC_DRV_BD70528
 	tristate "ROHM BD70528, BD71815 and BD71828 PMIC RTC"
-	depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
+	depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 || BD70528_WATCHDOG

Is the "|| BD70528_WATCHDOG" above correct ? Seems odd to me, since it makes the depend statement true even if neither MFD_ROHM_BD71828 nor MFD_ROHM_BD70528 is enabled.

I think the condition needs to be something like

	depends on (MFD_ROHM_BD71828 || MFD_ROHM_BD70528) && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
or, in two lines,
	depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528
	depends on BD70528_WATCHDOG || !BD70528_WATCHDOG

Thanks,
Guenter

Quoted 5 lines
drivers/rtc/Kconfig +1 -0
+	depends on BD70528_WATCHDOG || !BD70528_WATCHDOG
 	help
 	  If you say Y here you will get support for the RTC
 	  block on ROHM BD70528, BD71815 and BD71828 Power Management IC.
author
#2 lore raw
Quoted 10 lines · Guenter Roeck

drivers/rtc/Kconfig config RTC_DRV_M41T80_WDT · line 505

Quoted 5 lines

config RTC_DRV_BD70528

      tristate "ROHM BD70528, BD71815 and BD71828 PMIC RTC"
drivers/rtc/Kconfig +1 -1
-     depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
+     depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 || BD70528_WATCHDOG

Is the "|| BD70528_WATCHDOG" above correct ? Seems odd to me, since it makes the depend statement true even if neither MFD_ROHM_BD71828 nor MFD_ROHM_BD70528 is enabled.

Quoted 5 lines

I think the condition needs to be something like

        depends on (MFD_ROHM_BD71828 || MFD_ROHM_BD70528) && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
or, in two lines,
        depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528
        depends on BD70528_WATCHDOG || !BD70528_WATCHDOG

Indeed, I misread this as being used on any of three drivers, but MFD_ROHM_BD70528/BD70528_WATCHDOG is really the same thing.

I sent an updated patch.

Arnd