ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
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
|
|
@@ -710,9 +710,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)]);
|
|
@@ -943,6 +947,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);
|
|
|