]> Git Repo - linux.git/commitdiff
can: flexcan: add CAN FD BRS support
authorJoakim Zhang <[email protected]>
Fri, 12 Jul 2019 08:02:47 +0000 (08:02 +0000)
committerMarc Kleine-Budde <[email protected]>
Tue, 22 Sep 2020 14:55:34 +0000 (16:55 +0200)
This patch adds CAN FD BitRate Switch (BRS) support to driver.

Signed-off-by: Joakim Zhang <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Marc Kleine-Budde <[email protected]>
drivers/net/can/flexcan.c

index e3ecce80eadbf0631d3616153c617bfeae05bb01..fc0e9d5fd02b66bd864a5279cb0225dff0c1f2e6 100644 (file)
@@ -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);
 
This page took 0.055516 seconds and 4 git commands to generate.