admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ptp: e1000e: convert to the 64 bit get/set time methods.

Browse Source 
This driver's clock is implemented using a timecounter, and so with
this patch the driver is ready for the year 2038.

Compile tested only.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Richard Cochran
2015-03-29 23:12:00 +02:00
committed by David S. Miller
parent d28fdf0fe3
commit 07c74eb775
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/intel/e1000e/ptp.c
View File

@@ -106,7 +106,7 @@ static int e1000e_phc_adjtime(struct ptp_clock_info *ptp, s64 delta)
* Read the timecounter and return the correct value in ns after converting * Read the timecounter and return the correct value in ns after converting
* it into a struct timespec. * it into a struct timespec.
**/ **/
static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts) static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{ {
struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter,
ptp_clock_info); ptp_clock_info);
@@ -133,14 +133,14 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
* wall timer value. * wall timer value.
**/ **/
static int e1000e_phc_settime(struct ptp_clock_info *ptp, static int e1000e_phc_settime(struct ptp_clock_info *ptp,
const struct timespec *ts) const struct timespec64 *ts)
{ {
struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter,
ptp_clock_info); ptp_clock_info);
unsigned long flags; unsigned long flags;
u64 ns; u64 ns;
ns = timespec_to_ns(ts); ns = timespec64_to_ns(ts);
/* reset the timecounter */ /* reset the timecounter */
spin_lock_irqsave(&adapter->systim_lock, flags); spin_lock_irqsave(&adapter->systim_lock, flags);
@@ -171,11 +171,11 @@ static void e1000e_systim_overflow_work(struct work_struct *work)
struct e1000_adapter *adapter = container_of(work, struct e1000_adapter, struct e1000_adapter *adapter = container_of(work, struct e1000_adapter,
systim_overflow_work.work); systim_overflow_work.work);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
struct timespec ts; struct timespec64 ts;
adapter->ptp_clock_info.gettime(&adapter->ptp_clock_info, &ts); adapter->ptp_clock_info.gettime64(&adapter->ptp_clock_info, &ts);
e_dbg("SYSTIM overflow check at %ld.%09lu\n", ts.tv_sec, ts.tv_nsec); e_dbg("SYSTIM overflow check at %lld.%09lu\n", ts.tv_sec, ts.tv_nsec);
schedule_delayed_work(&adapter->systim_overflow_work, schedule_delayed_work(&adapter->systim_overflow_work,
E1000_SYSTIM_OVERFLOW_PERIOD); E1000_SYSTIM_OVERFLOW_PERIOD);
@@ -190,8 +190,8 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = {
.pps = 0, .pps = 0,
.adjfreq = e1000e_phc_adjfreq, .adjfreq = e1000e_phc_adjfreq,
.adjtime = e1000e_phc_adjtime, .adjtime = e1000e_phc_adjtime,
.gettime = e1000e_phc_gettime, .gettime64 = e1000e_phc_gettime,
.settime = e1000e_phc_settime, .settime64 = e1000e_phc_settime,
.enable = e1000e_phc_enable, .enable = e1000e_phc_enable,
}; };