can: peak_usb: CANFD: store 64-bits hw timestamps

This patch allows to use the whole 64-bit timestamps received from the
CAN-FD device (expressed in µs) rather than only its low part, in the
hwtstamp structure of the skb transferred to the network layer, when a
CAN/CANFD frame has been received.

Link: https://lore.kernel.org/all/20210930094603.23134-1-s.grosjean@peak-system.com
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index e8f43ed90b7225ee9135136d33edc4b3e2beb88b..6107fef9f4a035dfaa12cbe1a02edfc70bf01068 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -205,6 +205,19 @@ int peak_usb_netif_rx(struct sk_buff *skb,
        return netif_rx(skb);
 }
 
+/* post received skb with native 64-bit hw timestamp */
+int peak_usb_netif_rx_64(struct sk_buff *skb, u32 ts_low, u32 ts_high)
+{
+       struct skb_shared_hwtstamps *hwts = skb_hwtstamps(skb);
+       u64 ns_ts;
+
+       ns_ts = (u64)ts_high << 32 | ts_low;
+       ns_ts *= NSEC_PER_USEC;
+       hwts->hwtstamp = ns_to_ktime(ns_ts);
+
+       return netif_rx(skb);
+}
+
 /*
  * callback for bulk Rx urb
  */

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
index b00a4811bf61fd6f5ec1c74ab503c893a1215c6e..daa19f57e7422ab03db23caf7715c939137a7820 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.h
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.h
@@ -143,6 +143,7 @@ void peak_usb_set_ts_now(struct peak_time_ref *time_ref, u32 ts_now);
 void peak_usb_get_ts_time(struct peak_time_ref *time_ref, u32 ts, ktime_t *tv);
 int peak_usb_netif_rx(struct sk_buff *skb,
                      struct peak_time_ref *time_ref, u32 ts_low);
+int peak_usb_netif_rx_64(struct sk_buff *skb, u32 ts_low, u32 ts_high);
 void peak_usb_async_complete(struct urb *urb);
 void peak_usb_restart_complete(struct peak_usb_device *dev);
 

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
index 09029a3bad1ac3e8df64ae8bfd04f0475707d8fd..6bd12549f101422f02b044c90d352a203feeb7b3 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
@@ -515,7 +515,8 @@ static int pcan_usb_fd_decode_canmsg(struct pcan_usb_fd_if *usb_if,
        netdev->stats.rx_packets++;
        netdev->stats.rx_bytes += cfd->len;
 
-       peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(rm->ts_low));
+       peak_usb_netif_rx_64(skb, le32_to_cpu(rm->ts_low),
+                            le32_to_cpu(rm->ts_high));
 
        return 0;
 }
@@ -579,7 +580,8 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if,
        netdev->stats.rx_packets++;
        netdev->stats.rx_bytes += cf->len;
 
-       peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(sm->ts_low));
+       peak_usb_netif_rx_64(skb, le32_to_cpu(sm->ts_low),
+                            le32_to_cpu(sm->ts_high));
 
        return 0;
 }
@@ -629,7 +631,8 @@ static int pcan_usb_fd_decode_overrun(struct pcan_usb_fd_if *usb_if,
        cf->can_id |= CAN_ERR_CRTL;
        cf->data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;
 
-       peak_usb_netif_rx(skb, &usb_if->time_ref, le32_to_cpu(ov->ts_low));
+       peak_usb_netif_rx_64(skb, le32_to_cpu(ov->ts_low),
+                            le32_to_cpu(ov->ts_high));
 
        netdev->stats.rx_over_errors++;
        netdev->stats.rx_errors++;