Re: [PATCH 1/3] m68knommu: fix undefined reference to `mach_get_rtc_pll'

[Greg Ungerer <gerg@linux-m68k.org>]

Hi Geert,

On 24/5/22 17:49, Geert Uytterhoeven wrote:
> Hi Greg,
> 
> On Tue, May 24, 2022 at 9:46 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> On Wed, May 18, 2022 at 8:56 AM Greg Ungerer <gerg@linux-m68k.org> wrote:
>>> Configuring for a nommu classic m68k target and enabling the generic rtc
>>> driver (CONFIG_RTC_DRV_GENERIC) will result in the following compile
>>> error:
>>>
>>>     m68k-linux-ld: arch/m68k/kernel/time.o: in function `rtc_ioctl':
>>>     time.c:(.text+0x82): undefined reference to `mach_get_rtc_pll'
>>>     m68k-linux-ld: time.c:(.text+0xbc): undefined reference to `mach_set_rtc_pll'
>>>     m68k-linux-ld: time.c:(.text+0xf4): undefined reference to `mach_set_rtc_pll'
>>>
>>> There is no definitions of "mach_set_rtc_pll" and "mach_get_rtc_pll" in the
>>> nommu code paths. Move these definitions and the associated "mach_hwclk",
>>> so that they are around their use case in time.c. This means they will
>>> always be defined on the builds that require them, and not on those that
>>> cannot use them - such as ColdFire (both with and without MMU enabled).
>>>
>>> Reported-by: kernel test robot <lkp@intel.com>
>>> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
>>
>>> --- a/arch/m68k/kernel/time.c
>>> +++ b/arch/m68k/kernel/time.c
>>> @@ -82,6 +86,11 @@ void read_persistent_clock64(struct timespec64 *ts)
>>>   #endif
>>>
>>>   #if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
>>> +int (*mach_get_rtc_pll)(struct rtc_pll_info *);
>>> +int (*mach_set_rtc_pll)(struct rtc_pll_info *);
>>> +EXPORT_SYMBOL(mach_get_rtc_pll);
>>> +EXPORT_SYMBOL(mach_set_rtc_pll);
>>
>> Oops, this causes build failures for Q40 with CONFIG_RTC_DRV_GENERIC=n,
>> as arch/m68k/q40/config.c uses mach_]gs]et_rtc_pll() unconditionally.
> 
> I think the simplest solution is to move these up, next to mach_hwclk.

Yes, that looks to be the easiest solution.
New patch coming up.

Regards
Greg


>>> +
>>>   static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
>>>   {
>>>          mach_hwclk(0, tm);
> 
> Gr{oetje,eeting}s,
> 
>                          Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                  -- Linus Torvalds