Skip to contentSkip to conversation

Patch "can: flexcan: fix state transition regression" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Oct 23, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

can: flexcan: fix state transition regression

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
can-flexcan-fix-state-transition-regression.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ad2302345d59d29232cb668baaae9e840925d153 Mon Sep 17 00:00:00 2001

From: "ZHU Yi (ST-FIR/ENG1-Zhu)" <[email protected]>
Date: Fri, 15 Sep 2017 06:59:15 +0000
Subject: can: flexcan: fix state transition regression

From: ZHU Yi (ST-FIR/ENG1-Zhu) <[email protected]>

commit ad2302345d59d29232cb668baaae9e840925d153 upstream.

Update state upon any interrupt to report correct state transitions in case the flexcan core enabled the broken error state quirk fix.

---
 drivers/net/can/flexcan.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/can/flexcan.c +3 -2
@@ -765,8 +765,9 @@ static irqreturn_t flexcan_irq(int irq,
 		flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);
 	}
 
-	/* state change interrupt */
-	if (reg_esr & FLEXCAN_ESR_ERR_STATE)
+	/* state change interrupt or broken error state quirk fix is enabled */
+	if ((reg_esr & FLEXCAN_ESR_ERR_STATE) ||
+	    (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_ERR_STATE))
 		flexcan_irq_state(dev, reg_esr);
 
 	/* bus error IRQ - handle if bus error reporting is activated */

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/can-flexcan-rename-legacy-error-state-quirk.patch queue-4.13/can-flexcan-implement-error-passive-state-quirk.patch queue-4.13/can-flexcan-fix-i.mx28-state-transition-issue.patch queue-4.13/can-flexcan-fix-state-transition-regression.patch queue-4.13/can-flexcan-fix-i.mx6-state-transition-issue.patch queue-4.13/can-flexcan-fix-p1010-state-transition-issue.patch