cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
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
|
|
@@ -744,8 +744,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) ?
|
|
@@ -765,6 +763,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;
|