From nobody Thu Oct 2 20:44:51 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 AB7172DEA97 for ; Thu, 11 Sep 2025 21:56:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757627819; cv=none; b=GXQk/te2F//59UwJuKcJpKhGCS4AWdHgf4jAJxr1WF7R7WxSz+iaO5cQUBn76N7Ln5UKT+umgFMScYcBuLoWCLZVKSV5Zkj+OX6q6dkcW92AoGBo9XauKLbzzZAHxmI5LfVzjhyMNN7ew2SiqW/yVYe9iZ1X8tVRxiZOGm691Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757627819; c=relaxed/simple; bh=9XMlvzNYoZzkzFAt5rhIauateBrCJZ5ozp+/0Knxpes=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i0VYR0nEZB0PSrwqpyzopedxox9TeAD7erRYNvdzMZ1pA/FqIpj3qGD0H2vfbC1jbF81hSnj98IwAQ7t0YiyREjogJgnDcR+lXp/0Dm49FHvtwVw0S5Vb62o3OuEsVYGqgjDP8uUcveeb9afkWQ/rgyJiw7Acn47PrzXUliRL0w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uwpHe-0004g5-2J; Thu, 11 Sep 2025 23:56:50 +0200 From: Marco Felsch Date: Thu, 11 Sep 2025 23:56:43 +0200 Subject: [PATCH v2 02/10] dmaengine: imx-sdma: fix spba-bus handling for i.MX8M Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250911-v6-16-topic-sdma-v2-2-d315f56343b5@pengutronix.de> References: <20250911-v6-16-topic-sdma-v2-0-d315f56343b5@pengutronix.de> In-Reply-To: <20250911-v6-16-topic-sdma-v2-0-d315f56343b5@pengutronix.de> To: Vinod Koul , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Jiada Wang Cc: dmaengine@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marco Felsch X-Mailer: b4 0.14.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::28 X-SA-Exim-Mail-From: m.felsch@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Starting with i.MX8M* devices there are multiple spba-busses so we can't just search the whole DT for the first spba-bus match and take it. Instead we need to check for each device to which bus it belongs and setup the spba_{start,end}_addr accordingly per sdma_channel. While on it, don't ignore errors from of_address_to_resource() if they are valid. Signed-off-by: Marco Felsch --- drivers/dma/imx-sdma.c | 58 ++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 3ecb917214b1268b148a29df697b780bc462afa4..56daaeb7df03986850c9c74273d= 0816700581dc0 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -429,6 +429,8 @@ struct sdma_desc { * @event_mask: event mask used in p_2_p script * @watermark_level: value for gReg[7], some script will extend it from * basic watermark such as p_2_p + * @spba_start_addr: SDMA controller SPBA bus start address + * @spba_end_addr: SDMA controller SPBA bus end address * @shp_addr: value for gReg[6] * @per_addr: value for gReg[2] * @status: status of dma channel @@ -461,6 +463,8 @@ struct sdma_channel { dma_addr_t per_address, per_address2; unsigned long event_mask[2]; unsigned long watermark_level; + u32 spba_start_addr; + u32 spba_end_addr; u32 shp_addr, per_addr; enum dma_status status; struct imx_dma_data data; @@ -534,8 +538,6 @@ struct sdma_engine { u32 script_number; struct sdma_script_start_addrs *script_addrs; const struct sdma_driver_data *drvdata; - u32 spba_start_addr; - u32 spba_end_addr; unsigned int irq; dma_addr_t bd0_phys; struct sdma_buffer_descriptor *bd0; @@ -1236,8 +1238,6 @@ static void sdma_channel_synchronize(struct dma_chan = *chan) =20 static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) { - struct sdma_engine *sdma =3D sdmac->sdma; - int lwml =3D sdmac->watermark_level & SDMA_WATERMARK_LEVEL_LWML; int hwml =3D (sdmac->watermark_level & SDMA_WATERMARK_LEVEL_HWML) >> 16; =20 @@ -1263,12 +1263,12 @@ static void sdma_set_watermarklevel_for_p2p(struct = sdma_channel *sdmac) swap(sdmac->event_mask[0], sdmac->event_mask[1]); } =20 - if (sdmac->per_address2 >=3D sdma->spba_start_addr && - sdmac->per_address2 <=3D sdma->spba_end_addr) + if (sdmac->per_address2 >=3D sdmac->spba_start_addr && + sdmac->per_address2 <=3D sdmac->spba_end_addr) sdmac->watermark_level |=3D SDMA_WATERMARK_LEVEL_SP; =20 - if (sdmac->per_address >=3D sdma->spba_start_addr && - sdmac->per_address <=3D sdma->spba_end_addr) + if (sdmac->per_address >=3D sdmac->spba_start_addr && + sdmac->per_address <=3D sdmac->spba_end_addr) sdmac->watermark_level |=3D SDMA_WATERMARK_LEVEL_DP; =20 sdmac->watermark_level |=3D SDMA_WATERMARK_LEVEL_CONT; @@ -1447,6 +1447,31 @@ static void sdma_desc_free(struct virt_dma_desc *vd) kfree(desc); } =20 +static int sdma_config_spba_slave(struct dma_chan *chan) +{ + struct sdma_channel *sdmac =3D to_sdma_chan(chan); + struct device_node *spba_bus; + struct resource spba_res; + int ret; + + spba_bus =3D of_get_parent(chan->slave->of_node); + /* Device doesn't belong to the spba-bus */ + if (!of_device_is_compatible(spba_bus, "fsl,spba-bus")) + return 0; + + ret =3D of_address_to_resource(spba_bus, 0, &spba_res); + of_node_put(spba_bus); + if (ret) { + dev_err(sdmac->sdma->dev, "Failed to get spba-bus resources\n"); + return -EINVAL; + } + + sdmac->spba_start_addr =3D spba_res.start; + sdmac->spba_end_addr =3D spba_res.end; + + return 0; +} + static int sdma_alloc_chan_resources(struct dma_chan *chan) { struct sdma_channel *sdmac =3D to_sdma_chan(chan); @@ -1527,6 +1552,8 @@ static void sdma_free_chan_resources(struct dma_chan = *chan) =20 sdmac->event_id0 =3D 0; sdmac->event_id1 =3D 0; + sdmac->spba_start_addr =3D 0; + sdmac->spba_end_addr =3D 0; =20 sdma_set_channel_priority(sdmac, 0); =20 @@ -1837,6 +1864,7 @@ static int sdma_config(struct dma_chan *chan, { struct sdma_channel *sdmac =3D to_sdma_chan(chan); struct sdma_engine *sdma =3D sdmac->sdma; + int ret; =20 memcpy(&sdmac->slave_config, dmaengine_cfg, sizeof(*dmaengine_cfg)); =20 @@ -1867,6 +1895,10 @@ static int sdma_config(struct dma_chan *chan, sdma_event_enable(sdmac, sdmac->event_id1); } =20 + ret =3D sdma_config_spba_slave(chan); + if (ret) + return ret; + return 0; } =20 @@ -2235,11 +2267,9 @@ static struct dma_chan *sdma_xlate(struct of_phandle= _args *dma_spec, static int sdma_probe(struct platform_device *pdev) { struct device_node *np =3D pdev->dev.of_node; - struct device_node *spba_bus; const char *fw_name; int ret; int irq; - struct resource spba_res; int i; struct sdma_engine *sdma; s32 *saddr_arr; @@ -2375,14 +2405,6 @@ static int sdma_probe(struct platform_device *pdev) dev_err(&pdev->dev, "failed to register controller\n"); goto err_register; } - - spba_bus =3D of_find_compatible_node(NULL, NULL, "fsl,spba-bus"); - ret =3D of_address_to_resource(spba_bus, 0, &spba_res); - if (!ret) { - sdma->spba_start_addr =3D spba_res.start; - sdma->spba_end_addr =3D spba_res.end; - } - of_node_put(spba_bus); } =20 /* --=20 2.47.3