4e39949dd1
Removed since could be reverse-applied by quilt and found to be included upstream: backport-5.4/789-net-usb-qmi_wwan-Set-DTR-quirk-for-MR400.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, bcm27xx/bcm2711, ath79/generic Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64 build/run]
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 1a92e5a9109963e2491eec111b84b35b4e2adc8f Mon Sep 17 00:00:00 2001
|
|
From: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Date: Wed, 9 Oct 2019 15:15:37 +0200
|
|
Subject: [PATCH] can: flexcan: flexcan_irq_state(): only read timestamp if
|
|
needed
|
|
|
|
The function flexcan_irq_state() checks the controller for CAN state
|
|
changes and pushes a skb with the new state and a timestamp into the
|
|
rx-offload framework.
|
|
|
|
This patch optimizes the function by only reading the timestamp, if a
|
|
state change is detected.
|
|
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -745,8 +745,6 @@ static void flexcan_irq_state(struct net
|
|
u32 timestamp;
|
|
int err;
|
|
|
|
- timestamp = priv->read(®s->timer) << 16;
|
|
-
|
|
flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
|
|
if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
|
|
tx_state = unlikely(reg_esr & FLEXCAN_ESR_TX_WRN) ?
|
|
@@ -766,6 +764,8 @@ static void flexcan_irq_state(struct net
|
|
if (likely(new_state == priv->can.state))
|
|
return;
|
|
|
|
+ timestamp = priv->read(®s->timer) << 16;
|
|
+
|
|
skb = alloc_can_err_skb(dev, &cf);
|
|
if (unlikely(!skb))
|
|
return;
|