From: Marc Kleine-Budde <mkl@pengutronix.de>
To: kernel@pengutronix.de,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
Philipp Zabel <p.zabel@pengutronix.de>,
Elaine Zhang <zhangqing@rock-chips.com>,
David Jander <david.jander@protonic.nl>
Cc: Simon Horman <horms@kernel.org>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org,
linux-kernel@vger.kernel.org,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH can-next v2 19/20] can: rockchip_canfd: add support for CAN_CTRLMODE_LOOPBACK
Date: Wed, 31 Jul 2024 11:37:21 +0200 [thread overview]
Message-ID: <20240731-rockchip-canfd-v2-19-d9604c5b4be8@pengutronix.de> (raw)
In-Reply-To: <20240731-rockchip-canfd-v2-0-d9604c5b4be8@pengutronix.de>
Add support for loopback mode.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/rockchip/rockchip_canfd-core.c | 7 ++++++-
drivers/net/can/rockchip/rockchip_canfd-rx.c | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c
index acbbfdd4cb69..2d6eca8d23be 100644
--- a/drivers/net/can/rockchip/rockchip_canfd-core.c
+++ b/drivers/net/can/rockchip/rockchip_canfd-core.c
@@ -276,6 +276,11 @@ static void rkcanfd_chip_start(struct rkcanfd_priv *priv)
RKCANFD_REG_MODE_RXSTX_MODE |
RKCANFD_REG_MODE_WORK_MODE;
+ if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)
+ priv->reg_mode_default |= RKCANFD_REG_MODE_LBACK_MODE |
+ RKCANFD_REG_MODE_SILENT_MODE |
+ RKCANFD_REG_MODE_SELF_TEST;
+
/* mask, i.e. ignore:
* - TIMESTAMP_COUNTER_OVERFLOW_INT - timestamp counter overflow interrupt
* - TX_ARBIT_FAIL_INT - TX arbitration fail interrupt
@@ -897,7 +902,7 @@ static int rkcanfd_probe(struct platform_device *pdev)
priv->can.clock.freq = clk_get_rate(priv->clks[0].clk);
priv->can.bittiming_const = &rkcanfd_bittiming_const;
priv->can.data_bittiming_const = &rkcanfd_data_bittiming_const;
- priv->can.ctrlmode_supported = 0;
+ priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK;
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
priv->can.do_set_mode = rkcanfd_set_mode;
diff --git a/drivers/net/can/rockchip/rockchip_canfd-rx.c b/drivers/net/can/rockchip/rockchip_canfd-rx.c
index d862116840eb..475c0409e215 100644
--- a/drivers/net/can/rockchip/rockchip_canfd-rx.c
+++ b/drivers/net/can/rockchip/rockchip_canfd-rx.c
@@ -243,7 +243,7 @@ static int rkcanfd_handle_rx_int_one(struct rkcanfd_priv *priv)
err = rkcanfd_rxstx_filter(priv, cfd, header->ts, &tx_done);
if (err)
return err;
- if (tx_done)
+ if (tx_done && !(priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK))
return 0;
}
--
2.43.0
next prev parent reply other threads:[~2024-07-31 9:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 9:37 [PATCH can-next v2 00/20] an: rockchip_canfd: add support for CAN-FD IP core found on Rockchip RK3568 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 01/20] dt-bindings: can: rockchip_canfd: add rockchip CAN-FD controller Marc Kleine-Budde
2024-08-06 16:50 ` Rob Herring
2024-08-06 19:55 ` Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 02/20] arm64: dts: rockchip: add CAN-FD controller nodes to rk3568 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 03/20] arm64: dts: rockchip: mecsbc: add CAN0 and CAN1 interfaces Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 04/20] can: rockchip_canfd: add driver for Rockchip CAN-FD controller Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 05/20] can: rockchip_canfd: add quirks for errata workarounds Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 06/20] can: rockchip_canfd: add quirk for broken CAN-FD support Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 07/20] can: rockchip_canfd: add support for rk3568v3 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 08/20] can: rockchip_canfd: add notes about known issues Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 09/20] can: rockchip_canfd: rkcanfd_handle_rx_int_one(): implement workaround for erratum 5: check for empty FIFO Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 10/20] can: rockchip_canfd: rkcanfd_register_done(): add warning for erratum 5 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 11/20] can: rockchip_canfd: add TX PATH Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 12/20] can: rockchip_canfd: implement workaround for erratum 6 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 13/20] can: rockchip_canfd: implement workaround for erratum 12 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 14/20] can: rockchip_canfd: rkcanfd_get_berr_counter_corrected(): work around broken {RX,TX}ERRORCNT register Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 15/20] can: rockchip_canfd: add stats support for errata workarounds Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 16/20] can: rockchip_canfd: prepare to use full TX-FIFO depth Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 17/20] can: rockchip_canfd: enable full TX-FIFO depth of 2 Marc Kleine-Budde
2024-07-31 9:37 ` [PATCH can-next v2 18/20] can: rockchip_canfd: add hardware timestamping support Marc Kleine-Budde
2024-07-31 9:37 ` Marc Kleine-Budde [this message]
2024-07-31 9:37 ` [PATCH can-next v2 20/20] can: rockchip_canfd: add support for CAN_CTRLMODE_BERR_REPORTING Marc Kleine-Budde
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=20240731-rockchip-canfd-v2-19-d9604c5b4be8@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=david.jander@protonic.nl \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=heiko@sntech.de \
--cc=horms@kernel.org \
--cc=kernel@pengutronix.de \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=netdev@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=pabeni@redhat.com \
--cc=robh@kernel.org \
--cc=zhangqing@rock-chips.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).