Skip to content

Commit

Permalink
can: rockchip_canfd: add quirk for broken CAN-FD support
Browse files Browse the repository at this point in the history
The errata sheets doesn't say anything about CAN-FD, but tests on the
rk3568v2 and rk3568v3 show that receiving certain CAN-FD frames
triggers an Error Interrupt.

Mark the CAN-FD support as broken.

Tested-by: Alibek Omarov <a1ba.omarov@gmail.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20240904-rockchip-canfd-v5-6-8ae22bcb27cc@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Marc Kleine-Budde committed Sep 4, 2024
1 parent bbc783b commit bbdffb3
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/net/can/rockchip/rockchip_canfd-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v2 = {
RKCANFD_QUIRK_RK3568_ERRATUM_5 | RKCANFD_QUIRK_RK3568_ERRATUM_6 |
RKCANFD_QUIRK_RK3568_ERRATUM_7 | RKCANFD_QUIRK_RK3568_ERRATUM_8 |
RKCANFD_QUIRK_RK3568_ERRATUM_9 | RKCANFD_QUIRK_RK3568_ERRATUM_10 |
RKCANFD_QUIRK_RK3568_ERRATUM_11 | RKCANFD_QUIRK_RK3568_ERRATUM_12,
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)
Expand Down Expand Up @@ -817,6 +818,8 @@ static int rkcanfd_probe(struct platform_device *pdev)
priv->can.bittiming_const = &rkcanfd_bittiming_const;
priv->can.data_bittiming_const = &rkcanfd_data_bittiming_const;
priv->can.ctrlmode_supported = 0;
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
priv->can.do_set_mode = rkcanfd_set_mode;
priv->can.do_get_berr_counter = rkcanfd_get_berr_counter;
priv->ndev = ndev;
Expand Down
21 changes: 21 additions & 0 deletions drivers/net/can/rockchip/rockchip_canfd.h
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,27 @@
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_12 BIT(11)

/* Tests on the rk3568v2 and rk3568v3 show that receiving certain
* CAN-FD frames trigger an Error Interrupt.
*
* - Form Error in RX Arbitration Phase: TX_IDLE RX_STUFF_COUNT (0x0a010100) CMD=0 RX=0 TX=0
* Error-Warning=1 Bus-Off=0
* To reproduce:
* host:
* cansend can0 002##01f
* DUT:
* candump any,0:0,#FFFFFFFF -cexdHtA
*
* - Form Error in RX Arbitration Phase: TX_IDLE RX_CRC (0x0a010200) CMD=0 RX=0 TX=0
* Error-Warning=1 Bus-Off=0
* To reproduce:
* host:
* cansend can0 002##07217010000000000
* DUT:
* candump any,0:0,#FFFFFFFF -cexdHtA
*/
#define RKCANFD_QUIRK_CANFD_BROKEN BIT(12)

enum rkcanfd_model {
RKCANFD_MODEL_RK3568V2 = 0x35682,
};
Expand Down

0 comments on commit bbdffb3

Please sign in to comment.