From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Randy Dunlap <rdunlap@infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: kernel test robot <lkp@intel.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>,
Finn Thain <fthain@linux-m68k.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH] macintosh: fix via-pmu and via-cuda build without RTC_CLASS
Date: Sun, 10 Apr 2022 07:03:13 +0000 [thread overview]
Message-ID: <ae85daa9-97a4-3ed2-5692-0d4545a88b58@csgroup.eu> (raw)
In-Reply-To: <20220409020821.10229-1-rdunlap@infradead.org>
Le 09/04/2022 à 04:08, Randy Dunlap a écrit :
> Fix build when RTC_CLASS 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'
You don't need RTC_CLASS for that. All you need is RTC_LIB I think.
What about selecting RTC_LIB from m68k Kconfig just like powerpc and a
few architectures do ?
See
https://elixir.bootlin.com/linux/v5.18-rc1/source/arch/powerpc/Kconfig#L269
Otherwise, I think it would be better to move (and rename)
rtc_tm_to_time64() into kernel/time/time.c instead of opencoding it twice.
Christophe
>
> 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>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
> 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
> ---
> drivers/macintosh/via-cuda.c | 5 ++++-
> drivers/macintosh/via-pmu.c | 5 ++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> --- a/drivers/macintosh/via-cuda.c
> +++ b/drivers/macintosh/via-cuda.c
> @@ -794,7 +794,10 @@ int cuda_set_rtc_time(struct rtc_time *t
> u32 now;
> struct adb_request req;
>
> - now = lower_32_bits(rtc_tm_to_time64(tm) + RTC_OFFSET);
> + now = lower_32_bits(mktime64(((unsigned int)tm->tm_year + 1900),
> + tm->tm_mon + 1, tm->tm_mday, tm->tm_hour,
> + tm->tm_min, tm->tm_sec)
> + + RTC_OFFSET);
> if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,
> now >> 24, now >> 16, now >> 8, now) < 0)
> return -ENXIO;
> --- a/drivers/macintosh/via-pmu.c
> +++ b/drivers/macintosh/via-pmu.c
> @@ -1766,7 +1766,10 @@ int pmu_set_rtc_time(struct rtc_time *tm
> u32 now;
> struct adb_request req;
>
> - now = lower_32_bits(rtc_tm_to_time64(tm) + RTC_OFFSET);
> + now = lower_32_bits(mktime64(((unsigned int)tm->tm_year + 1900),
> + tm->tm_mon + 1, tm->tm_mday, tm->tm_hour,
> + tm->tm_min, tm->tm_sec)
> + + RTC_OFFSET);
> if (pmu_request(&req, NULL, 5, PMU_SET_RTC,
> now >> 24, now >> 16, now >> 8, now) < 0)
> return -ENXIO;
next prev parent reply other threads:[~2022-04-10 7:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-09 2:08 [PATCH] macintosh: fix via-pmu and via-cuda build without RTC_CLASS Randy Dunlap
2022-04-10 7:03 ` Christophe Leroy [this message]
2022-04-10 16:05 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae85daa9-97a4-3ed2-5692-0d4545a88b58@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=fthain@linux-m68k.org \
--cc=geert@linux-m68k.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lkp@intel.com \
--cc=mpe@ellerman.id.au \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).