diff mbox series

[V3,5/7] can: flexcan: add CANFD BRS support

Message ID 20190510104639.15170-6-qiangqing.zhang@nxp.com
State Awaiting Upstream
Delegated to: David Miller
Headers show
Series can: flexcan: add CAN FD support for i.MX8 | expand

Commit Message

Joakim Zhang May 10, 2019, 10:50 a.m. UTC 
From: Dong Aisheng <aisheng.dong@nxp.com>

This patch intends to add CAN FD BitRate Switch(BRS) support in driver.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>

ChangeLog:
----------
V2->V3:
	*split from another patch
---
 drivers/net/can/flexcan.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index c45c92948195..ca7240d69042 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -687,8 +687,12 @@  static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *de
 		ctrl |= FLEXCAN_MB_CNT_RTR;
 
 	if (priv->can.ctrlmode & CAN_CTRLMODE_FD) {
-		if (can_is_canfd_skb(skb))
+		if (can_is_canfd_skb(skb)) {
 			ctrl |= FLEXCAN_MB_CNT_EDL;
+
+			if (cf->flags & CANFD_BRS)
+				ctrl |= FLEXCAN_MB_CNT_BRS;
+		}
 	}
 
 	for (i = 0; i < cf->len; i += sizeof(u32)) {
@@ -909,6 +913,9 @@  static unsigned int flexcan_mailbox_read(struct can_rx_offload *offload, bool dr
 
 		if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {
 			cf->len = can_dlc2len((reg_ctrl >> 16) & 0x0F);
+
+			if (reg_ctrl & FLEXCAN_MB_CNT_BRS)
+				cf->flags |= CANFD_BRS;
 		} else {
 			cf->len = get_can_dlc((reg_ctrl >> 16) & 0x0F);