[PATCH] macintosh: fix via-pmu and via-cuda build errors

[Christophe Leroy]

Le 07/04/2022 à 04:37, Randy Dunlap a écrit :
> When CONFIG_INPUT=m, the input_*() family of functions is not
> available to builtin drivers.
> 
> When CONFIG_RTC_CLASS is not set, rtc_tm_to_time64() is not defined.
> 
> Fix multiple build errors by making these Kconfig symbols required by
> ADB_CUDA (RTC_CLASS) and ADB_PMU (RTC_CLASS and INPUT).
> 
> m68k-linux-ld: drivers/macintosh/via-pmu.o: in function `pmu_set_rtc_time':
> drivers/macintosh/via-pmu.c:1758: undefined reference to `rtc_tm_to_time64'
> m68k-linux-ld: drivers/macintosh/via-pmu-event.o: in function `input_report_key':
> include/linux/input.h:425: undefined reference to `input_event'
> m68k-linux-ld: drivers/macintosh/via-pmu-event.o: in function `input_report_switch':
> include/linux/input.h:445: undefined reference to `input_event'
> m68k-linux-ld: drivers/macintosh/via-pmu-event.o: in function `via_pmu_event_init':
> drivers/macintosh/via-pmu-event.c:38: undefined reference to `input_allocate_device'
> m68k-linux-ld: drivers/macintosh/via-pmu-event.c:53: undefined reference to `input_register_device'
> m68k-linux-ld: drivers/macintosh/via-pmu-event.c:55: undefined reference to `input_free_device'
> 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 at infradead.org>
> Reported-by: kernel test robot <lkp at intel.com>
> Cc: Kees Cook <keescook at chromium.org>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Michael Ellerman <mpe at ellerman.id.au>
> Cc: Finn Thain <fthain at linux-m68k.org>
> Cc: Geert Uytterhoeven <geert at linux-m68k.org>
> Cc: Nathan Chancellor <nathan at kernel.org>
> Cc: Nick Desaulniers <ndesaulniers at google.com>
> Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
> Cc: linuxppc-dev at lists.ozlabs.org
> ---
> This is a big hammer type of patch. We could possibly do (a) some
> conditional code blocks for RTC_CLASS and (b) only build via-pmu-event
> if CONFIG_INPUT=y if needed.
> 
>   drivers/macintosh/Kconfig |    3 +++
>   1 file changed, 3 insertions(+)
> 
> --- 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
> +	depends on RTC_CLASS

Shouldn't it be the other way round, ie 'select RTC_CLASS' ?


>   	help
>   	  This provides support for Cuda/Egret based Macintosh and
>   	  Power Macintosh systems. This includes most m68k based Macs,
> @@ -57,6 +58,8 @@ config ADB_CUDA
>   config ADB_PMU
>   	bool "Support for PMU based PowerMacs and PowerBooks"
>   	depends on PPC_PMAC || MAC
> +	depends on INPUT=y

As far as I remember that's not enough, it leads to some warnings, see 
the threads around Finn's patch.

> +	depends on RTC_CLASS

Shouldn't it be the other way round, ie 'select RTC_CLASS' ?

>   	help
>   	  On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the
>   	  PMU is an embedded microprocessor whose primary function is to

Christophe