Skip to contentSkip to conversation

FAILED: patch "[PATCH] can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit" failed to apply to 4.9-stable tree

PATCH [email protected] 2 participants 3 messages Jul 27, 2018

Subsystems (3)
Stable branch CAN network drivers Mcan device driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 393753b217f05474e714aea36c37501546ed1202 Mon Sep 17 00:00:00 2001

From: Roman Fietze <[email protected]>
Date: Wed, 11 Jul 2018 15:36:14 +0200
Subject: [PATCH] can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit
before checking can.ctrlmode

Inside m_can_chip_config(), when setting up the new value of the CCCR, the CCCR_NISO bit is not cleared like the others, CCCR_TEST, CCCR_MON, CCCR_BRSE and CCCR_FDOE, before checking the can.ctrlmode bits for CAN_CTRLMODE_FD_NON_ISO.

This way once the controller was configured for CAN_CTRLMODE_FD_NON_ISO, this mode could never be cleared again.

This fix is only relevant for controllers with version 3.1.x or 3.2.x. Older versions do not support NISO.

Signed-off-by Roman Fietze <[email protected]>
Cc linux-stable <[email protected]>
Signed-off-by Marc Kleine-Budde <[email protected]>
drivers/net/can/m_can/m_can.c +2 -1
index b397a33f3d32..8e2b7f873c4d 100644
@@ -1109,7 +1109,8 @@ static void m_can_chip_config(struct net_device *dev)
 
 	} else {
 	/* Version 3.1.x or 3.2.x */
-		cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE);
+		cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE |
+			  CCCR_NISO);
 
 		/* Only 3.2.x has NISO Bit implemented */
 		if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO)
#1 lore raw

Hello,

Quoted 3 lines · On Friday, 27 July 2018 11:16:47 CEST [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
...
From 393753b217f05474e714aea36c37501546ed1202 Mon Sep 17 00:00:00 2001

Telemotive AG
Breitwiesen
73347 Mühlhausen
Tel.: +49 7335 18493-45
Mobil: +49 152 56871006
Email: [email protected]

Firmensitz: Telemotive AG,
Breitwiesen, 73347 Mühlhausen
Vorstand: Heinz Huber, Stefan Erhart
Aufsichtsratsvorsitzender: Anton Schantl
Amtsgericht: Ulm, HRB 541321

Quoted 10 lines

From: Roman Fietze <[email protected]>
Date: Wed, 11 Jul 2018 15:36:14 +0200
Subject: [PATCH] can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can.ctrlmode

Inside m_can_chip_config(), when setting up the new value of the CCCR, the CCCR_NISO bit is not cleared like the others, CCCR_TEST, CCCR_MON, CCCR_BRSE and CCCR_FDOE, before checking the can.ctrlmode bits for CAN_CTRLMODE_FD_NON_ISO.
...

This patch cannot be applied to the kernel version 4.9, because the M-CAN driver in this kernel does not support M-CAN controllers with V3.1.x or V3.2.x, only 3.0.x is supported.

Support for newer versions than 3.0.x was added in commit b03cfc5bb0e11f88988e5da2805867e468d03ca1, somewhere between v4.11-rc7 and v4.12-rc1.

Roman

Signature · 5 lines
Roman Fietze
Telemotive AG Büro Mühlhausen
Breitwiesen
73347 Mühlhausen
Tel.: +49 7335 18493-45
author maintainer
#2 lore raw
Quoted 33 lines · Roman Fietze

Hello,

Quoted 3 lines · On Friday, 27 July 2018 11:16:47 CEST [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
...
From 393753b217f05474e714aea36c37501546ed1202 Mon Sep 17 00:00:00 2001

Telemotive AG
Breitwiesen
73347 M�hlhausen
Tel.: +49 7335 18493-45
Mobil: +49 152 56871006
Email: [email protected]

Firmensitz: Telemotive AG,
Breitwiesen, 73347 M�hlhausen
Vorstand: Heinz Huber, Stefan Erhart
Aufsichtsratsvorsitzender: Anton Schantl
Amtsgericht: Ulm, HRB 541321

�

Quoted 10 lines

From: Roman Fietze <[email protected]>
Date: Wed, 11 Jul 2018 15:36:14 +0200
Subject: [PATCH] can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can.ctrlmode

Inside m_can_chip_config(), when setting up the new value of the CCCR, the CCCR_NISO bit is not cleared like the others, CCCR_TEST, CCCR_MON, CCCR_BRSE and CCCR_FDOE, before checking the can.ctrlmode bits for CAN_CTRLMODE_FD_NON_ISO.
...

Quoted 7 lines

This patch cannot be applied to the kernel version 4.9, because the M-CAN driver in this kernel does not support M-CAN controllers with V3.1.x or V3.2.x, only 3.0.x is supported.

Support for newer versions than 3.0.x was added in commit b03cfc5bb0e11f88988e5da2805867e468d03ca1, somewhere between v4.11-rc7 and v4.12-rc1.

Great, thanks for letting me know.

greg k-h