From patchwork Tue Sep 3 09:22:01 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: 13788421 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 B1DFCCD3420 for ; Tue, 3 Sep 2024 09:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type: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=EZ4qsI7kCSgB3okmtfApxrPQ2DFxgnO9UR2f5Lh0h2A=; b=1xi1WHElGj+WXgzrgn5Gu3iErI c7BF0L1bKa09rGqvGUBAh6bjKJQHRGrhimw7D10jcWtm6I2PQdRUmGahlHljPaRamybxI7teYOE1x +QEw6U0C7J8P6ggDY0Ig8VMso5Y25cqMMqongpdl/E7oSZNMGH36jJiW+E+IulzopaDvmPYYbcpuZ x0S0SgGhwXqickV150K3PbJI5/gXn07dEjWu2+bWq9cun8G3tvMp3MI0RKRi7JmBKR24e+GjsRV34 cB0Ra6cnsoztKiYEfYAK28nB3g7nczTyRkuurwt4BasUxXRTyKGd+kOC1pItzNxxwxFqXdaepMqKm /Tx0UE4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1slQ1w-0000000HD8N-3moY; Tue, 03 Sep 2024 09:40:56 +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 1slPkV-0000000H7Zh-3UwM for linux-arm-kernel@bombadil.infradead.org; Tue, 03 Sep 2024 09:22:56 +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=EZ4qsI7kCSgB3okmtfApxrPQ2DFxgnO9UR2f5Lh0h2A=; b=S8ztxAOO3o7E1fKkw6wPqOwfQA ATKC3EU6fm8uIdmD9Z5sFaqf8FuQgBqcKj0C5J3ZxLXM3V4R2XNM6rV8NhKt/3xBiaW5x4giA48F3 2tArxHQiy2BpBgwLSoe+g9/QvDIb7ffTjdkQWnoVu+O2NhZGfpOXYSrmnZTzPGsSNr90DZQENkXEH Daob9KzXJmDc4/cNwjs3UF/aqo7oOIOSQ82Jul687YwGv+tzDxaUsg4Tmg4VPHsgLgE0x33tNhh+C Onk3XULEf1UomOtP5fb415omeHm8Wni5bfaUfjqu6JB2X/nnRupVCeFbYEvzTfq010nETitxCHOBh r2pnbVgw==; 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 1slPkP-0000000CIdz-2Gje for linux-arm-kernel@lists.infradead.org; Tue, 03 Sep 2024 09:22:54 +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 1slPkM-0000x8-Ig for linux-arm-kernel@lists.infradead.org; Tue, 03 Sep 2024 11:22:46 +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 1slPkG-0059aB-Fh for linux-arm-kernel@lists.infradead.org; Tue, 03 Sep 2024 11:22:40 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 2A5633311F0 for ; Tue, 03 Sep 2024 09:22:40 +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 BE326331053; Tue, 03 Sep 2024 09:22:28 +0000 (UTC) Received: from [172.20.34.65] (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id a4c5bc54; Tue, 3 Sep 2024 09:22:26 +0000 (UTC) From: Marc Kleine-Budde Date: Tue, 03 Sep 2024 11:22:01 +0200 Subject: [PATCH can-next v4 19/20] can: rockchip_canfd: add support for CAN_CTRLMODE_LOOPBACK MIME-Version: 1.0 Message-Id: <20240903-rockchip-canfd-v4-19-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=2135; i=mkl@pengutronix.de; h=from:subject:message-id; bh=44NzGtqpU5BxdFed4h+jxAkMAchbCULQjVzky0gCZl8=; b=owEBbQGS/pANAwAKASg4oj56LbxvAcsmYgBm1tVP+bEkHjt+8QROwXnaOobkYXGw+zVW/7qQf 6HyoOCM+r+JATMEAAEKAB0WIQRQQLqG4LYE3Sm8Pl8oOKI+ei28bwUCZtbVTwAKCRAoOKI+ei28 b1U0B/9z0F9gyak5ONgalMs6O0omh8Y5aoZ9w5/m6EBgqSawmRIPJgAqv/G31rDdyo5zC7RIfxq h+opPC/Ro8IGmwJtPW2FMAZlUR9GAYNYOHu7y6k9fUbXifY3SL/sxIHr302ZxJMgG2y/rBtpiGP TfPqpiB6G96D2iB/EN1e95YaYslWVlorlP3gDfPBeQLJel1CGQhIZmqUGogAQJQ7ClcZRaDlR8l tCB3nAMP9U1nHZ3qKXa0lIN3dlbqefTvPWOW69BFViy3oaBK4ZvfNeakaY46h93BGLXzaVhVaaN KpEjllKKeQHgGpzmIp6/7KLsSU53Fj41Qlg2heEGG+qrSusG 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240903_102250_071593_59FB4A24 X-CRM114-Status: GOOD ( 17.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add support for loopback mode. Tested-by: Alibek Omarov Signed-off-by: Marc Kleine-Budde --- drivers/net/can/rockchip/rockchip_canfd-core.c | 7 ++++++- drivers/net/can/rockchip/rockchip_canfd-rx.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c index 015623314e88..8853f6a135da 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c @@ -276,6 +276,11 @@ static void rkcanfd_chip_start(struct rkcanfd_priv *priv) RKCANFD_REG_MODE_RXSTX_MODE | RKCANFD_REG_MODE_WORK_MODE; + if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) + priv->reg_mode_default |= RKCANFD_REG_MODE_LBACK_MODE | + RKCANFD_REG_MODE_SILENT_MODE | + RKCANFD_REG_MODE_SELF_TEST; + /* mask, i.e. ignore: * - TIMESTAMP_COUNTER_OVERFLOW_INT - timestamp counter overflow interrupt * - TX_ARBIT_FAIL_INT - TX arbitration fail interrupt @@ -894,7 +899,7 @@ static int rkcanfd_probe(struct platform_device *pdev) priv->can.clock.freq = clk_get_rate(priv->clks[0].clk); priv->can.bittiming_const = &rkcanfd_bittiming_const; priv->can.data_bittiming_const = &rkcanfd_data_bittiming_const; - priv->can.ctrlmode_supported = 0; + priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK; if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN)) priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD; priv->can.do_set_mode = rkcanfd_set_mode; diff --git a/drivers/net/can/rockchip/rockchip_canfd-rx.c b/drivers/net/can/rockchip/rockchip_canfd-rx.c index d862116840eb..475c0409e215 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-rx.c +++ b/drivers/net/can/rockchip/rockchip_canfd-rx.c @@ -243,7 +243,7 @@ static int rkcanfd_handle_rx_int_one(struct rkcanfd_priv *priv) err = rkcanfd_rxstx_filter(priv, cfd, header->ts, &tx_done); if (err) return err; - if (tx_done) + if (tx_done && !(priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)) return 0; }