FAILED: patch "[PATCH] can: flexcan: disable completely the ECC mechanism" failed to apply to 4.14-stable tree

FAILED: patch "[PATCH] can: flexcan: disable completely the ECC mechanism" failed to apply to 4.14-stable tree

[gregkh]

The patch below does not apply to the 4.14-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 <stable@vger.kernel.org>.

thanks,

greg k-h

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

From 5e269324db5adb2f5f6ec9a93a9c7b0672932b47 Mon Sep 17 00:00:00 2001
From: Joakim Zhang <qiangqing.zhang@nxp.com>
Date: Thu, 15 Aug 2019 08:00:26 +0000
Subject: [PATCH] can: flexcan: disable completely the ECC mechanism

The ECC (memory error detection and correction) mechanism can be
activated or not, controlled by the ECCDIS bit in CAN_MECR. When
disabled, updates on indications and reporting registers are stopped.
So if want to disable ECC completely, had better assert ECCDIS bit, not
just mask the related interrupts.

Fixes: cdce844865be ("can: flexcan: add vf610 support for FlexCAN")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index dc5695dffc2e..1cd5179cb876 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1188,6 +1188,7 @@ static int flexcan_chip_start(struct net_device *dev)
 		reg_mecr = priv->read(&regs->mecr);
 		reg_mecr &= ~FLEXCAN_MECR_ECRWRDIS;
 		priv->write(reg_mecr, &regs->mecr);
+		reg_mecr |= FLEXCAN_MECR_ECCDIS;
 		reg_mecr &= ~(FLEXCAN_MECR_NCEFAFRZ | FLEXCAN_MECR_HANCEI_MSK |
 			      FLEXCAN_MECR_FANCEI_MSK);
 		priv->write(reg_mecr, &regs->mecr);

Re: FAILED: patch "[PATCH] can: flexcan: disable completely the ECC mechanism" failed to apply to 4.14-stable tree

[Sasha Levin]

On Mon, Nov 11, 2019 at 07:31:46AM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.14-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 <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 5e269324db5adb2f5f6ec9a93a9c7b0672932b47 Mon Sep 17 00:00:00 2001
>From: Joakim Zhang <qiangqing.zhang@nxp.com>
>Date: Thu, 15 Aug 2019 08:00:26 +0000
>Subject: [PATCH] can: flexcan: disable completely the ECC mechanism
>
>The ECC (memory error detection and correction) mechanism can be
>activated or not, controlled by the ECCDIS bit in CAN_MECR. When
>disabled, updates on indications and reporting registers are stopped.
>So if want to disable ECC completely, had better assert ECCDIS bit, not
>just mask the related interrupts.
>
>Fixes: cdce844865be ("can: flexcan: add vf610 support for FlexCAN")
>Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
>Cc: linux-stable <stable@vger.kernel.org>
>Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

I've adjusted the patch to work around missing 88462d2a7830 ("can:
flexcan: Remodel FlexCAN register r/w APIs for big endian FlexCAN
controllers.") and queued it for 4.14-4.4.

-- 
Thanks,
Sasha

Re: FAILED: patch "[PATCH] can: flexcan: disable completely the ECC mechanism" failed to apply to 4.14-stable tree

[Greg KH]

On Mon, Nov 11, 2019 at 09:44:01AM -0500, Sasha Levin wrote:
> On Mon, Nov 11, 2019 at 07:31:46AM +0100, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 4.14-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 <stable@vger.kernel.org>.
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > > From 5e269324db5adb2f5f6ec9a93a9c7b0672932b47 Mon Sep 17 00:00:00 2001
> > From: Joakim Zhang <qiangqing.zhang@nxp.com>
> > Date: Thu, 15 Aug 2019 08:00:26 +0000
> > Subject: [PATCH] can: flexcan: disable completely the ECC mechanism
> > 
> > The ECC (memory error detection and correction) mechanism can be
> > activated or not, controlled by the ECCDIS bit in CAN_MECR. When
> > disabled, updates on indications and reporting registers are stopped.
> > So if want to disable ECC completely, had better assert ECCDIS bit, not
> > just mask the related interrupts.
> > 
> > Fixes: cdce844865be ("can: flexcan: add vf610 support for FlexCAN")
> > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
> > Cc: linux-stable <stable@vger.kernel.org>
> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> I've adjusted the patch to work around missing 88462d2a7830 ("can:
> flexcan: Remodel FlexCAN register r/w APIs for big endian FlexCAN
> controllers.") and queued it for 4.14-4.4.

Thanks for this, and fixing up all of the other FAILED: patches as well.

greg k-h