Skip to content

Commit

Permalink
can: rockchip_canfd: add quirks for errata workarounds
Browse files Browse the repository at this point in the history
Add a basic infrastructure for quirks for the 12 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-5-8ae22bcb27cc@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Marc Kleine-Budde committed Sep 4, 2024
1 parent ff60bfb commit bbc783b
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/net/can/rockchip/rockchip_canfd-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@

static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v2 = {
.model = RKCANFD_MODEL_RK3568V2,
.quirks = RKCANFD_QUIRK_RK3568_ERRATUM_1 | RKCANFD_QUIRK_RK3568_ERRATUM_2 |
RKCANFD_QUIRK_RK3568_ERRATUM_3 | RKCANFD_QUIRK_RK3568_ERRATUM_4 |
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,
};

static const char *__rkcanfd_get_model_str(enum rkcanfd_model model)
Expand Down Expand Up @@ -709,10 +715,11 @@ static void rkcanfd_register_done(const struct rkcanfd_priv *priv)
dev_id = rkcanfd_read(priv, RKCANFD_REG_RTL_VERSION);

netdev_info(priv->ndev,
"Rockchip-CANFD %s rev%lu.%lu found\n",
"Rockchip-CANFD %s rev%lu.%lu (errata 0x%04x) found\n",
rkcanfd_get_model_str(priv),
FIELD_GET(RKCANFD_REG_RTL_VERSION_MAJOR, dev_id),
FIELD_GET(RKCANFD_REG_RTL_VERSION_MINOR, dev_id));
FIELD_GET(RKCANFD_REG_RTL_VERSION_MINOR, dev_id),
priv->devtype_data.quirks);
}

static int rkcanfd_register(struct rkcanfd_priv *priv)
Expand Down
55 changes: 55 additions & 0 deletions drivers/net/can/rockchip/rockchip_canfd.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,67 @@
#define RKCANFD_TIMESTAMP_WORK_MAX_DELAY_SEC 60
#define RKCANFD_ERRATUM_5_SYSCLOCK_HZ_MIN (300 * MEGA)

/* rk3568 CAN-FD Errata, as of Tue 07 Nov 2023 11:25:31 +08:00 */

/* Erratum 1: The error frame sent by the CAN controller has an
* abnormal format.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_1 BIT(0)

/* Erratum 2: The error frame sent after detecting a CRC error has an
* abnormal position.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_2 BIT(1)

/* Erratum 3: Intermittent CRC calculation errors. */
#define RKCANFD_QUIRK_RK3568_ERRATUM_3 BIT(2)

/* Erratum 4: Intermittent occurrence of stuffing errors. */
#define RKCANFD_QUIRK_RK3568_ERRATUM_4 BIT(3)

/* Erratum 5: Counters related to the TXFIFO and RXFIFO exhibit
* abnormal counting behavior.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_5 BIT(4)

/* Erratum 6: The CAN controller's transmission of extended frames may
* intermittently change into standard frames
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_6 BIT(5)

/* Erratum 7: In the passive error state, the CAN controller's
* interframe space segment counting is inaccurate.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_7 BIT(6)

/* Erratum 8: The Format-Error error flag is transmitted one bit
* later.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_8 BIT(7)

/* Erratum 9: In the arbitration segment, the CAN controller will
* identify stuffing errors as arbitration failures.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_9 BIT(8)

/* Erratum 10: Does not support the BUSOFF slow recovery mechanism. */
#define RKCANFD_QUIRK_RK3568_ERRATUM_10 BIT(9)

/* Erratum 11: Arbitration error. */
#define RKCANFD_QUIRK_RK3568_ERRATUM_11 BIT(10)

/* Erratum 12: A dominant bit at the third bit of the intermission may
* cause a transmission error.
*/
#define RKCANFD_QUIRK_RK3568_ERRATUM_12 BIT(11)

enum rkcanfd_model {
RKCANFD_MODEL_RK3568V2 = 0x35682,
};

struct rkcanfd_devtype_data {
enum rkcanfd_model model;
u32 quirks;
};

struct rkcanfd_fifo_header {
Expand Down

0 comments on commit bbc783b

Please sign in to comment.