Commit 0aa639d3 authored by Jimmy Assarsson's avatar Jimmy Assarsson Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: leaf: Add hardware timestamp support to usbcan devices 



Add hardware timestamp support for all usbcan based devices (M16C).
The usbcan firmware is slightly different compared to the other Kvaser USB
interfaces:
  - The timestamp is provided by a 32-bit counter, with 10us resolution.
    Hence, the hardware timestamp will wrap after less than 12 hours.
  - Each Rx CAN or Tx ACK command only contains the 16-bits LSB of the
    timestamp counter.
  - The 16-bits MSB are sent in an asynchronous event (command), if any
    change occurred in the MSB since the last event.

Signed-off-by: default avatarJimmy Assarsson <extja@kvaser.com>
Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/20240701154936.92633-13-extja@kvaser.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent c644c969

drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = { 


static const struct kvaser_usb_driver_info kvaser_usb_driver_info_usbcan = {

	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |

		  KVASER_USB_QUIRK_HAS_SILENT_MODE,

		  KVASER_USB_QUIRK_HAS_SILENT_MODE |

		  KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,

	.family = KVASER_USBCAN,

	.ops = &kvaser_usb_leaf_dev_ops,

};

drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c

+12 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 


/* USBCanII timestamp */

#define KVASER_USB_USBCAN_CLK_OVERFLOW_MASK GENMASK(31, 16)

#define KVASER_USB_USBCAN_TIMESTAMP_FACTOR 10



struct kvaser_cmd_simple {

	u8 tid;
@@ -536,6 +537,15 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_32mhz = { 
	.bittiming_const = &kvaser_usb_flexc_bittiming_const,

};



static inline ktime_t kvaser_usb_usbcan_timestamp_to_ktime(const struct kvaser_usb *dev,

							   __le16 timestamp)

{

	u64 ticks = le16_to_cpu(timestamp) |

		    dev->card_data.usbcan_timestamp_msb;



	return kvaser_usb_ticks_to_ktime(dev->cfg, ticks * KVASER_USB_USBCAN_TIMESTAMP_FACTOR);

}



static int kvaser_usb_leaf_verify_size(const struct kvaser_usb *dev,

				       const struct kvaser_cmd *cmd)

{
@@ -978,6 +988,7 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev, 
		hwtstamp = kvaser_usb_timestamp48_to_ktime(dev->cfg, cmd->u.leaf.tx_ack.time);

		break;

	case KVASER_USBCAN:

		hwtstamp = kvaser_usb_usbcan_timestamp_to_ktime(dev, cmd->u.usbcan.tx_ack.time);

		break;

	}
@@ -1398,6 +1409,7 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev, 
		break;

	case KVASER_USBCAN:

		rx_data = cmd->u.usbcan.rx_can.data;

		hwtstamp = kvaser_usb_usbcan_timestamp_to_ktime(dev, cmd->u.usbcan.rx_can.time);

		break;

	}