aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/sfc/ptp.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index fe849dbf9f80..c771e0af4e06 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -401,8 +401,8 @@ size_t efx_ptp_update_stats(struct efx_nic *efx, u64 *stats)
401/* For Siena platforms NIC time is s and ns */ 401/* For Siena platforms NIC time is s and ns */
402static void efx_ptp_ns_to_s_ns(s64 ns, u32 *nic_major, u32 *nic_minor) 402static void efx_ptp_ns_to_s_ns(s64 ns, u32 *nic_major, u32 *nic_minor)
403{ 403{
404 struct timespec ts = ns_to_timespec(ns); 404 struct timespec64 ts = ns_to_timespec64(ns);
405 *nic_major = ts.tv_sec; 405 *nic_major = (u32)ts.tv_sec;
406 *nic_minor = ts.tv_nsec; 406 *nic_minor = ts.tv_nsec;
407} 407}
408 408
@@ -431,8 +431,8 @@ static ktime_t efx_ptp_s_ns_to_ktime_correction(u32 nic_major, u32 nic_minor,
431 */ 431 */
432static void efx_ptp_ns_to_s27(s64 ns, u32 *nic_major, u32 *nic_minor) 432static void efx_ptp_ns_to_s27(s64 ns, u32 *nic_major, u32 *nic_minor)
433{ 433{
434 struct timespec ts = ns_to_timespec(ns); 434 struct timespec64 ts = ns_to_timespec64(ns);
435 u32 maj = ts.tv_sec; 435 u32 maj = (u32)ts.tv_sec;
436 u32 min = (u32)(((u64)ts.tv_nsec * NS_TO_S27_MULT + 436 u32 min = (u32)(((u64)ts.tv_nsec * NS_TO_S27_MULT +
437 (1ULL << (NS_TO_S27_SHIFT - 1))) >> NS_TO_S27_SHIFT); 437 (1ULL << (NS_TO_S27_SHIFT - 1))) >> NS_TO_S27_SHIFT);
438 438
@@ -737,14 +737,14 @@ efx_ptp_process_times(struct efx_nic *efx, MCDI_DECLARE_STRUCT_PTR(synch_buf),
737 */ 737 */
738 for (i = 0; i < number_readings; i++) { 738 for (i = 0; i < number_readings; i++) {
739 s32 window, corrected; 739 s32 window, corrected;
740 struct timespec wait; 740 struct timespec64 wait;
741 741
742 efx_ptp_read_timeset( 742 efx_ptp_read_timeset(
743 MCDI_ARRAY_STRUCT_PTR(synch_buf, 743 MCDI_ARRAY_STRUCT_PTR(synch_buf,
744 PTP_OUT_SYNCHRONIZE_TIMESET, i), 744 PTP_OUT_SYNCHRONIZE_TIMESET, i),
745 &ptp->timeset[i]); 745 &ptp->timeset[i]);
746 746
747 wait = ktime_to_timespec( 747 wait = ktime_to_timespec64(
748 ptp->nic_to_kernel_time(0, ptp->timeset[i].wait, 0)); 748 ptp->nic_to_kernel_time(0, ptp->timeset[i].wait, 0));
749 window = ptp->timeset[i].window; 749 window = ptp->timeset[i].window;
750 corrected = window - wait.tv_nsec; 750 corrected = window - wait.tv_nsec;
@@ -803,7 +803,7 @@ efx_ptp_process_times(struct efx_nic *efx, MCDI_DECLARE_STRUCT_PTR(synch_buf),
803 ptp->timeset[last_good].minor, 0); 803 ptp->timeset[last_good].minor, 0);
804 804
805 /* Calculate delay from NIC top of second to last_time */ 805 /* Calculate delay from NIC top of second to last_time */
806 delta.tv_nsec += ktime_to_timespec(mc_time).tv_nsec; 806 delta.tv_nsec += ktime_to_timespec64(mc_time).tv_nsec;
807 807
808 /* Set PPS timestamp to match NIC top of second */ 808 /* Set PPS timestamp to match NIC top of second */
809 ptp->host_time_pps = *last_time; 809 ptp->host_time_pps = *last_time;