| Message ID | 1426743909-24335-2-git-send-email-baolin.wang@linaro.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Mar 19, 2015 at 01:45:06PM +0800, Baolin Wang wrote: > diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h > index 0d8ff3f..86decc2 100644 > --- a/include/linux/ptp_clock_kernel.h > +++ b/include/linux/ptp_clock_kernel.h > @@ -105,7 +105,9 @@ struct ptp_clock_info { > int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta); > int (*adjtime)(struct ptp_clock_info *ptp, s64 delta); > int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts); > + int (*getktime)(struct ptp_clock_info *ptp, ktime_t *kt); > int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts); > + int (*setktime)(struct ptp_clock_info *ptp, ktime_t kt); You have added alternate methods that do exactly the same thing as gettime/settime. Then, you convert just two drivers over to the new interface. I don't want to have this job half done, with some driver being forgotten along the way. Please, just change the signatures of gettime/settime and convert *all* of the drivers. After all, there are not that many drivers to convert. Thanks, Richard > int (*enable)(struct ptp_clock_info *ptp, > struct ptp_clock_request *request, int on); > int (*verify)(struct ptp_clock_info *ptp, unsigned int pin, > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index f8a7609..4e14cc6 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -125,8 +125,10 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) struct ptp_clock_info *ops = ptp->info; struct ptp_clock_time *pct; struct timespec ts; + struct timespec64 ts64; int enable, err = 0; unsigned int i, pin_index; + ktime_t kt; switch (cmd) { @@ -197,18 +199,25 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) } pct = &sysoff->ts[0]; for (i = 0; i < sysoff->n_samples; i++) { - getnstimeofday(&ts); - pct->sec = ts.tv_sec; - pct->nsec = ts.tv_nsec; + ktime_get_real_ts64(&ts64); + pct->sec = ts64.tv_sec; + pct->nsec = ts64.tv_nsec; pct++; - ptp->info->gettime(ptp->info, &ts); - pct->sec = ts.tv_sec; - pct->nsec = ts.tv_nsec; + if (ptp->info->getktime) { + ptp->info->getktime(ptp->info, &kt); + ts64 = ktime_to_timespec64(kt); + pct->sec = ts64.tv_sec; + pct->nsec = ts64.tv_nsec; + } else { + ptp->info->gettime(ptp->info, &ts); + pct->sec = ts.tv_sec; + pct->nsec = ts.tv_nsec; + } pct++; } - getnstimeofday(&ts); - pct->sec = ts.tv_sec; - pct->nsec = ts.tv_nsec; + ktime_get_real_ts64(&ts64); + pct->sec = ts64.tv_sec; + pct->nsec = ts64.tv_nsec; if (copy_to_user((void __user *)arg, sysoff, sizeof(*sysoff))) err = -EFAULT; break; diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h index 0d8ff3f..86decc2 100644 --- a/include/linux/ptp_clock_kernel.h +++ b/include/linux/ptp_clock_kernel.h @@ -105,7 +105,9 @@ struct ptp_clock_info { int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta); int (*adjtime)(struct ptp_clock_info *ptp, s64 delta); int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts); + int (*getktime)(struct ptp_clock_info *ptp, ktime_t *kt); int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts); + int (*setktime)(struct ptp_clock_info *ptp, ktime_t kt); int (*enable)(struct ptp_clock_info *ptp, struct ptp_clock_request *request, int on); int (*verify)(struct ptp_clock_info *ptp, unsigned int pin,
This patch introduces two options with "ktime_t" type to get/set time in ptp_clock_info structure that will avoid breaking in the year 2038. In ptp_chardev.c file, replace the gettime interface with getktime interface using the "ktime_t" type to get the ptp clock time. The patch's goal is to remove the original code using the "timespec" type, and I expect to be done with that in the following merge window. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- drivers/ptp/ptp_chardev.c | 27 ++++++++++++++++++--------- include/linux/ptp_clock_kernel.h | 2 ++ 2 files changed, 20 insertions(+), 9 deletions(-)