Patch "can: flexcan: assert FRZ bit in flexcan_chip_freeze()" has been added to the 5.10-stable tree

[<gregkh@xxxxxxxxxxxxxxxxxxx>]

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

    can: flexcan: assert FRZ bit in flexcan_chip_freeze()

to the 5.10-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-assert-frz-bit-in-flexcan_chip_freeze.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 449052cfebf624b670faa040245d3feed770d22f Mon Sep 17 00:00:00 2001
From: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Date: Thu, 18 Feb 2021 19:00:35 +0800
Subject: can: flexcan: assert FRZ bit in flexcan_chip_freeze()

From: Joakim Zhang <qiangqing.zhang@xxxxxxx>

commit 449052cfebf624b670faa040245d3feed770d22f upstream.

Assert HALT bit to enter freeze mode, there is a premise that FRZ bit is
asserted. This patch asserts FRZ bit in flexcan_chip_freeze, although
the reset value is 1b'1. This is a prepare patch, later patch will
invoke flexcan_chip_freeze() to enter freeze mode, which polling freeze
mode acknowledge.

Fixes: b1aa1c7a2165b ("can: flexcan: fix transition from and to freeze mode in chip_{,un}freeze")
Link: https://lore.kernel.org/r/20210218110037.16591-2-qiangqing.zhang@xxxxxxx
Signed-off-by: Joakim Zhang <qiangqing.zhang@xxxxxxx>
Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 drivers/net/can/flexcan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -662,7 +662,7 @@ static int flexcan_chip_freeze(struct fl
 	u32 reg;
 
 	reg = priv->read(&regs->mcr);
-	reg |= FLEXCAN_MCR_HALT;
+	reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT;
 	priv->write(reg, &regs->mcr);
 
 	while (timeout-- && !(priv->read(&regs->mcr) & FLEXCAN_MCR_FRZ_ACK))


Patches currently in stable-queue which might be from qiangqing.zhang@xxxxxxx are

queue-5.10/can-flexcan-enable-rx-fifo-after-frz-halt-valid.patch
queue-5.10/can-flexcan-assert-frz-bit-in-flexcan_chip_freeze.patch
queue-5.10/can-flexcan-invoke-flexcan_chip_freeze-to-enter-freeze-mode.patch