From nobody Sun Dec 14 19:29:43 2025 Received: from mail-m21472.qiye.163.com (mail-m21472.qiye.163.com [117.135.214.72]) (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 BA5DD28750F; Fri, 23 May 2025 08:09:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.214.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747987794; cv=none; b=po5MfLSF479a3QI7QKW5n5s7ahtoKijKuwZkVc/3qBgh46zHHb91nfWcgYCMaxEn9AOzei3CcbjT+kSjnQrbg7EpkcfAsZz5/wZObXYdLrZJfiZOnQ5A7NYCBV5AynYxO6vrp3fh/RANgZNs32gdk+P39PP8ecH+LdqnXnxhjRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747987794; c=relaxed/simple; bh=0OuT2whnl7ypCfnyu+yaOm4NsPcmkuXu7SxCJ/05RN8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IQ7gi5KxOi/ytXz4ejJ/XkloYUSdTEKKUSEAHqIrzeEhpBICveyOprgd3kUB4rS91mwxGEglu5iO4kxcfrP2tnZwKmoD61gRybqphKcd9NJVtCnsMy1h1F6RAgqLllo3654rRscvHSFyEYNPsroYR6abYSSWmjabfQdCTcG2cyE= 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=Otywu/bi; arc=none smtp.client-ip=117.135.214.72 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="Otywu/bi" Received: from rockchip.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 1628045f1; Fri, 23 May 2025 15:54:31 +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 v5 4/4] net: can: rockchip: support dma for rk3576 rx Date: Fri, 23 May 2025 15:54:22 +0800 Message-Id: <20250523075422.4010083-5-zhangqing@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250523075422.4010083-1-zhangqing@rock-chips.com> References: <20250523075422.4010083-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-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGR8aGVZDQkofSUpLTxkaH0lWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSEpKQk 1VSktLVUpCWQY+ X-HM-Tid: 0a96fc22f42903a3kunm893a9d4d11db7f X-HM-MType: 1 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Njo6Aio6TjE0NhUcOBcaEE46 FAwaCzdVSlVKTE9MQkNNQ0xJQk5LVTMWGhIXVQETGhUcChIVHDsJFBgQVhgTEgsIVRgUFkVZV1kS C1lBWU5DVUlJVUxVSkpPWVdZCAFZQUNOTko3Bg++ DKIM-Signature: a=rsa-sha256; b=Otywu/bi2Lk4lCDhFSIWywTXixpvAtTFf8q/3Us9Nx3oWEMHGoNp6oHd8kLMd/VPxiS+bqOISluErCXoSSuh7j2YdEIQ+kdCCb42cmJzLwInulKMAzgf4t+XP9ljwdQ+y946DQfeSYY/K28ScNogxWIsAd9+vsb0wEaPc6frGFc=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=WHt3ciCOlWWGFv/hHizwXrIrdySa8FGSYcqD3FJvXFI=; 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 | 39 +++++++++ drivers/net/can/rockchip/rockchip_canfd-rx.c | 86 +++++++++++++++++++ drivers/net/can/rockchip/rockchip_canfd.h | 11 +++ 3 files changed, 136 insertions(+) diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/c= an/rockchip/rockchip_canfd-core.c index 92e260cb2527..9ef4a9ae19d8 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c @@ -433,6 +433,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->use_dma) + 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); @@ -1324,10 +1327,31 @@ static const struct of_device_id rkcanfd_of_match[]= =3D { }; MODULE_DEVICE_TABLE(of, rkcanfd_of_match); =20 +static void rk3576_canfd_dma_init(struct rkcanfd_priv *priv) +{ + struct dma_slave_config rxconf =3D { + .direction =3D DMA_DEV_TO_MEM, + .src_addr =3D priv->rx_dma_src_addr, + .src_addr_width =3D 4, + .dst_addr_width =3D 4, + .src_maxburst =3D 9, + }; + + priv->dma_thr =3D rxconf.src_maxburst - 1; + priv->rxbuf =3D dma_alloc_coherent(priv->dev, priv->dma_size * 14, + &priv->rx_dma_dst_addr, GFP_KERNEL); + if (!priv->rxbuf) { + priv->use_dma =3D 0; + return; + } + dmaengine_slave_config(priv->rxchan, &rxconf); +} + 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 @@ -1349,6 +1373,7 @@ static int rkcanfd_probe(struct platform_device *pdev) goto out_free_candev; } =20 + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); priv->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(priv->regs)) { err =3D PTR_ERR(priv->regs); @@ -1376,6 +1401,7 @@ static int rkcanfd_probe(struct platform_device *pdev) priv->can.do_set_mode =3D rkcanfd_set_mode; priv->can.do_get_berr_counter =3D rkcanfd_get_berr_counter; priv->ndev =3D ndev; + priv->dev =3D &pdev->dev; =20 match =3D device_get_match_data(&pdev->dev); if (match) { @@ -1384,6 +1410,19 @@ static int rkcanfd_probe(struct platform_device *pde= v) priv->can.ctrlmode_supported |=3D CAN_CTRLMODE_FD; } =20 + priv->rxchan =3D dma_request_chan(&pdev->dev, "rx"); + if (IS_ERR(priv->rxchan)) { + dev_warn(&pdev->dev, "Failed to request rxchan\n"); + priv->rxchan =3D NULL; + priv->use_dma =3D 0; + } else { + priv->rx_dma_src_addr =3D res->start + RK3576CANFD_REG_RXFRD; + priv->dma_size =3D RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT * 4; + priv->use_dma =3D 1; + } + if (priv->use_dma) + rk3576_canfd_dma_init(priv); + err =3D can_rx_offload_add_manual(ndev, &priv->offload, RKCANFD_NAPI_WEIGHT); if (err) diff --git a/drivers/net/can/rockchip/rockchip_canfd-rx.c b/drivers/net/can= /rockchip/rockchip_canfd-rx.c index 8a383cabd9d2..18c4970c2573 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-rx.c +++ b/drivers/net/can/rockchip/rockchip_canfd-rx.c @@ -285,6 +285,51 @@ 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 cfd[1] =3D { }, *skb_cfd; + struct rk3576canfd_fifo_header header[1] =3D { }; + struct sk_buff *skb; + unsigned int len; + int i; + + header->frameinfo =3D readl(priv->rxbuf + + addr * RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + header->id =3D readl(priv->rxbuf + 1 + + addr * RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + for (i =3D 0; i < (RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT - 2); i++) + cfd->data[i] =3D readl(priv->rxbuf + 2 + i + + addr * RK3576CANFD_REG_STR_STATE_INTM_LEFT_CNT_UNIT); + + len =3D rk3576canfd_fifo_header_to_cfd_header(priv, header, cfd); + + /* Manual handling of CAN Bus Error counters. See + * rkcanfd_get_corrected_berr_counter() for detailed + * explanation. + */ + if (priv->bec.rxerr) + priv->bec.rxerr =3D min(CAN_ERROR_PASSIVE_THRESHOLD, + priv->bec.rxerr) - 1; + + if (header->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; + } + + memcpy(skb_cfd, cfd, len); + stats->rx_packets++; + stats->rx_bytes +=3D 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; @@ -380,6 +425,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; @@ -399,6 +481,10 @@ int rkcanfd_handle_rk3576_rx_int(struct rkcanfd_priv *= priv) unsigned int len; int err; =20 + if (priv->use_dma) { + rk3576_canfd_rx_dma(priv); + 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 ef46837ed573..2ebb3c64e9d4 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 @@ -737,6 +739,7 @@ struct rkcanfd_priv { struct can_priv can; struct can_rx_offload offload; struct net_device *ndev; + struct device *dev; =20 void __iomem *regs; unsigned int tx_head; @@ -758,6 +761,14 @@ struct rkcanfd_priv { struct reset_control *reset; struct clk_bulk_data *clks; int clks_num; + bool use_dma; + u32 dma_size; + u32 dma_thr; + int quota; + struct dma_chan *rxchan; + u32 *rxbuf; + dma_addr_t rx_dma_src_addr; + dma_addr_t rx_dma_dst_addr; }; =20 static inline u32 --=20 2.34.1