From nobody Thu Oct 2 06:30:09 2025 Received: from mail-m1973172.qiye.163.com (mail-m1973172.qiye.163.com [220.197.31.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95BCA9475; Mon, 22 Sep 2025 07:15:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758525362; cv=none; b=sYndU5Mklh4DzH8gWyc4NSk9gLGU+ULjVfWZDI8kAHl/r7O3F6DxXfl8WWjxBxw/sYaaqDJU/NeHKLZE+w8AlJJTWB9ZTpMl0m3hpvT42ETHR91LUX3gUYaXfGZRstgfF1KycRuASLRjUqdL7I2UFVy6FW/YXUpECq0wVwt+2Dg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758525362; c=relaxed/simple; bh=WJyFWtxyM53biavUGo9h4yaXgytMTxcSP6FazL+/hcw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pH4Z2uD6235lMB19EzOJlnhZXmUawF5j6M7C92o+ocIuuTXrVjDWs2Q/VpLQRUGg9XF1RtE1F9CBa6jEL0zKqh+vfgrb8DhvzHUGFclggqk0/s67pROrL++bfcGGQKoSpJskdmZkxDmmqAy7ge266UMerh3L7MJjtDlu6nbOB3o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com; spf=pass smtp.mailfrom=rock-chips.com; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b=adDGxODp; arc=none smtp.client-ip=220.197.31.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b="adDGxODp" Received: from rockchip.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 239b62aad; Mon, 22 Sep 2025 15:15:48 +0800 (GMT+08:00) From: Elaine Zhang To: zhangqing@rock-chips.com, mkl@pengutronix.de, kernel@pengutronix.de, mailhol.vincent@wanadoo.fr, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, heiko@sntech.de, cl@rock-chips.com, kever.yang@rock-chips.com Cc: linux-can@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v7 2/4] net: can: rockchip: Refactor the rkcanfd_devtype_data structure Date: Mon, 22 Sep 2025 15:15:41 +0800 Message-Id: <20250922071543.73923-3-zhangqing@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250922071543.73923-1-zhangqing@rock-chips.com> References: <20250922071543.73923-1-zhangqing@rock-chips.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-HM-Tid: 0a9970475b6603a3kunm864fae2f231619 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQkJIGFYaQhgaSk8fHkoYGElWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=adDGxODp5lYg8/dxR8E49/0uynMj9FKR6vyTt30oKDzZQ29xB1fMJ2AAoXc5rn+pdkYYtsPQ8PxLb2inD3VUciC3wJDdFIFzWfrJD5Ht4JJmYlQc2F0sMRkiZr8CRiqquzCUvJZVYO/rKMd+SE89zA34xVniraLI+lP4wEkg2jE=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=viw1dZoMCy1JfsXdyGIwszgEcCPifCEW3Xe8eIBNXNA=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" Add new function pointer: Encapsulate some hardware operation functions into rkcanfd_devtype_data to provide differentiated implementations for different models (such as RK3568v2/v3). Signed-off-by: Elaine Zhang --- .../net/can/rockchip/rockchip_canfd-core.c | 104 ++++++++++-------- drivers/net/can/rockchip/rockchip_canfd.h | 11 ++ 2 files changed, 72 insertions(+), 43 deletions(-) diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/c= an/rockchip/rockchip_canfd-core.c index c3fb3176ce42..c21ca4c1fb9a 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c @@ -24,32 +24,6 @@ =20 #include "rockchip_canfd.h" =20 -static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v2 =3D= { - .model =3D RKCANFD_MODEL_RK3568V2, - .quirks =3D 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 | - 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 =3D= { - .model =3D RKCANFD_MODEL_RK3568V3, - .quirks =3D 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) { @@ -212,7 +186,7 @@ static int rkcanfd_get_berr_counter(const struct net_de= vice *ndev, if (err) return err; =20 - rkcanfd_get_berr_counter_corrected(priv, bec); + priv->devtype_data.get_berr_counter(priv, bec); =20 pm_runtime_put(ndev->dev.parent); =20 @@ -296,13 +270,13 @@ static void rkcanfd_chip_start(struct rkcanfd_priv *p= riv) =20 memset(&priv->bec, 0x0, sizeof(priv->bec)); =20 - rkcanfd_chip_fifo_setup(priv); + priv->devtype_data.fifo_setup(priv); rkcanfd_timestamp_init(priv); rkcanfd_timestamp_start(priv); =20 rkcanfd_set_bittiming(priv); =20 - rkcanfd_chip_interrupts_disable(priv); + priv->devtype_data.interrupts_disable(priv); rkcanfd_chip_set_work_mode(priv); =20 priv->can.state =3D CAN_STATE_ERROR_ACTIVE; @@ -316,7 +290,7 @@ static void __rkcanfd_chip_stop(struct rkcanfd_priv *pr= iv, const enum can_state priv->can.state =3D state; =20 rkcanfd_chip_set_reset_mode(priv); - rkcanfd_chip_interrupts_disable(priv); + priv->devtype_data.interrupts_disable(priv); } =20 static void rkcanfd_chip_stop(struct rkcanfd_priv *priv, const enum can_st= ate state) @@ -342,8 +316,8 @@ static int rkcanfd_set_mode(struct net_device *ndev, =20 switch (mode) { case CAN_MODE_START: - rkcanfd_chip_start(priv); - rkcanfd_chip_interrupts_enable(priv); + priv->devtype_data.chip_start(priv); + priv->devtype_data.interrupts_enable(priv); netif_wake_queue(ndev); break; =20 @@ -537,7 +511,7 @@ static int rkcanfd_handle_error_int(struct rkcanfd_priv= *priv) if (cf) { struct can_berr_counter bec; =20 - rkcanfd_get_berr_counter_corrected(priv, &bec); + priv->devtype_data.get_berr_counter(priv, &bec); cf->can_id |=3D CAN_ERR_PROT | CAN_ERR_BUSERROR | CAN_ERR_CNT; cf->data[6] =3D bec.txerr; cf->data[7] =3D bec.rxerr; @@ -567,7 +541,7 @@ static int rkcanfd_handle_state_error_int(struct rkcanf= d_priv *priv) u32 timestamp; int err; =20 - rkcanfd_get_berr_counter_corrected(priv, &bec); + priv->devtype_data.get_berr_counter(priv, &bec); can_state_get_by_berr_counter(ndev, &bec, &tx_state, &rx_state); =20 new_state =3D max(tx_state, rx_state); @@ -581,7 +555,7 @@ static int rkcanfd_handle_state_error_int(struct rkcanf= d_priv *priv) can_change_state(ndev, cf, tx_state, rx_state); =20 if (new_state =3D=3D CAN_STATE_BUS_OFF) { - rkcanfd_chip_stop(priv, CAN_STATE_BUS_OFF); + priv->devtype_data.chip_stop(priv, CAN_STATE_BUS_OFF); can_bus_off(ndev); } =20 @@ -620,7 +594,7 @@ rkcanfd_handle_rx_fifo_overflow_int(struct rkcanfd_priv= *priv) if (!skb) return 0; =20 - rkcanfd_get_berr_counter_corrected(priv, &bec); + priv->devtype_data.get_berr_counter(priv, &bec); =20 cf->can_id |=3D CAN_ERR_CRTL | CAN_ERR_CNT; cf->data[1] =3D CAN_ERR_CRTL_RX_OVERFLOW; @@ -719,21 +693,21 @@ static int rkcanfd_open(struct net_device *ndev) if (err) goto out_close_candev; =20 - rkcanfd_chip_start(priv); + priv->devtype_data.chip_start(priv); can_rx_offload_enable(&priv->offload); =20 - err =3D request_irq(ndev->irq, rkcanfd_irq, IRQF_SHARED, ndev->name, priv= ); + err =3D request_irq(ndev->irq, priv->devtype_data.irq, IRQF_SHARED, ndev-= >name, priv); if (err) goto out_rkcanfd_chip_stop; =20 - rkcanfd_chip_interrupts_enable(priv); + priv->devtype_data.interrupts_enable(priv); =20 netif_start_queue(ndev); =20 return 0; =20 out_rkcanfd_chip_stop: - rkcanfd_chip_stop_sync(priv, CAN_STATE_STOPPED); + priv->devtype_data.chip_stop_sync(priv, CAN_STATE_STOPPED); pm_runtime_put(ndev->dev.parent); out_close_candev: close_candev(ndev); @@ -746,10 +720,10 @@ static int rkcanfd_stop(struct net_device *ndev) =20 netif_stop_queue(ndev); =20 - rkcanfd_chip_interrupts_disable(priv); + priv->devtype_data.interrupts_disable(priv); free_irq(ndev->irq, priv); can_rx_offload_disable(&priv->offload); - rkcanfd_chip_stop_sync(priv, CAN_STATE_STOPPED); + priv->devtype_data.chip_stop_sync(priv, CAN_STATE_STOPPED); close_candev(ndev); =20 pm_runtime_put(ndev->dev.parent); @@ -818,7 +792,7 @@ static int rkcanfd_register(struct rkcanfd_priv *priv) if (err) goto out_pm_runtime_put_sync; =20 - rkcanfd_register_done(priv); + priv->devtype_data.register_done(priv); =20 pm_runtime_put(ndev->dev.parent); =20 @@ -840,6 +814,50 @@ static inline void rkcanfd_unregister(struct rkcanfd_p= riv *priv) pm_runtime_disable(ndev->dev.parent); } =20 +static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v2 =3D= { + .model =3D RKCANFD_MODEL_RK3568V2, + .quirks =3D 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 | + RKCANFD_QUIRK_CANFD_BROKEN, + .get_berr_counter =3D rkcanfd_get_berr_counter_corrected, + .interrupts_enable =3D rkcanfd_chip_interrupts_enable, + .interrupts_disable =3D rkcanfd_chip_interrupts_disable, + .fifo_setup =3D rkcanfd_chip_fifo_setup, + .chip_start =3D rkcanfd_chip_start, + .chip_stop =3D rkcanfd_chip_stop, + .chip_stop_sync =3D rkcanfd_chip_stop_sync, + .irq =3D rkcanfd_irq, + .register_done =3D rkcanfd_register_done, +}; + +/* 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 =3D= { + .model =3D RKCANFD_MODEL_RK3568V3, + .quirks =3D 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, + .get_berr_counter =3D rkcanfd_get_berr_counter_corrected, + .interrupts_enable =3D rkcanfd_chip_interrupts_enable, + .interrupts_disable =3D rkcanfd_chip_interrupts_disable, + .fifo_setup =3D rkcanfd_chip_fifo_setup, + .chip_start =3D rkcanfd_chip_start, + .chip_stop =3D rkcanfd_chip_stop, + .chip_stop_sync =3D rkcanfd_chip_stop_sync, + .irq =3D rkcanfd_irq, + .register_done =3D rkcanfd_register_done, +}; + static const struct of_device_id rkcanfd_of_match[] =3D { { .compatible =3D "rockchip,rk3568v2-canfd", diff --git a/drivers/net/can/rockchip/rockchip_canfd.h b/drivers/net/can/ro= ckchip/rockchip_canfd.h index 93131c7d7f54..bcd26d23062b 100644 --- a/drivers/net/can/rockchip/rockchip_canfd.h +++ b/drivers/net/can/rockchip/rockchip_canfd.h @@ -436,9 +436,20 @@ enum rkcanfd_model { RKCANFD_MODEL_RK3568V3 =3D 0x35683, }; =20 +struct rkcanfd_priv; + struct rkcanfd_devtype_data { enum rkcanfd_model model; u32 quirks; + void (*get_berr_counter)(struct rkcanfd_priv *priv, struct can_berr_count= er *bec); + void (*interrupts_enable)(const struct rkcanfd_priv *priv); + void (*interrupts_disable)(const struct rkcanfd_priv *priv); + void (*fifo_setup)(struct rkcanfd_priv *priv); + void (*chip_start)(struct rkcanfd_priv *priv); + void (*chip_stop)(struct rkcanfd_priv *priv, const enum can_state state); + void (*chip_stop_sync)(struct rkcanfd_priv *priv, const enum can_state st= ate); + irqreturn_t (*irq)(int irq, void *dev_id); + void (*register_done)(const struct rkcanfd_priv *priv); }; =20 struct rkcanfd_fifo_header { --=20 2.34.1