From patchwork Wed Jul 31 09:37:21 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: 13748391 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 996F5C52D1F for ; Wed, 31 Jul 2024 09:46:19 +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=M5UyzQ/bjCO5+XIUKWrPjo6QO2o1dya4gj2hig38TMc=; b=cL0N0tZ3/7PEGV UsPTSP8euyGEYtNgbtdlgtKt4cqPknHm9S9oLhVVChl5guzg6TS5mBCsf1QjTyHD7fcuDsEijX8eP N/SJGfC0oGfXffYn6XXZcMgzeyhguuo+gebywe9Pz56lO35K9x0jvQT5yFN05QtiDT/os2J/HYhfL gj2R2qTfHHgER+uGJUU+2ZVRK00oXfCh9don8MhfGrmubLX3VCAqtJVLQhmKHQpZkkkOGiWoH4Fku DZzcnUEE0+z5LixzmospxAjov2anVMp4mnAVRTMurVO2NDvEi27KmyHup37Sc52XfI5c9mkAMKlB0 hsf7eYR19/yTSl0Gvy5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZ5uS-00000000af8-1X3r; Wed, 31 Jul 2024 09:46:16 +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 1sZ5mh-00000000XMS-2S4i for linux-rockchip@bombadil.infradead.org; Wed, 31 Jul 2024 09:38:15 +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=YUJaZHwG+LFemzkfWO3lb5GuicoVVDd+pmPy9WWdBIM=; b=XiAaLC2WNOCoBhhs0NeqZRS7Y3 Ebdjh9G91G+AmpYE2iHBxYwYXAM7MhZsb9AB8We3O11xM8mNXCtJI6d04kASu2i5SivcrkGdlCU5+ mESIvqdnxHbKoXEu2rEYSi/7WCGVluyq8KeklTNsng3V4TRR1JfcP5zpUb7OflqOgd8aUGezVVkvE uvSU+6TV5w5C1zk+46cOnw4zluIBE8fJ7z96khsPmTpTa7jm9itKNN4JvvUVTHIqSfsbams+/9wsj 7aW7RJ7ZNJ//ZHs8yJd4SBcfSjnspsDdTeNJauhilZHifVvf7evmwfc/1W7KRfKwKE+bqAAeQO+fU FVBs2sEQ==; 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 1sZ5md-00000005BRj-1jrl for linux-rockchip@lists.infradead.org; Wed, 31 Jul 2024 09:38:14 +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 1sZ5mc-0005oF-1H for linux-rockchip@lists.infradead.org; Wed, 31 Jul 2024 11:38:10 +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 1sZ5mT-003UxD-K6 for linux-rockchip@lists.infradead.org; Wed, 31 Jul 2024 11:38:01 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 0628731295D for ; Wed, 31 Jul 2024 09:38:00 +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 6A2E33128CE; Wed, 31 Jul 2024 09:37:57 +0000 (UTC) Received: from [172.20.34.65] (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id da176523; Wed, 31 Jul 2024 09:37:42 +0000 (UTC) From: Marc Kleine-Budde Date: Wed, 31 Jul 2024 11:37:21 +0200 Subject: [PATCH can-next v2 19/20] can: rockchip_canfd: add support for CAN_CTRLMODE_LOOPBACK MIME-Version: 1.0 Message-Id: <20240731-rockchip-canfd-v2-19-d9604c5b4be8@pengutronix.de> References: <20240731-rockchip-canfd-v2-0-d9604c5b4be8@pengutronix.de> In-Reply-To: <20240731-rockchip-canfd-v2-0-d9604c5b4be8@pengutronix.de> To: kernel@pengutronix.de, 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-37811 X-Developer-Signature: v=1; a=openpgp-sha256; l=2085; i=mkl@pengutronix.de; h=from:subject:message-id; bh=uWmaO38NycxebUiGAlSaXam9MoQJHpTEH+FHl5teqjg=; b=owEBbQGS/pANAwAKASg4oj56LbxvAcsmYgBmqgXiYKLd7XneBTnsOVHQqEM2YFT1apyCFdfsp Ury8USnRpqJATMEAAEKAB0WIQRQQLqG4LYE3Sm8Pl8oOKI+ei28bwUCZqoF4gAKCRAoOKI+ei28 bzOSB/sE3eHsfILkuwZu3Gs9EOJQSbv5QsNLyqFskaeld3oZVxaM/eklSgJTf4epmW85yahFOCN B60E8aJsFkiPZDgZOAEL+Nihd0MbjGs8/V4pmUJw5HctNnAQ8KvtxZi9hmkQ2yeh/o5DHrM18v1 YXfSuJr2kT0rbt2dKJqY33zGSGZJ1IV0VTOYTKGt4hYtc+lCMW4Q4UZfyBULWRyRkyCiExywp36 dlPvbXmwFfNFfb3Bku7l2vj7BCxCQg4Cb5i6krKm5khtr+jWD1g7Se2+TaZIsFhavFIcu3/Eehd g75ESAR7pIo81tLTsitTFUuQpSVM6WDajTZnsLZ6qtHTZSr3 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-20240731_103812_095153_1D93EBF6 X-CRM114-Status: GOOD ( 15.51 ) 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 support for loopback mode. 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 acbbfdd4cb69..2d6eca8d23be 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 @@ -897,7 +902,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; }