From mboxrd@z Thu Jan 1 00:00:00 1970 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 7B55BCCD1BF for ; Wed, 29 Oct 2025 03:23:30 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Gx1ZNKdQ6vm4QkQx+CizmRfGvSq5qGs0J5j5xTq7oJI=; b=mylkLHR+l3G0zKRiGK8tk9dIME hI9FrSKUPF7xpAdv56/3DKMrUwmi7exXfoOEO9jAFdXf5Vjl5pYxp4Kn+nE9AzlkC5pU75a0XS/HY wZzA2vRanTrAMUfZSf98vSEKImdIb0PixZYronyxGmQyYeMyM+iYDmK8YHa0Bt9U53y5uCkBBRV8M FyoIkz9CC7fpLZvbIa8jAyUjESo8gsw2WLlkWSjkhMa4vuVglojRqQtFEm6vV7fseO9KUjcdfzYTA IitBvh6NwKG3QW/jnjS2hncjgR22x6ErCBX98ys1feye9lntLbngqsAXt5seZfqz9CHCqUrpiZvcP 3JM7J43w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vDwmR-0000000H2EH-3PoQ; Wed, 29 Oct 2025 03:23:23 +0000 Received: from mail-m155106.qiye.163.com ([101.71.155.106]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vDwmJ-0000000H27C-0bK3; Wed, 29 Oct 2025 03:23:17 +0000 Received: from rockchip.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 279245f16; Wed, 29 Oct 2025 11:23:11 +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 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 v8 4/4] net: can: rockchip: support dma for rk3576 rx Date: Wed, 29 Oct 2025 11:23:02 +0800 Message-Id: <20251029032302.1238973-5-zhangqing@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251029032302.1238973-1-zhangqing@rock-chips.com> References: <20251029032302.1238973-1-zhangqing@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Tid: 0a9a2dfdaece03a3kunm7a63a81221fb59 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGUJCGVZMGRpCSE9JH0xDHh5WFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSEpKQk 1VSktLVUpCWQY+ DKIM-Signature: a=rsa-sha256; b=MGBh7evqWzxWtcKFPQCU6l9hrTHfUpPEptqDxV4nwF4Nws5QFsanPZEFR4Cb1+Aj+NPuua080a8gb/5DzGnr9exIFg/YHySj3bqVm7hWf2RcSNwlea2yKILxOisYENQxuU5VJakWybvBaxKhIbpk0vbwYInTQCnEWdKeDeITxoc=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=Gx1ZNKdQ6vm4QkQx+CizmRfGvSq5qGs0J5j5xTq7oJI=; h=date:mime-version:subject:message-id:from; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251028_202315_386689_0A30535C X-CRM114-Status: GOOD ( 22.50 ) 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 The new can controller of rk3576 supports rx dma. Signed-off-by: Elaine Zhang --- .../net/can/rockchip/rockchip_canfd-core.c | 62 +++++++++- drivers/net/can/rockchip/rockchip_canfd-rx.c | 109 ++++++++++++++++++ drivers/net/can/rockchip/rockchip_canfd.h | 9 ++ 3 files changed, 178 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c index 58fffcf97b20..8284bf05efba 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c @@ -399,6 +399,9 @@ static void rk3576can_chip_start(struct rkcanfd_priv *priv) RK3576CAN_REG_BRS_CFG_BRS_NEGSYNC_EN | RK3576CAN_REG_BRS_CFG_BRS_POSSYNC_EN); + if (priv->dma_thr) + rkcanfd_write(priv, RK3576CAN_REG_DMA_CTRL, + RK3576CAN_REG_DMA_CTRL_DMA_RX_EN | priv->dma_thr); rkcanfd_set_bittiming(priv); priv->devtype_data.interrupts_disable(priv); @@ -1288,10 +1291,34 @@ static const struct of_device_id rkcanfd_of_match[] = { }; MODULE_DEVICE_TABLE(of, rkcanfd_of_match); +static int rk3576_canfd_dma_init(struct rkcanfd_priv *priv, struct resource *res) +{ + struct dma_slave_config rxconf = { + .direction = DMA_DEV_TO_MEM, + .src_addr = res->start + RK3576CAN_REG_RXFRD, + .src_addr_width = 4, + .dst_addr_width = 4, + .src_maxburst = 9, + }; + + priv->dma_thr = rxconf.src_maxburst - 1; + priv->dma_size = RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT * 4; + priv->rxbuf = dma_alloc_coherent(priv->ndev->dev.parent, + priv->dma_size * RK3576CAN_SRAM_MAX_FIFO_CNT, + &priv->rx_dma_dst_addr, GFP_KERNEL); + if (!priv->rxbuf) { + priv->rxbuf = NULL; + return -ENOMEM; + } + dmaengine_slave_config(priv->rxchan, &rxconf); + return 0; +} + static int rkcanfd_probe(struct platform_device *pdev) { struct rkcanfd_priv *priv; struct net_device *ndev; + struct resource *res; const void *match; int err; @@ -1313,7 +1340,7 @@ static int rkcanfd_probe(struct platform_device *pdev) goto out_free_candev; } - priv->regs = devm_platform_ioremap_resource(pdev, 0); + priv->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(priv->regs)) { err = PTR_ERR(priv->regs); goto out_free_candev; @@ -1348,10 +1375,22 @@ static int rkcanfd_probe(struct platform_device *pdev) priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD; } + priv->rxchan = dma_request_chan(&pdev->dev, "rx"); + if (IS_ERR(priv->rxchan)) { + netdev_warn(priv->ndev, + "Failed to request RX-DMA channel: %pe, continuing without DMA", + priv->rxchan); + priv->rxchan = NULL; + } else { + err = rk3576_canfd_dma_init(priv, res); + if (err) + goto out_can_dma_rx_chan_del; + } + err = can_rx_offload_add_manual(ndev, &priv->offload, RKCANFD_NAPI_WEIGHT); if (err) - goto out_free_candev; + goto out_can_dma_rx_chan_del; err = rkcanfd_register(priv); if (err) @@ -1361,6 +1400,15 @@ static int rkcanfd_probe(struct platform_device *pdev) out_can_rx_offload_del: can_rx_offload_del(&priv->offload); +out_can_dma_rx_chan_del: + if (priv->rxbuf) { + dma_free_coherent(priv->ndev->dev.parent, + priv->dma_size * RK3576CAN_SRAM_MAX_FIFO_CNT, + priv->rxbuf, priv->rx_dma_dst_addr); + priv->rxbuf = NULL; + } + if (priv->rxchan) + dma_release_channel(priv->rxchan); out_free_candev: free_candev(ndev); @@ -1372,6 +1420,16 @@ static void rkcanfd_remove(struct platform_device *pdev) struct rkcanfd_priv *priv = platform_get_drvdata(pdev); struct net_device *ndev = priv->ndev; + if (priv->rxbuf) { + dma_free_coherent(priv->ndev->dev.parent, + priv->dma_size * RK3576CAN_SRAM_MAX_FIFO_CNT, + priv->rxbuf, priv->rx_dma_dst_addr); + priv->rxbuf = NULL; + } + + if (priv->rxchan) + dma_release_channel(priv->rxchan); + rkcanfd_unregister(priv); can_rx_offload_del(&priv->offload); free_candev(ndev); diff --git a/drivers/net/can/rockchip/rockchip_canfd-rx.c b/drivers/net/can/rockchip/rockchip_canfd-rx.c index 6bc4b0185502..e478b2b482c1 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-rx.c +++ b/drivers/net/can/rockchip/rockchip_canfd-rx.c @@ -277,6 +277,71 @@ static int rk3576can_handle_rx_int_one(struct rkcanfd_priv *priv) return 0; } +static int rk3576can_handle_rx_dma(struct rkcanfd_priv *priv, u32 addr) +{ + struct net_device_stats *stats = &priv->ndev->stats; + struct canfd_frame *skb_cfd; + struct sk_buff *skb; + u32 frameinfo, id, data[16] = {0}; + u8 dlc; + int i; + + frameinfo = *(u32 *)(priv->rxbuf + addr * RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + id = *(u32 *)(priv->rxbuf + 1 + addr * RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + for (i = 0; i < (RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT - 2); i++) + data[i] = *(u32 *)(priv->rxbuf + 2 + i + + addr * RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + + if (frameinfo & RK3576CAN_REG_RXFRD_FRAMEINFO_FDF) + skb = alloc_canfd_skb(priv->ndev, &skb_cfd); + else + skb = alloc_can_skb(priv->ndev, (struct can_frame **)&skb_cfd); + + if (!skb) { + stats->rx_dropped++; + + return 0; + } + + if (frameinfo & RK3576CAN_REG_RXFRD_FRAMEINFO_FRAME_FORMAT) + skb_cfd->can_id = FIELD_GET(RKCANFD_REG_FD_ID_EFF, id) | + CAN_EFF_FLAG; + else + skb_cfd->can_id = FIELD_GET(RKCANFD_REG_FD_ID_SFF, id); + + dlc = FIELD_GET(RK3576CAN_REG_RXFRD_FRAMEINFO_DATA_LENGTH, + frameinfo); + + /* CAN-FD */ + if (frameinfo & RK3576CAN_REG_RXFRD_FRAMEINFO_FDF) { + skb_cfd->len = can_fd_dlc2len(dlc); + + /* The cfd is not allocated by alloc_canfd_skb(), so + * set CANFD_FDF here. + */ + skb_cfd->flags |= CANFD_FDF; + + if (frameinfo & RK3576CAN_REG_RXFRD_FRAMEINFO_BRS) + skb_cfd->flags |= CANFD_BRS; + } else { + skb_cfd->len = can_cc_dlc2len(dlc); + + if (frameinfo & RK3576CAN_REG_RXFRD_FRAMEINFO_RTR) + skb_cfd->can_id |= CAN_RTR_FLAG; + } + if (!(skb_cfd->can_id & CAN_RTR_FLAG)) { + /* Change CANFD data format to SocketCAN data format */ + for (i = 0; i < skb_cfd->len; i += 4) + *(u32 *)(skb_cfd->data + i) = data[i / 4]; + } + + stats->rx_packets++; + stats->rx_bytes += skb_cfd->len; + netif_rx(skb); + + return 0; +} + static int rkcanfd_handle_rx_int_one(struct rkcanfd_priv *priv) { struct net_device_stats *stats = &priv->ndev->stats; @@ -372,6 +437,43 @@ rk3576can_rx_fifo_get_len(const struct rkcanfd_priv *priv) return DIV_ROUND_UP(val, RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT); } +static void rk3576_can_rx_dma_callback(void *data) +{ + struct rkcanfd_priv *priv = data; + int i; + + for (i = 0; i < priv->quota; i++) + rk3576can_handle_rx_dma(priv, i); + + rkcanfd_write(priv, RK3576CAN_REG_INT_MASK, priv->reg_int_mask_default); +} + +static int rk3576_can_rx_dma(struct rkcanfd_priv *priv) +{ + struct dma_async_tx_descriptor *rxdesc = NULL; + const u32 reg = rkcanfd_read(priv, RK3576CAN_REG_STR_STATE); + int quota = FIELD_GET(RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT, reg); + + quota = DIV_ROUND_UP(quota, RK3576CAN_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + priv->quota = quota; + if (priv->quota == 0) { + rkcanfd_write(priv, RK3576CAN_REG_INT_MASK, priv->reg_int_mask_default); + return 0; + } + + rxdesc = dmaengine_prep_slave_single(priv->rxchan, priv->rx_dma_dst_addr, + priv->dma_size * priv->quota, DMA_DEV_TO_MEM, 0); + if (!rxdesc) + return -ENOMSG; + + rxdesc->callback = rk3576_can_rx_dma_callback; + rxdesc->callback_param = priv; + + dmaengine_submit(rxdesc); + dma_async_issue_pending(priv->rxchan); + return 0; +} + int rkcanfd_handle_rx_int(struct rkcanfd_priv *priv) { unsigned int len; @@ -391,6 +493,13 @@ int rkcanfd_handle_rk3576_rx_int(struct rkcanfd_priv *priv) unsigned int len; int err; + if (priv->rxchan) { + err = rk3576_can_rx_dma(priv); + if (err) + return err; + else + return 0; + } while ((len = rk3576can_rx_fifo_get_len(priv))) { err = rk3576can_handle_rx_int_one(priv); if (err) diff --git a/drivers/net/can/rockchip/rockchip_canfd.h b/drivers/net/can/rockchip/rockchip_canfd.h index 77c673cfea3b..bdd01150d920 100644 --- a/drivers/net/can/rockchip/rockchip_canfd.h +++ b/drivers/net/can/rockchip/rockchip_canfd.h @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include #include @@ -532,6 +534,7 @@ #define RK3576CAN_ISM_WATERMASK_CANFD 0x6c /* word */ #define RK3576CAN_SRAM_MAX_DEPTH 256 /* word */ +#define RK3576CAN_SRAM_MAX_FIFO_CNT (RK3576CAN_SRAM_MAX_DEPTH / 18) #define RK3576CAN_CANFD_FILTER GENMASK(28, 0) @@ -748,6 +751,12 @@ struct rkcanfd_priv { struct reset_control *reset; struct clk_bulk_data *clks; int clks_num; + u32 dma_size; + u32 dma_thr; + int quota; + struct dma_chan *rxchan; + u32 *rxbuf; + dma_addr_t rx_dma_dst_addr; }; static inline u32 -- 2.34.1