From nobody Thu Oct 2 06:30:09 2025 Received: from mail-m19731110.qiye.163.com (mail-m19731110.qiye.163.com [220.197.31.110]) (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 34B83202997; Mon, 22 Sep 2025 07:31:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.110 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758526282; cv=none; b=dJ9u9T5NTcECcVgjoknU90vNvOOsFB5jLQsevRfWCT2P1S8RGKh3dx5OS30Vpd8ihoMnlv0Rs8FGAXFKVRNnrKr0u+QCBXdA371AB1Ql1+7KO8DGqWdebLk0hO5yVdjtoB4FqhjoCSUmheK5tCjlc3tdQ0h8VF7z3rS6KehbIwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758526282; c=relaxed/simple; bh=GJXdu0NXO3QyBiE82ZAhcNT/HVxfXGCFXTjm3HTCf68=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TtXnHemwPK/7WB3LW0bQApUZYc4zWbnaPh7ob/52i2FtmYj7KA8WnS83Vf/orIfljw6N2jv5F/hk/XdSvoX/mNRgh3Ms2ASGOBaFtem4lpvZJVvQkJmrs7j0MibZABDqwAisugMzE+GckELAXD92XB1VTz6lY8P/n5UnRH8zADA= 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=QfcFhI9k; arc=none smtp.client-ip=220.197.31.110 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="QfcFhI9k" Received: from rockchip.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 239b62ac0; Mon, 22 Sep 2025 15:15:51 +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 4/4] net: can: rockchip: support dma for rk3576 rx Date: Mon, 22 Sep 2025 15:15:43 +0800 Message-Id: <20250922071543.73923-5-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: 0a997047682103a3kunm864fae2f23165f X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQkhDHVZISkMdGk9CHUwfSE5WFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=QfcFhI9kQ+HAbiQVcF+D9LYOyE5XdmIPjAg2a0ieNw29ovFOAaFWwrbyE9ezzc7S2aNnACDdqMah2DlBOZFTFWUAPlszo1y7Z8FIch7NfeL1us1h07A4sDtQRatpi+/SDpOiTLj+BJn9BvnrzWrxK7KfmbGGLfgGiB7i+RqvSI4=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=wvUvDPc72DIV/MmMiN2g+hmUE1Xk6rQLgbIXZ7F8fC4=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" 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/c= an/rockchip/rockchip_canfd-core.c index e36cf4cb6743..fab2f8525208 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c @@ -400,6 +400,9 @@ static void rk3576canfd_chip_start(struct rkcanfd_priv = *priv) RK3576CANFD_REG_BRS_CFG_BRS_NEGSYNC_EN | RK3576CANFD_REG_BRS_CFG_BRS_POSSYNC_EN); =20 + if (priv->dma_thr) + rkcanfd_write(priv, RK3576CANFD_REG_DMA_CTRL, + RK3576CANFD_REG_DMA_CTRL_DMA_RX_EN | priv->dma_thr); rkcanfd_set_bittiming(priv); =20 priv->devtype_data.interrupts_disable(priv); @@ -1291,10 +1294,34 @@ static const struct of_device_id rkcanfd_of_match[]= =3D { }; MODULE_DEVICE_TABLE(of, rkcanfd_of_match); =20 +static int rk3576_canfd_dma_init(struct rkcanfd_priv *priv, struct resourc= e *res) +{ + struct dma_slave_config rxconf =3D { + .direction =3D DMA_DEV_TO_MEM, + .src_addr =3D res->start + RK3576CANFD_REG_RXFRD, + .src_addr_width =3D 4, + .dst_addr_width =3D 4, + .src_maxburst =3D 9, + }; + + priv->dma_thr =3D rxconf.src_maxburst - 1; + priv->dma_size =3D RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT * 4; + priv->rxbuf =3D dma_alloc_coherent(priv->ndev->dev.parent, + priv->dma_size * RK3576CANFD_SRAM_MAX_FIFO_CNT, + &priv->rx_dma_dst_addr, GFP_KERNEL); + if (!priv->rxbuf) { + priv->rxbuf =3D 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; =20 @@ -1316,7 +1343,7 @@ static int rkcanfd_probe(struct platform_device *pdev) goto out_free_candev; } =20 - priv->regs =3D devm_platform_ioremap_resource(pdev, 0); + priv->regs =3D devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(priv->regs)) { err =3D PTR_ERR(priv->regs); goto out_free_candev; @@ -1351,10 +1378,22 @@ static int rkcanfd_probe(struct platform_device *pd= ev) priv->can.ctrlmode_supported |=3D CAN_CTRLMODE_FD; } =20 + priv->rxchan =3D 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 =3D NULL; + } else { + err =3D rk3576_canfd_dma_init(priv, res); + if (err) + goto out_can_dma_rx_chan_del; + } + err =3D can_rx_offload_add_manual(ndev, &priv->offload, RKCANFD_NAPI_WEIGHT); if (err) - goto out_free_candev; + goto out_can_dma_rx_chan_del; =20 err =3D rkcanfd_register(priv); if (err) @@ -1364,6 +1403,15 @@ static int rkcanfd_probe(struct platform_device *pde= v) =20 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 * RK3576CANFD_SRAM_MAX_FIFO_CNT, + priv->rxbuf, priv->rx_dma_dst_addr); + priv->rxbuf =3D NULL; + } + if (priv->rxchan) + dma_release_channel(priv->rxchan); out_free_candev: free_candev(ndev); =20 @@ -1375,6 +1423,16 @@ static void rkcanfd_remove(struct platform_device *p= dev) struct rkcanfd_priv *priv =3D platform_get_drvdata(pdev); struct net_device *ndev =3D priv->ndev; =20 + if (priv->rxbuf) { + dma_free_coherent(priv->ndev->dev.parent, + priv->dma_size * RK3576CANFD_SRAM_MAX_FIFO_CNT, + priv->rxbuf, priv->rx_dma_dst_addr); + priv->rxbuf =3D 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 d6f39393c7ea..7c858fb06528 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 rk3576canfd_handle_rx_int_one(struct rkcanf= d_priv *priv) return 0; } =20 +static int rk3576canfd_handle_rx_dma(struct rkcanfd_priv *priv, u32 addr) +{ + struct net_device_stats *stats =3D &priv->ndev->stats; + struct canfd_frame *skb_cfd; + struct sk_buff *skb; + u32 frameinfo, id, data[16] =3D {0}; + u8 dlc; + int i; + + frameinfo =3D *(u32 *)(priv->rxbuf + addr * RK3576CANFD_REG_STR_STATE_INT= M_LEFT_CNT_UNIT); + id =3D *(u32 *)(priv->rxbuf + 1 + addr * RK3576CANFD_REG_STR_STATE_INTM_L= EFT_CNT_UNIT); + for (i =3D 0; i < (RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT - 2); i++) + data[i] =3D *(u32 *)(priv->rxbuf + 2 + i + + addr * RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + + if (frameinfo & RK3576CANFD_REG_RXFRD_FRAMEINFO_FDF) + skb =3D alloc_canfd_skb(priv->ndev, &skb_cfd); + else + skb =3D alloc_can_skb(priv->ndev, (struct can_frame **)&skb_cfd); + + if (!skb) { + stats->rx_dropped++; + + return 0; + } + + if (frameinfo & RK3576CANFD_REG_RXFRD_FRAMEINFO_FRAME_FORMAT) + skb_cfd->can_id =3D FIELD_GET(RKCANFD_REG_FD_ID_EFF, id) | + CAN_EFF_FLAG; + else + skb_cfd->can_id =3D FIELD_GET(RKCANFD_REG_FD_ID_SFF, id); + + dlc =3D FIELD_GET(RK3576CANFD_REG_RXFRD_FRAMEINFO_DATA_LENGTH, + frameinfo); + + /* CAN-FD */ + if (frameinfo & RK3576CANFD_REG_RXFRD_FRAMEINFO_FDF) { + skb_cfd->len =3D can_fd_dlc2len(dlc); + + /* The cfd is not allocated by alloc_canfd_skb(), so + * set CANFD_FDF here. + */ + skb_cfd->flags |=3D CANFD_FDF; + + if (frameinfo & RK3576CANFD_REG_RXFRD_FRAMEINFO_BRS) + skb_cfd->flags |=3D CANFD_BRS; + } else { + skb_cfd->len =3D can_cc_dlc2len(dlc); + + if (frameinfo & RK3576CANFD_REG_RXFRD_FRAMEINFO_RTR) + skb_cfd->can_id |=3D CAN_RTR_FLAG; + } + if (!(skb_cfd->can_id & CAN_RTR_FLAG)) { + /* Change CANFD data format to SocketCAN data format */ + for (i =3D 0; i < skb_cfd->len; i +=3D 4) + *(u32 *)(skb_cfd->data + i) =3D data[i / 4]; + } + + stats->rx_packets++; + stats->rx_bytes +=3D skb_cfd->len; + netif_rx(skb); + + return 0; +} + static int rkcanfd_handle_rx_int_one(struct rkcanfd_priv *priv) { struct net_device_stats *stats =3D &priv->ndev->stats; @@ -372,6 +437,43 @@ rk3576canfd_rx_fifo_get_len(const struct rkcanfd_priv = *priv) return DIV_ROUND_UP(val, RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT); } =20 +static void rk3576_canfd_rx_dma_callback(void *data) +{ + struct rkcanfd_priv *priv =3D data; + int i; + + for (i =3D 0; i < priv->quota; i++) + rk3576canfd_handle_rx_dma(priv, i); + + rkcanfd_write(priv, RK3576CANFD_REG_INT_MASK, priv->reg_int_mask_default); +} + +static int rk3576_canfd_rx_dma(struct rkcanfd_priv *priv) +{ + struct dma_async_tx_descriptor *rxdesc =3D NULL; + const u32 reg =3D rkcanfd_read(priv, RK3576CANFD_REG_STR_STATE); + int quota =3D FIELD_GET(RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT, reg); + + quota =3D DIV_ROUND_UP(quota, RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNI= T); + priv->quota =3D quota; + if (priv->quota =3D=3D 0) { + rkcanfd_write(priv, RK3576CANFD_REG_INT_MASK, priv->reg_int_mask_default= ); + return 0; + } + + rxdesc =3D dmaengine_prep_slave_single(priv->rxchan, priv->rx_dma_dst_add= r, + priv->dma_size * priv->quota, DMA_DEV_TO_MEM, 0); + if (!rxdesc) + return -ENOMSG; + + rxdesc->callback =3D rk3576_canfd_rx_dma_callback; + rxdesc->callback_param =3D 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; =20 + if (priv->rxchan) { + err =3D rk3576_canfd_rx_dma(priv); + if (err) + return err; + else + return 0; + } while ((len =3D rk3576canfd_rx_fifo_get_len(priv))) { err =3D rk3576canfd_handle_rx_int_one(priv); if (err) diff --git a/drivers/net/can/rockchip/rockchip_canfd.h b/drivers/net/can/ro= ckchip/rockchip_canfd.h index 6b77a19e0d4a..30bd692486e6 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 RK3576CANFD_ISM_WATERMASK_CANFD 0x6c /* word */ =20 #define RK3576CANFD_SRAM_MAX_DEPTH 256 /* word */ +#define RK3576CANFD_SRAM_MAX_FIFO_CNT (RK3576CANFD_SRAM_MAX_DEPTH / RK3576= CANFD_SRAM_MAX_DEPTH) =20 #define RK3576CANFD_CANFD_FILTER GENMASK(28, 0) =20 @@ -749,6 +752,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; }; =20 static inline u32 --=20 2.34.1