summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDuy Nguyen <duy.nguyen.rh@renesas.com>2025-09-18 07:03:45 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-12 13:01:03 +0200
commita97ecc1972aa5e500bde8898351425d27f1cdf69 (patch)
tree22548f51e7873d92a43d8758adea0cf8cc44c34c /drivers/net
parentfd00cf38fd437c979f0e5905e3ebdfc3f55a4b96 (diff)
downloadlinux-a97ecc1972aa5e500bde8898351425d27f1cdf69.tar.gz
linux-a97ecc1972aa5e500bde8898351425d27f1cdf69.tar.bz2
linux-a97ecc1972aa5e500bde8898351425d27f1cdf69.zip
can: rcar_canfd: Fix controller mode setting
[ Upstream commit 5cff263606a10102a0ea19ff579eaa18fd5577ad ] Driver configures register to choose controller mode before setting all channels to reset mode leading to failure. The patch corrects operation of mode setting. Signed-off-by: Duy Nguyen <duy.nguyen.rh@renesas.com> Signed-off-by: Tranh Ha <tranh.ha.xb@renesas.com> Link: https://patch.msgid.link/TYWPR01MB87434739F83E27EDCD23DF44B416A@TYWPR01MB8743.jpnprd01.prod.outlook.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/rcar/rcar_canfd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 7f10213738e5..e2ae8d6a9de6 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -870,9 +870,6 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)
/* Reset Global error flags */
rcar_canfd_write(gpriv->base, RCANFD_GERFL, 0x0);
- /* Set the controller into appropriate mode */
- rcar_canfd_set_mode(gpriv);
-
/* Transition all Channels to reset mode */
for_each_set_bit(ch, &gpriv->channels_mask, gpriv->info->max_channels) {
rcar_canfd_clear_bit(gpriv->base,
@@ -892,6 +889,10 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)
return err;
}
}
+
+ /* Set the controller into appropriate mode */
+ rcar_canfd_set_mode(gpriv);
+
return 0;
}