Commit 0542920c authored by Joakim Zhang's avatar Joakim Zhang Committed by Marc Kleine-Budde
Browse files

can: flexcan: add CAN FD BRS support 



This patch adds CAN FD BitRate Switch (BRS) support to driver.

Signed-off-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Link: https://lore.kernel.org/r/20190712075926.7357-5-qiangqing.zhang@nxp.com


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

drivers/net/can/flexcan.c

+8 −1
Original line number Diff line number Diff line
@@ -723,9 +723,13 @@ static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *de 
	if (cfd->can_id & CAN_RTR_FLAG)

		ctrl |= FLEXCAN_MB_CNT_RTR;



	if (can_is_canfd_skb(skb))

	if (can_is_canfd_skb(skb)) {

		ctrl |= FLEXCAN_MB_CNT_EDL;



		if (cfd->flags & CANFD_BRS)

			ctrl |= FLEXCAN_MB_CNT_BRS;

	}



	for (i = 0; i < cfd->len; i += sizeof(u32)) {

		data = be32_to_cpup((__be32 *)&cfd->data[i]);

		priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
@@ -956,6 +960,9 @@ static struct sk_buff *flexcan_mailbox_read(struct can_rx_offload *offload, 


	if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {

		cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf));



		if (reg_ctrl & FLEXCAN_MB_CNT_BRS)

			cfd->flags |= CANFD_BRS;

	} else {

		cfd->len = get_can_dlc((reg_ctrl >> 16) & 0xf);