From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de,
Torin Cooper-Bennun <torin@maxiluxsystems.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [net 6/6] can: tcan4x5x: tcan4x5x_init(): fix initialization - clear MRAM before entering Normal Mode
Date: Mon, 1 Mar 2021 12:21:00 +0100 [thread overview]
Message-ID: <20210301112100.197939-7-mkl@pengutronix.de> (raw)
In-Reply-To: <20210301112100.197939-1-mkl@pengutronix.de>
From: Torin Cooper-Bennun <torin@maxiluxsystems.com>
This patch prevents a potentially destructive race condition. The
device is fully operational on the bus after entering Normal Mode, so
zeroing the MRAM after entering this mode may lead to loss of
information, e.g. new received messages.
This patch fixes the problem by first initializing the MRAM, then
bringing the device into Normale Mode.
Fixes: 5443c226ba91 ("can: tcan4x5x: Add tcan4x5x driver to the kernel")
Link: https://lore.kernel.org/r/20210226163440.313628-1-torin@maxiluxsystems.com
Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Torin Cooper-Bennun <torin@maxiluxsystems.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/tcan4x5x-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c
index b7caec769ddb..4147cecfbbd6 100644
--- a/drivers/net/can/m_can/tcan4x5x-core.c
+++ b/drivers/net/can/m_can/tcan4x5x-core.c
@@ -237,14 +237,14 @@ static int tcan4x5x_init(struct m_can_classdev *cdev)
if (ret)
return ret;
+ /* Zero out the MCAN buffers */
+ m_can_init_ram(cdev);
+
ret = regmap_update_bits(tcan4x5x->regmap, TCAN4X5X_CONFIG,
TCAN4X5X_MODE_SEL_MASK, TCAN4X5X_MODE_NORMAL);
if (ret)
return ret;
- /* Zero out the MCAN buffers */
- m_can_init_ram(cdev);
-
return ret;
}
--
2.30.1
prev parent reply other threads:[~2021-03-01 11:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 11:20 pull-request: can 2021-03-01 Marc Kleine-Budde
2021-03-01 11:20 ` [net 1/6] can: flexcan: assert FRZ bit in flexcan_chip_freeze() Marc Kleine-Budde
2021-03-01 11:20 ` [net 2/6] can: flexcan: enable RX FIFO after FRZ/HALT valid Marc Kleine-Budde
2021-03-01 11:20 ` [net 3/6] can: flexcan: invoke flexcan_chip_freeze() to enter freeze mode Marc Kleine-Budde
2021-03-16 16:00 ` [BUG] " Ahmad Fatoum
2021-03-17 8:18 ` Marc Kleine-Budde
2021-03-17 11:49 ` Marc Kleine-Budde
2021-03-18 9:23 ` Ahmad Fatoum
2021-03-01 11:20 ` [net 4/6] can: mcp251xfd: revert "can: mcp251xfd: add BQL support" Marc Kleine-Budde
2021-03-01 11:20 ` [net 5/6] can: skb: can_skb_set_owner(): fix ref counting if socket was closed before setting skb ownership Marc Kleine-Budde
2021-03-01 11:21 ` Marc Kleine-Budde [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210301112100.197939-7-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=torin@maxiluxsystems.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).