From patchwork Tue Sep 3 09:21:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 13788405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84A1CCD3420 for ; Tue, 3 Sep 2024 09:37:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ls/YKv9FDqIh5gQcYOA8ziAPh54ejjBq0rHuHka42QA=; b=GiSIyPKU4sTcuj o2naKgQL28HH8QDuER1radtL52Sy1Mp4WiF00v+h2U++eTrqz/wrsTQe92WKq9LYEV9X4r2B2qDPU wO6C72UQSK9ANmfuhfnciCbBslDBNOGplvS9/YVB9DRJ6CuqOziZlmt5G1aWcRG4pSxK1TjYCMcKS J4Wafegcfc8LWt4bL6FQzQdU7xjwLziVztr8ajPiEJ6sLmZMFsWTdS74Ob7ZwkNsCL19tUCWTVRJP fegKa1+qQoWVgPcP6b5DClz29EX4AUdpzgm/EQS9CnzvTIbqiqkBVxA69ob+P27NXaXPRTGiPbRUD VqfRhffspqOzDFkLMbSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1slPyI-0000000HC0S-3oDr; Tue, 03 Sep 2024 09:37:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1slPkS-0000000H7Xr-1xTy for linux-rockchip@bombadil.infradead.org; Tue, 03 Sep 2024 09:22:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=nyhaHRIO67dqjTPfspX7cnN0SAxSlhc+3zLHx2kMHl8=; b=QBSVhE1FLSRUBB9fBo+9BgNB7u AkCpsCSHBWJ7qqSadlQxTEVQk+XDsAf8DjxoODycEqoJl32llMkkzORjq3umvP9BdHEiu6YFcUqrR 6m6c+kAtTnwNlyVIC8jwVMkR/AUz5N9rPV7PeowQg1L8v2UO3BajPhCtg/5BtK9hemhU2wHFi41g2 U6wd7gS1VJ4vI5r9gXuy3yRKZlElDx17fSjvMZfUOcHZ/vZwpdD/cjntVLtFT8kFWAG3nzPqlDe2C OZLMs0O4YdrIfJ5CIuzLaIbzThzxOy+OReRAmCYUH0IlTGMd22MsH010EUATsFCbv/0OrB2tdx9eS EN4Vv3iA==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1slPkK-0000000CIcl-43Ly for linux-rockchip@lists.infradead.org; Tue, 03 Sep 2024 09:22:51 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1slPkH-0000oD-Sv for linux-rockchip@lists.infradead.org; Tue, 03 Sep 2024 11:22:41 +0200 Received: from [2a0a:edc0:0:b01:1d::7b] (helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1slPkB-0059SR-F3 for linux-rockchip@lists.infradead.org; Tue, 03 Sep 2024 11:22:35 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id F1A30331108 for ; Tue, 03 Sep 2024 09:22:34 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 8073C33102D; Tue, 03 Sep 2024 09:22:27 +0000 (UTC) Received: from [172.20.34.65] (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 7aaf2de3; Tue, 3 Sep 2024 09:22:26 +0000 (UTC) From: Marc Kleine-Budde Date: Tue, 03 Sep 2024 11:21:49 +0200 Subject: [PATCH can-next v4 07/20] can: rockchip_canfd: add support for rk3568v3 MIME-Version: 1.0 Message-Id: <20240903-rockchip-canfd-v4-7-1dc3f3f32856@pengutronix.de> References: <20240903-rockchip-canfd-v4-0-1dc3f3f32856@pengutronix.de> In-Reply-To: <20240903-rockchip-canfd-v4-0-1dc3f3f32856@pengutronix.de> To: kernel@pengutronix.de, Alibek Omarov , Vincent Mailhol , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Philipp Zabel , Elaine Zhang , David Jander Cc: Simon Horman , 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 X-Mailer: b4 0.15-dev-99b12 X-Developer-Signature: v=1; a=openpgp-sha256; l=2480; i=mkl@pengutronix.de; h=from:subject:message-id; bh=kI/a3LIJoA6o+D0CBQkvFfYlrafVr1kbTwEszrFv5+U=; b=owEBbQGS/pANAwAKASg4oj56LbxvAcsmYgBm1tU9JGg4HfLADD2e0kvz7ec8ndJ43QrCh816s ujz+7vTAGKJATMEAAEKAB0WIQRQQLqG4LYE3Sm8Pl8oOKI+ei28bwUCZtbVPQAKCRAoOKI+ei28 b1DpB/9glYwYWjXOn1Z4r/arxSUtA9R3N4MGWmKzEKWKbsIo7W/i6zNTSPvdwh5uO8TIjLj1Kn4 qyORnfb5oA0OSDcsmChvXto8xHzZgJesOQ/ZuBCiDigRoxVkX22pBcV+xkvqy6h0ctv+vSwy3FQ Voe+FWluDhhvERbYPmvsjYEtd7y6df2sOAU3vVh4BerK9yp4MJLXY3YT5Dr4b1jz/tw+nfXzNHz Fp7tV3k07mihR1w1AYWT3qid0eiEeJi+ZkoBdh98F1ryApL/5/NvTTy+EJvqKfNjTE32ufTypcv ob9pJoXcF9itb4VK9e9AlcEDSZ46wWc6bX8k02df9P8spTjV X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-rockchip@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240903_102245_272948_D29C0331 X-CRM114-Status: GOOD ( 15.39 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add the support for the rk3568v3 SoC, the CAN-FD IP core has 7 documented errata. Tested-by: Alibek Omarov Signed-off-by: Marc Kleine-Budde --- drivers/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 ""; @@ -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 {