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, Marc Kleine-Budde <mkl@pengutronix.de>,
Alibek Omarov <a1ba.omarov@gmail.com>,
Heiko Stuebner <heiko@sntech.de>
Subject: [PATCH net-next 05/18] can: rockchip_canfd: add support for rk3568v3
Date: Wed, 4 Sep 2024 14:55:21 +0200 [thread overview]
Message-ID: <20240904130256.1965582-6-mkl@pengutronix.de> (raw)
In-Reply-To: <20240904130256.1965582-1-mkl@pengutronix.de>
Add the support for the rk3568v3 SoC, the CAN-FD IP core has 7
documented errata.
Tested-by: Alibek Omarov <a1ba.omarov@gmail.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20240904-rockchip-canfd-v5-7-8ae22bcb27cc@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
.../net/can/rockchip/rockchip_canfd-core.c | 20 +++++++++++++++++++
drivers/net/can/rockchip/rockchip_canfd.h | 1 +
2 files changed, 21 insertions(+)
diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c
index 61de6f89cf16..40911bb63623 100644
--- a/drivers/net/can/rockchip/rockchip_canfd-core.c
+++ b/drivers/net/can/rockchip/rockchip_canfd-core.c
@@ -35,11 +35,28 @@ static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v2 = {
RKCANFD_QUIRK_CANFD_BROKEN,
};
+/* The rk3568 CAN-FD errata sheet as of Tue 07 Nov 2023 11:25:31 +08:00
+ * states that only the rk3568v2 is affected by erratum 5, but tests
+ * with the rk3568v2 and rk3568v3 show that the RX_FIFO_CNT is
+ * sometimes too high. In contrast to the errata sheet mark rk3568v3
+ * as effected by erratum 5, too.
+ */
+static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v3 = {
+ .model = RKCANFD_MODEL_RK3568V3,
+ .quirks = RKCANFD_QUIRK_RK3568_ERRATUM_1 | RKCANFD_QUIRK_RK3568_ERRATUM_2 |
+ RKCANFD_QUIRK_RK3568_ERRATUM_5 | RKCANFD_QUIRK_RK3568_ERRATUM_7 |
+ RKCANFD_QUIRK_RK3568_ERRATUM_8 | RKCANFD_QUIRK_RK3568_ERRATUM_10 |
+ RKCANFD_QUIRK_RK3568_ERRATUM_11 | RKCANFD_QUIRK_RK3568_ERRATUM_12 |
+ RKCANFD_QUIRK_CANFD_BROKEN,
+};
+
static const char *__rkcanfd_get_model_str(enum rkcanfd_model model)
{
switch (model) {
case RKCANFD_MODEL_RK3568V2:
return "rk3568v2";
+ case RKCANFD_MODEL_RK3568V3:
+ return "rk3568v3";
}
return "<unknown>";
@@ -764,6 +781,9 @@ static const struct of_device_id rkcanfd_of_match[] = {
{
.compatible = "rockchip,rk3568v2-canfd",
.data = &rkcanfd_devtype_data_rk3568v2,
+ }, {
+ .compatible = "rockchip,rk3568v3-canfd",
+ .data = &rkcanfd_devtype_data_rk3568v3,
}, {
/* sentinel */
},
diff --git a/drivers/net/can/rockchip/rockchip_canfd.h b/drivers/net/can/rockchip/rockchip_canfd.h
index 7321027534fb..9b446331fbd0 100644
--- a/drivers/net/can/rockchip/rockchip_canfd.h
+++ b/drivers/net/can/rockchip/rockchip_canfd.h
@@ -372,6 +372,7 @@
enum rkcanfd_model {
RKCANFD_MODEL_RK3568V2 = 0x35682,
+ RKCANFD_MODEL_RK3568V3 = 0x35683,
};
struct rkcanfd_devtype_data {
--
2.45.2
next prev parent reply other threads:[~2024-09-04 13:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 12:55 [PATCH net-next 0/18] pull-request: can-next 2024-09-04-2 Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 01/18] dt-bindings: can: rockchip_canfd: add rockchip CAN-FD controller Marc Kleine-Budde
2024-09-05 13:20 ` patchwork-bot+netdevbpf
2024-09-04 12:55 ` [PATCH net-next 02/18] can: rockchip_canfd: add driver for Rockchip " Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 03/18] can: rockchip_canfd: add quirks for errata workarounds Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 04/18] can: rockchip_canfd: add quirk for broken CAN-FD support Marc Kleine-Budde
2024-09-04 12:55 ` Marc Kleine-Budde [this message]
2024-09-04 12:55 ` [PATCH net-next 06/18] can: rockchip_canfd: add notes about known issues Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 07/18] can: rockchip_canfd: rkcanfd_handle_rx_int_one(): implement workaround for erratum 5: check for empty FIFO Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 08/18] can: rockchip_canfd: rkcanfd_register_done(): add warning for erratum 5 Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 09/18] can: rockchip_canfd: add TX PATH Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 10/18] can: rockchip_canfd: implement workaround for erratum 6 Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 11/18] can: rockchip_canfd: implement workaround for erratum 12 Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 12/18] can: rockchip_canfd: rkcanfd_get_berr_counter_corrected(): work around broken {RX,TX}ERRORCNT register Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 13/18] can: rockchip_canfd: add stats support for errata workarounds Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 14/18] can: rockchip_canfd: prepare to use full TX-FIFO depth Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 15/18] can: rockchip_canfd: enable full TX-FIFO depth of 2 Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 16/18] can: rockchip_canfd: add hardware timestamping support Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 17/18] can: rockchip_canfd: add support for CAN_CTRLMODE_LOOPBACK Marc Kleine-Budde
2024-09-04 12:55 ` [PATCH net-next 18/18] 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=20240904130256.1965582-6-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=a1ba.omarov@gmail.com \
--cc=davem@davemloft.net \
--cc=heiko@sntech.de \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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