| Message ID | e8ddeeea84626e43dcac4f0731992cbad932ce7a.1525262725.git.baolin.wang@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] MIPS: Convert read_persistent_clock() to read_persistent_clock64() | expand |
On Wed, May 2, 2018 at 10:53 PM, Baolin Wang <baolin.wang@linaro.org> wrote: > diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h > index 17d4cd2..c4e2a1a 100644 > --- a/arch/mips/include/asm/time.h > +++ b/arch/mips/include/asm/time.h > @@ -27,8 +27,8 @@ > * rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need > * to be set. Used by RTC sync-up. > */ > -extern int rtc_mips_set_time(unsigned long); > -extern int rtc_mips_set_mmss(unsigned long); > +extern int rtc_mips_set_time(time64_t); > +extern int rtc_mips_set_mmss(time64_t); > I think these should just get removed, and each implementation replaced with a direct update_persistent_clock64() function. > -int update_persistent_clock(struct timespec now) > +int update_persistent_clock64(struct timespec64 now) > { > return rtc_mips_set_mmss(now.tv_sec); > } And this one also removed > @@ -69,7 +69,7 @@ int proc_dolasatrtc(struct ctl_table *table, int write, > if (rtctmp < 0) > rtctmp = 0; > } > - r = proc_dointvec(table, write, buffer, lenp, ppos); > + r = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); > if (r) > return r; > > @@ -224,7 +224,7 @@ int proc_lasat_prid(struct ctl_table *table, int write, > { > .procname = "rtc", > .data = &rtctmp, > - .maxlen = sizeof(int), > + .maxlen = sizeof(time64_t), > .mode = 0644, > .proc_handler = proc_dolasatrtc, > }, Something seems wrong here: time64_t is not the same as 'unsigned long', and the 'rtctmp' variable is still 'unsigned int'. Not sure what the right fix would be (we don't seem to have a sysctl helper for s64), but the change here makes it worse. Arnd
On 4 May 2018 at 06:31, Arnd Bergmann <arnd@arndb.de> wrote: > On Wed, May 2, 2018 at 10:53 PM, Baolin Wang <baolin.wang@linaro.org> wrote: >> diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h >> index 17d4cd2..c4e2a1a 100644 >> --- a/arch/mips/include/asm/time.h >> +++ b/arch/mips/include/asm/time.h >> @@ -27,8 +27,8 @@ >> * rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need >> * to be set. Used by RTC sync-up. >> */ >> -extern int rtc_mips_set_time(unsigned long); >> -extern int rtc_mips_set_mmss(unsigned long); >> +extern int rtc_mips_set_time(time64_t); >> +extern int rtc_mips_set_mmss(time64_t); >> > > I think these should just get removed, and each implementation replaced > with a direct update_persistent_clock64() function. I thought this was one minor modification that will reduce the risk of introducing other issues, but as you suggested we can do some complete cleanup by removing set_mmss/set_time. OK, I will do that. > >> -int update_persistent_clock(struct timespec now) >> +int update_persistent_clock64(struct timespec64 now) >> { >> return rtc_mips_set_mmss(now.tv_sec); >> } > > And this one also removed Sure. > >> @@ -69,7 +69,7 @@ int proc_dolasatrtc(struct ctl_table *table, int write, >> if (rtctmp < 0) >> rtctmp = 0; >> } >> - r = proc_dointvec(table, write, buffer, lenp, ppos); >> + r = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); >> if (r) >> return r; >> >> @@ -224,7 +224,7 @@ int proc_lasat_prid(struct ctl_table *table, int write, >> { >> .procname = "rtc", >> .data = &rtctmp, >> - .maxlen = sizeof(int), >> + .maxlen = sizeof(time64_t), >> .mode = 0644, >> .proc_handler = proc_dolasatrtc, >> }, > > Something seems wrong here: time64_t is not the same as 'unsigned long', > and the 'rtctmp' variable is still 'unsigned int'. Not sure what the right fix > would be (we don't seem to have a sysctl helper for s64), but the change > here makes it worse. After checking again, I agree with you. So I will keep the original code here. -- Baolin.wang Best Regards
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 9e992cf..c2d6ec8 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c @@ -65,7 +65,7 @@ void read_persistent_clock64(struct timespec64 *ts) * jump to the next second precisely 500 ms later. Check the Dallas * DS1287 data sheet for details. */ -int rtc_mips_set_mmss(unsigned long nowtime) +int rtc_mips_set_mmss(time64_t nowtime) { int retval = 0; int real_seconds, real_minutes, cmos_minutes; diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index 17d4cd2..c4e2a1a 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -27,8 +27,8 @@ * rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need * to be set. Used by RTC sync-up. */ -extern int rtc_mips_set_time(unsigned long); -extern int rtc_mips_set_mmss(unsigned long); +extern int rtc_mips_set_time(time64_t); +extern int rtc_mips_set_mmss(time64_t); /* * board specific routines required by time_init(). diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index a6ebc81..01ba5ab 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -34,17 +34,17 @@ DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); -int __weak rtc_mips_set_time(unsigned long sec) +int __weak rtc_mips_set_time(time64_t sec) { return -ENODEV; } -int __weak rtc_mips_set_mmss(unsigned long nowtime) +int __weak rtc_mips_set_mmss(time64_t nowtime) { return rtc_mips_set_time(nowtime); } -int update_persistent_clock(struct timespec now) +int update_persistent_clock64(struct timespec64 now) { return rtc_mips_set_mmss(now.tv_sec); } diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c index d75c887..580cf3a 100644 --- a/arch/mips/lasat/ds1603.c +++ b/arch/mips/lasat/ds1603.c @@ -98,7 +98,7 @@ static void rtc_write_byte(unsigned int byte) } } -static void rtc_write_word(unsigned long word) +static void rtc_write_word(time64_t word) { int i; @@ -152,7 +152,7 @@ void read_persistent_clock64(struct timespec64 *ts) ts->tv_nsec = 0; } -int rtc_mips_set_mmss(unsigned long time) +int rtc_mips_set_mmss(time64_t time) { unsigned long flags; diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 6f74224..4264107 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c @@ -53,7 +53,7 @@ int proc_dolasatstring(struct ctl_table *table, int write, } #ifdef CONFIG_DS1603 -static int rtctmp; +static time64_t rtctmp; /* proc function to read/write RealTime Clock */ int proc_dolasatrtc(struct ctl_table *table, int write, @@ -69,7 +69,7 @@ int proc_dolasatrtc(struct ctl_table *table, int write, if (rtctmp < 0) rtctmp = 0; } - r = proc_dointvec(table, write, buffer, lenp, ppos); + r = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); if (r) return r; @@ -224,7 +224,7 @@ int proc_lasat_prid(struct ctl_table *table, int write, { .procname = "rtc", .data = &rtctmp, - .maxlen = sizeof(int), + .maxlen = sizeof(time64_t), .mode = 0644, .proc_handler = proc_dolasatrtc, }, diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c index aa27a22..4ac8ccd 100644 --- a/arch/mips/sibyte/swarm/rtc_m41t81.c +++ b/arch/mips/sibyte/swarm/rtc_m41t81.c @@ -141,13 +141,13 @@ static int m41t81_write(uint8_t addr, int b) return 0; } -int m41t81_set_time(unsigned long t) +int m41t81_set_time(time64_t t) { struct rtc_time tm; unsigned long flags; /* Note we don't care about the century */ - rtc_time_to_tm(t, &tm); + rtc_time64_to_tm(t, &tm); /* * Note the write order matters as it ensures the correctness. diff --git a/arch/mips/sibyte/swarm/rtc_xicor1241.c b/arch/mips/sibyte/swarm/rtc_xicor1241.c index a2121c1..2dcaaa7 100644 --- a/arch/mips/sibyte/swarm/rtc_xicor1241.c +++ b/arch/mips/sibyte/swarm/rtc_xicor1241.c @@ -109,13 +109,13 @@ static int xicor_write(uint8_t addr, int b) } } -int xicor_set_time(unsigned long t) +int xicor_set_time(time64_t t) { struct rtc_time tm; int tmp; unsigned long flags; - rtc_time_to_tm(t, &tm); + rtc_time64_to_tm(t, &tm); tm.tm_year += 1900; spin_lock_irqsave(&rtc_lock, flags); diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 7073940..f356ecd 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c @@ -57,11 +57,11 @@ #endif extern int xicor_probe(void); -extern int xicor_set_time(unsigned long); +extern int xicor_set_time(time64_t); extern time64_t xicor_get_time(void); extern int m41t81_probe(void); -extern int m41t81_set_time(unsigned long); +extern int m41t81_set_time(time64_t); extern time64_t m41t81_get_time(void); const char *get_system_type(void) @@ -109,7 +109,7 @@ void read_persistent_clock64(struct timespec64 *ts) ts->tv_nsec = 0; } -int rtc_mips_set_time(unsigned long sec) +int rtc_mips_set_time(time64_t sec) { switch (swarm_rtc_type) { case RTC_XICOR:
Since struct timespec is not y2038 safe on 32bit machines, this patch converts update_persistent_clock() to update_persistent_clock64() using struct timespec64. This patch also changes rtc_mips_set_time()/rtc_mips_set_mmss() interfaces to use time64_t, which is y2038 safe. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- arch/mips/dec/time.c | 2 +- arch/mips/include/asm/time.h | 4 ++-- arch/mips/kernel/time.c | 6 +++--- arch/mips/lasat/ds1603.c | 4 ++-- arch/mips/lasat/sysctl.c | 6 +++--- arch/mips/sibyte/swarm/rtc_m41t81.c | 4 ++-- arch/mips/sibyte/swarm/rtc_xicor1241.c | 4 ++-- arch/mips/sibyte/swarm/setup.c | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) -- 1.7.9.5