mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
9100566267
Manually rebased patches: ath79/patches-5.4/910-unaligned_access_hacks.patch bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch Removed since could be reverse-applied by quilt and found to be included upstream: ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [refresh altered targets after rebase] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 4c26434ac773e37f30ee5a8fa6f7275fe7dabac2 Mon Sep 17 00:00:00 2001
|
|
From: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Date: Fri, 12 Jul 2019 08:02:47 +0000
|
|
Subject: [PATCH] can: flexcan: add CAN FD BRS support
|
|
|
|
This patch adds CAN FD BitRate Switch (BRS) support to driver.
|
|
|
|
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -702,9 +702,13 @@ static netdev_tx_t flexcan_start_xmit(st
|
|
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)]);
|
|
@@ -935,6 +939,9 @@ static struct sk_buff *flexcan_mailbox_r
|
|
|
|
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);
|
|
|