Skip to contentSkip to conversation

Patch "can: flexcan: fix i.MX6 state transition issue" has been added to the 4.13-stable tree

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

Subsystems (2)
Stable branch CAN network drivers
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 i.MX6 state transition issue

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-i.mx6-state-transition-issue.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 cf9c04677f2bf599b44511963039ec6e25583feb Mon Sep 17 00:00:00 2001

From: "ZHU Yi (ST-FIR/ENG1-Zhu)" <[email protected]>
Date: Fri, 15 Sep 2017 07:05:50 +0000
Subject: can: flexcan: fix i.MX6 state transition issue

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

commit cf9c04677f2bf599b44511963039ec6e25583feb upstream.

Enable FLEXCAN_QUIRK_BROKEN_PERR_STATE for i.MX6 to report correct state transitions.

Signed-off-by Zhu Yi <[email protected]>
Signed-off-by Mark Jonas <[email protected]>
Acked-by Wolfgang Grandegger <[email protected]>
Signed-off-by Marc Kleine-Budde <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/net/can/flexcan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/flexcan.c +1 -1
@@ -289,7 +289,7 @@ static const struct flexcan_devtype_data
 
 static const struct flexcan_devtype_data fsl_imx6q_devtype_data = {
 	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
-		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE,
 };
 
 static const struct flexcan_devtype_data fsl_vf610_devtype_data = {

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