From nobody Thu Dec 18 18:39:51 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9446C77B71 for ; Sat, 15 Apr 2023 10:49:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229922AbjDOKtI (ORCPT ); Sat, 15 Apr 2023 06:49:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230374AbjDOKsl (ORCPT ); Sat, 15 Apr 2023 06:48:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9829B744; Sat, 15 Apr 2023 03:48:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 47672617FF; Sat, 15 Apr 2023 10:47:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B704EC4339C; Sat, 15 Apr 2023 10:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681555627; bh=LTJK1Q5mjYuDFo6XOCu0Yts3P4bL4yj+TgvZBGYtFVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gdZW/ZuhG1ASyVO9oD/yhp9ZLkWIN2kh6VfeVBEt4CdQlCS/1D2bDP1Oy0qt+2/tb FWwTHFl1wSU+E2NsBdhnL+F4/2MAybrDoZDpU67z8HnKmw5W7kLhoRpwU0sn3joU8F /n/0KSYp6+xiu38JQpNwsrt0HYdbM25mKStbetNbdkyAkOONhrM/DM4HBpnNO/t0EK qjt/tK8h862BPxDoJFaa9qveL7d2eTKx/spljXqar9rac0ARrkS+556gHJtLWs1Mao IHsmqz5x97E6Qjxqcenpj3/zsrbjWJRZMlVrOKlJ6ILNTMraVau0nWNBEgAtD+NRDj uOY18tNX00EEg== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 08/11] dmaengine: dw-axi-dmac: support dma-channel-mask Date: Sat, 15 Apr 2023 18:35:58 +0800 Message-Id: <20230415103601.2979-9-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415103601.2979-1-jszhang@kernel.org> References: <20230415103601.2979-1-jszhang@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some dma channels may not be available, so we need to tell the driver the available dma channels, use the general dt binding "dma-channel-mask" for this purpose. Signed-off-by: Jisheng Zhang --- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 19 +++++++++++++++++++ drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 20 insertions(+) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/d= w-axi-dmac/dw-axi-dmac-platform.c index edb1c089a8eb..a6e46cb66000 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -216,6 +216,8 @@ static void axi_dma_hw_init(struct axi_dma_chip *chip) u32 i; =20 for (i =3D 0; i < chip->dw->hdata->nr_channels; i++) { + if (!(chip->dw->hdata->channels_mask & (1 << i))) + continue; axi_chan_irq_disable(&chip->dw->chan[i], DWAXIDMAC_IRQ_ALL); axi_chan_disable(&chip->dw->chan[i]); } @@ -1390,6 +1392,14 @@ static int parse_device_properties(struct axi_dma_ch= ip *chip) chip->dw->hdata->axi_rw_burst_len =3D tmp; } =20 + /* + * Use all channels if there's no dma-channel-mask property + */ + ret =3D device_property_read_u32(dev, "dma-channel-mask", &tmp); + if (ret) + tmp =3D GENMASK(chip->dw->hdata->nr_channels - 1, 0); + chip->dw->hdata->channels_mask =3D tmp; + chip->dw->hdata->perch_irq =3D device_property_read_bool(dev, "snps,perch= _irq"); =20 return 0; @@ -1450,6 +1460,10 @@ static int dw_probe(struct platform_device *pdev) if (hdata->perch_irq) { char irqname[8]; for (i =3D 0; i < hdata->nr_channels; i++) { + if (!(hdata->channels_mask & (1 << i))) { + dw->chan[i].irq =3D -1; + continue; + } snprintf(irqname, sizeof(irqname), "ch%u", i); dw->chan[i].irq =3D platform_get_irq_byname(pdev, irqname); if (dw->chan[i].irq < 0) @@ -1475,6 +1489,9 @@ static int dw_probe(struct platform_device *pdev) for (i =3D 0; i < hdata->nr_channels; i++) { struct axi_dma_chan *chan =3D &dw->chan[i]; =20 + if (!(hdata->channels_mask & (1 << i))) + continue; + chan->chip =3D chip; chan->id =3D i; chan->chan_regs =3D chip->regs + COMMON_REG_LEN + i * CHAN_REG_LEN; @@ -1572,6 +1589,8 @@ static int dw_remove(struct platform_device *pdev) clk_prepare_enable(chip->core_clk); axi_dma_irq_disable(chip); for (i =3D 0; i < dw->hdata->nr_channels; i++) { + if (!(dw->hdata->channels_mask & (1 << i))) + continue; axi_chan_disable(&chip->dw->chan[i]); axi_chan_irq_disable(&chip->dw->chan[i], DWAXIDMAC_IRQ_ALL); } diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dma= c/dw-axi-dmac.h index 83ac839b4394..f57961620d2d 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h @@ -30,6 +30,7 @@ struct dw_axi_dma_hcfg { u32 priority[DMAC_MAX_CHANNELS]; /* maximum supported axi burst length */ u32 axi_rw_burst_len; + u32 channels_mask; /* Register map for DMAX_NUM_CHANNELS <=3D 8 */ bool reg_map_8_channels; bool restrict_axi_burst_len; --=20 2.39.2