802-can-0020-can-flexcan-add-CAN-FD-BRS-support.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 4c26434ac773e37f30ee5a8fa6f7275fe7dabac2 Mon Sep 17 00:00:00 2001
  2. From: Joakim Zhang <[email protected]>
  3. Date: Fri, 12 Jul 2019 08:02:47 +0000
  4. Subject: [PATCH] can: flexcan: add CAN FD BRS support
  5. This patch adds CAN FD BitRate Switch (BRS) support to driver.
  6. Signed-off-by: Joakim Zhang <[email protected]>
  7. Signed-off-by: Marc Kleine-Budde <[email protected]>
  8. ---
  9. drivers/net/can/flexcan.c | 9 ++++++++-
  10. 1 file changed, 8 insertions(+), 1 deletion(-)
  11. --- a/drivers/net/can/flexcan.c
  12. +++ b/drivers/net/can/flexcan.c
  13. @@ -704,9 +704,13 @@ static netdev_tx_t flexcan_start_xmit(st
  14. if (cfd->can_id & CAN_RTR_FLAG)
  15. ctrl |= FLEXCAN_MB_CNT_RTR;
  16. - if (can_is_canfd_skb(skb))
  17. + if (can_is_canfd_skb(skb)) {
  18. ctrl |= FLEXCAN_MB_CNT_EDL;
  19. + if (cfd->flags & CANFD_BRS)
  20. + ctrl |= FLEXCAN_MB_CNT_BRS;
  21. + }
  22. +
  23. for (i = 0; i < cfd->len; i += sizeof(u32)) {
  24. data = be32_to_cpup((__be32 *)&cfd->data[i]);
  25. priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
  26. @@ -937,6 +941,9 @@ static struct sk_buff *flexcan_mailbox_r
  27. if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {
  28. cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf));
  29. +
  30. + if (reg_ctrl & FLEXCAN_MB_CNT_BRS)
  31. + cfd->flags |= CANFD_BRS;
  32. } else {
  33. cfd->len = get_can_dlc((reg_ctrl >> 16) & 0xf);