ptp: e1000e: use helpers for converting ns to timespec.

[deliverable/linux.git] / drivers / net / ethernet / intel / e1000e / ptp.c

diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c
index 978ef9c4a043f9e9277de439939a75721f4ee5cf..8d7b21dc7e19955a2e87868b6c1b4b340feb5236 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/drivers/net/ethernet/intel/e1000e/ptp.c
@@ -106,20 +106,18 @@ static int e1000e_phc_adjtime(struct ptp_clock_info *ptp, s64 delta)
  * Read the timecounter and return the correct value in ns after converting
  * 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,
                                                     ptp_clock_info);
        unsigned long flags;
-       u32 remainder;
        u64 ns;
 
        spin_lock_irqsave(&adapter->systim_lock, flags);
        ns = timecounter_read(&adapter->tc);
        spin_unlock_irqrestore(&adapter->systim_lock, flags);
 
-       ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &remainder);
-       ts->tv_nsec = remainder;
+       *ts = ns_to_timespec64(ns);
 
        return 0;
 }
@@ -133,14 +131,14 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
  * wall timer value.
  **/
 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,
                                                     ptp_clock_info);
        unsigned long flags;
        u64 ns;
 
-       ns = timespec_to_ns(ts);
+       ns = timespec64_to_ns(ts);
 
        /* reset the timecounter */
        spin_lock_irqsave(&adapter->systim_lock, flags);
@@ -171,11 +169,12 @@ static void e1000e_systim_overflow_work(struct work_struct *work)
        struct e1000_adapter *adapter = container_of(work, struct e1000_adapter,
                                                     systim_overflow_work.work);
        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",
+             (long long) ts.tv_sec, ts.tv_nsec);
 
        schedule_delayed_work(&adapter->systim_overflow_work,
                              E1000_SYSTIM_OVERFLOW_PERIOD);
@@ -190,8 +189,8 @@ static const struct ptp_clock_info e1000e_ptp_clock_info = {
        .pps            = 0,
        .adjfreq        = e1000e_phc_adjfreq,
        .adjtime        = e1000e_phc_adjtime,
-       .gettime        = e1000e_phc_gettime,
-       .settime        = e1000e_phc_settime,
+       .gettime64      = e1000e_phc_gettime,
+       .settime64      = e1000e_phc_settime,
        .enable         = e1000e_phc_enable,
 };
 
@@ -221,7 +220,9 @@ void e1000e_ptp_init(struct e1000_adapter *adapter)
        switch (hw->mac.type) {
        case e1000_pch2lan:
        case e1000_pch_lpt:
-               if ((hw->mac.type != e1000_pch_lpt) ||
+       case e1000_pch_spt:
+               if (((hw->mac.type != e1000_pch_lpt) &&
+                    (hw->mac.type != e1000_pch_spt)) ||
                    (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) {
                        adapter->ptp_clock_info.max_adj = 24000000 - 1;
                        break;