diff mbox series

[v2] macintosh: via-pmu and via-cuda need RTC_LIB

Message ID 20220410161035.592-1-rdunlap@infradead.org (mailing list archive)
State Accepted
Headers show
Series [v2] macintosh: via-pmu and via-cuda need RTC_LIB | expand

Checks

Context Check Description
snowpatch_ozlabs/github-powerpc_clang success Successfully ran 7 jobs.
snowpatch_ozlabs/github-powerpc_sparse success Successfully ran 4 jobs.
snowpatch_ozlabs/github-powerpc_kernel_qemu success Successfully ran 24 jobs.

Commit Message

Randy Dunlap April 10, 2022, 4:10 p.m. UTC
Fix build when RTC_LIB is not set/enabled.
Eliminates these build errors:

m68k-linux-ld: drivers/macintosh/via-pmu.o: in function `pmu_set_rtc_time':
drivers/macintosh/via-pmu.c:1769: undefined reference to `rtc_tm_to_time64'
m68k-linux-ld: drivers/macintosh/via-cuda.o: in function `cuda_set_rtc_time':
drivers/macintosh/via-cuda.c:797: undefined reference to `rtc_tm_to_time64'

Fixes: 0792a2c8e0bb ("macintosh: Use common code to access RTC")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Kees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Finn Thain <fthain@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: linuxppc-dev@lists.ozlabs.org
---
v2: use RTC_LIB instead of open-coding the call to rtc_tm_to_time64()

 drivers/macintosh/Kconfig |    2 ++
 1 file changed, 2 insertions(+)

Comments

Arnd Bergmann April 11, 2022, 8:17 a.m. UTC | #1
On Sun, Apr 10, 2022 at 6:10 PM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> Fix build when RTC_LIB is not set/enabled.
> Eliminates these build errors:
>
> m68k-linux-ld: drivers/macintosh/via-pmu.o: in function `pmu_set_rtc_time':
> drivers/macintosh/via-pmu.c:1769: undefined reference to `rtc_tm_to_time64'
> m68k-linux-ld: drivers/macintosh/via-cuda.o: in function `cuda_set_rtc_time':
> drivers/macintosh/via-cuda.c:797: undefined reference to `rtc_tm_to_time64'
>
> Fixes: 0792a2c8e0bb ("macintosh: Use common code to access RTC")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: kernel test robot <lkp@intel.com>
> Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Finn Thain <fthain@linux-m68k.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Nathan Chancellor <nathan@kernel.org>
> Cc: Nick Desaulniers <ndesaulniers@google.com>
> Cc: linuxppc-dev@lists.ozlabs.org
> ---
> v2: use RTC_LIB instead of open-coding the call to rtc_tm_to_time64()

This sounds like a step in the right direction. Note that there is
another open-coded rtc_tm_to_time64() in read_persistent_clock64(),
it might be worth changing that one as well and just always including
RTC_LIB, though that's a separate issue.

Acked-by: Arnd Bergmann <arnd@arndb.de>

> --- a/drivers/macintosh/Kconfig
> +++ b/drivers/macintosh/Kconfig
> @@ -44,6 +44,7 @@ config ADB_IOP
>  config ADB_CUDA
>         bool "Support for Cuda/Egret based Macs and PowerMacs"
>         depends on (ADB || PPC_PMAC) && !PPC_PMAC64
> +       select RTC_LIB
>         help
>           This provides support for Cuda/Egret based Macintosh and
>           Power Macintosh systems. This includes most m68k based Macs,
> @@ -57,6 +58,7 @@ config ADB_CUDA
>  config ADB_PMU
>         bool "Support for PMU based PowerMacs and PowerBooks"
>         depends on PPC_PMAC || MAC
> +       select RTC_LIB
>         help
>           On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the
>           PMU is an embedded microprocessor whose primary function is to

I think ideally these would just become regular RTC drivers, rather than
relying on the roundtrip through CONFIG_RTC_DRV_GENERIC.

        Arnd
Michael Ellerman May 24, 2022, 11:09 a.m. UTC | #2
On Sun, 10 Apr 2022 09:10:35 -0700, Randy Dunlap wrote:
> Fix build when RTC_LIB is not set/enabled.
> Eliminates these build errors:
> 
> m68k-linux-ld: drivers/macintosh/via-pmu.o: in function `pmu_set_rtc_time':
> drivers/macintosh/via-pmu.c:1769: undefined reference to `rtc_tm_to_time64'
> m68k-linux-ld: drivers/macintosh/via-cuda.o: in function `cuda_set_rtc_time':
> drivers/macintosh/via-cuda.c:797: undefined reference to `rtc_tm_to_time64'
> 
> [...]

Applied to powerpc/next.

[1/1] macintosh: via-pmu and via-cuda need RTC_LIB
      https://git.kernel.org/powerpc/c/9a9c5ff5fff87eb1a43db0d899473554e408fd7b

cheers
diff mbox series

Patch

--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -44,6 +44,7 @@  config ADB_IOP
 config ADB_CUDA
 	bool "Support for Cuda/Egret based Macs and PowerMacs"
 	depends on (ADB || PPC_PMAC) && !PPC_PMAC64
+	select RTC_LIB
 	help
 	  This provides support for Cuda/Egret based Macintosh and
 	  Power Macintosh systems. This includes most m68k based Macs,
@@ -57,6 +58,7 @@  config ADB_CUDA
 config ADB_PMU
 	bool "Support for PMU based PowerMacs and PowerBooks"
 	depends on PPC_PMAC || MAC
+	select RTC_LIB
 	help
 	  On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the
 	  PMU is an embedded microprocessor whose primary function is to