mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
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>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 6340760d0671e92b15ff92b7eda41bbdd9702437 Mon Sep 17 00:00:00 2001
|
|
From: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Date: Fri, 1 Mar 2019 16:27:59 +0100
|
|
Subject: [PATCH] can: flexcan: flexcan_mailbox_read() make use of
|
|
flexcan_write64() to mark the mailbox as read
|
|
|
|
In the previous patch the function flexcan_write64() was introduced.
|
|
|
|
This patch replaces the open coded variant in flexcan_mailbox_read()
|
|
that marks a mailbox as read, by a single call to flexcan_write64().
|
|
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -891,15 +891,10 @@ static struct sk_buff *flexcan_mailbox_r
|
|
}
|
|
|
|
mark_as_read:
|
|
- if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
|
|
- /* Clear IRQ */
|
|
- if (n < 32)
|
|
- priv->write(BIT(n), ®s->iflag1);
|
|
- else
|
|
- priv->write(BIT(n - 32), ®s->iflag2);
|
|
- } else {
|
|
+ if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)
|
|
+ flexcan_write64(priv, FLEXCAN_IFLAG_MB(n), ®s->iflag1);
|
|
+ else
|
|
priv->write(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, ®s->iflag1);
|
|
- }
|
|
|
|
/* Read the Free Running Timer. It is optional but recommended
|
|
* to unlock Mailbox as soon as possible and make it available
|