From nobody Wed Feb 11 16:10:17 2026 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 8F3B7C74A5B for ; Mon, 13 Mar 2023 17:17:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230284AbjCMRRG (ORCPT ); Mon, 13 Mar 2023 13:17:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231499AbjCMRQz (ORCPT ); Mon, 13 Mar 2023 13:16:55 -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 8B9F977E15; Mon, 13 Mar 2023 10:16:27 -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 D8DC66141D; Mon, 13 Mar 2023 17:15:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43AFBC4339B; Mon, 13 Mar 2023 17:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727734; bh=IhJqKy/lFwInJmGYo3Tizjdc1Cg9RTkiCKAvvE/5axU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ma+bhWtuu+yLhewspm0qg1DsqcCvLp67qc/WgVu6MYKqlr5ZC3LT492zAnTEtkEn0 1WHAR73D78JEQpigWF2DcPdyFYeU9DOh+MmKqedagiobLZm8Yeykq+KDx26uALyxrQ 6r3AEht3hmXZ7qfyZZGfVsSCbsfLdjp6hPu1ZAUJ0AzEwLGpKrWzh2+yT679FkhQh3 BUxLuREbHdp3oJ7+gTbyhdqg0NW3Nq7DRxCvtkehJdgoxSmIYNqKbFhL/MmTxNcu3W H3xMcSHTS/hdZsrkKKNpPQLpx7TiNLManem5jNf7jWX8gJfCAp/TOJGVa6Gx5QkOH9 +xHR5vlK/viNQ== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] dmaengine: dw-axi-dmac: fix reading register hen runtime suspended Date: Tue, 14 Mar 2023 01:04:40 +0800 Message-Id: <20230313170450.897-2-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" We should runtime resume the device before calling axi_chan_is_hw_enable(). Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 7f3a60e28e38..23a10dbdecb7 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -462,13 +462,17 @@ static void dw_axi_dma_synchronize(struct dma_chan *d= chan) =20 static int dma_chan_alloc_chan_resources(struct dma_chan *dchan) { + int ret; struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); =20 + pm_runtime_get(chan->chip->dev); + /* ASSERT: channel is idle */ if (axi_chan_is_hw_enable(chan)) { dev_err(chan2dev(chan), "%s is non-idle!\n", axi_chan_name(chan)); - return -EBUSY; + ret =3D -EBUSY; + goto err_busy; } =20 /* LLI address must be aligned to a 64-byte boundary */ @@ -478,13 +482,16 @@ static int dma_chan_alloc_chan_resources(struct dma_c= han *dchan) 64, 0); if (!chan->desc_pool) { dev_err(chan2dev(chan), "No memory for descriptors\n"); - return -ENOMEM; + ret =3D -ENOMEM; + goto err_busy; } dev_vdbg(dchan2dev(dchan), "%s: allocating\n", axi_chan_name(chan)); =20 - pm_runtime_get(chan->chip->dev); - return 0; + +err_busy: + pm_runtime_put(chan->chip->dev); + return ret; } =20 static void dma_chan_free_chan_resources(struct dma_chan *dchan) --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 7EDBFC7618B for ; Mon, 13 Mar 2023 17:17:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231176AbjCMRRi (ORCPT ); Mon, 13 Mar 2023 13:17:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231575AbjCMRRX (ORCPT ); Mon, 13 Mar 2023 13:17:23 -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 6C56E5D44F; Mon, 13 Mar 2023 10:16:55 -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 5DABE6134E; Mon, 13 Mar 2023 17:15:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7667C4339C; Mon, 13 Mar 2023 17:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727735; bh=18h7yJ4dungwOKffwnbsdGXL7tiydULOEDbCcZ66iBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OynKBULDCoI/qcQGwd4Pr1fRMeE9xZRbwZyH/ENX9IxzsA5qb6ew9/0hl/W8SkZsa kPUXJz/V21M9lpDz9ycnnp8FdcNLsMBN1ECYYu6Ngpua00Kk5MEp8k+avfYhE3UuTj 2rtzJtf/mlB05WgEK1xQ2mZWWo0Hc2PZmvI12Zhe8qo4kiy5SW9EB897FJOZEoGVz+ xmqehOH+JGNeKNP/qys0RiJEupqI2F03msT/1a3Grl0aAFBHpTVEbjfleoZnjNrVoW zetoHu7WbstMVeEugIWb6Q77eIZFueshv1mq3AXD9T8pNmQj64tuv3mqHbDmbiixzc mAPVz3m2rcChg== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] dmaengine: dw-axi-dmac: remove unnecessary devm_free_irq() calling Date: Tue, 14 Mar 2023 01:04:41 +0800 Message-Id: <20230313170450.897-3-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" In dw_remove(), We have disabled the irq from the dw-axi-dma side, so we are safe against the case "The irq is still ON when devices remove is executed and irq should be quiesced before remove is completed." Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 -- 1 file changed, 2 deletions(-) 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 23a10dbdecb7..56f12dfa410d 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -1542,8 +1542,6 @@ static int dw_remove(struct platform_device *pdev) pm_runtime_disable(chip->dev); axi_dma_suspend(chip); =20 - devm_free_irq(chip->dev, chip->irq, chip); - of_dma_controller_free(chip->dev->of_node); =20 list_for_each_entry_safe(chan, _chan, &dw->dma.channels, --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 EDEFFC6FD19 for ; Mon, 13 Mar 2023 17:17:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231520AbjCMRRI (ORCPT ); Mon, 13 Mar 2023 13:17:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjCMRQ6 (ORCPT ); Mon, 13 Mar 2023 13:16:58 -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 56BB57E8B1; Mon, 13 Mar 2023 10:16:30 -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 D7B0061368; Mon, 13 Mar 2023 17:15:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39DAFC4339B; Mon, 13 Mar 2023 17:15:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727737; bh=/WoZ1V3BfTduJ79xfQ4OOwggeNMcUtHeDcPNMKwKbuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HuigqclHWxET0fEcgScekjHYmY/mpWPHwMXaJnJSXjXoWJM6vd5pe7bgmphI0o9u0 N+h97Hl/alXMJFQT5hiB+G3tjP7YVBWDykPS1ePqv+4xo+vv2RLkKgSXOWHImKAAiB YwFdoa+dFIAfQcjN1f2vnmKc0KRgR+rj0/Y53qQyISCaTMtjwgZHwnJ1Rp4nbr1PMD mRC52Kii48yk/cwCoFol3CcpFjguwOTbm+9AfJrmbz50Pe7g9Qm4+upUvoNex9T53Z WOKdUgXQ9fMWgAWBFwu3wf97yOBZ+oJ8CvwUOAnLeuIycpRca83q660pvtZkNV4IEY WDbOxI91eCgUA== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] dmaengine: dw-axi-dmac: remove unnecessary axi_dma_enable() calling Date: Tue, 14 Mar 2023 01:04:42 +0800 Message-Id: <20230313170450.897-4-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" The dma is enabled, I.E runtime resumed during chan allocation, and is disable, I.E runtime suspended during chan free. So when starting xfer, we are sure the dma is enabled. Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 -- 1 file changed, 2 deletions(-) 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 56f12dfa410d..891776528619 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -382,8 +382,6 @@ static void axi_chan_block_xfer_start(struct axi_dma_ch= an *chan, return; } =20 - axi_dma_enable(chan->chip); - config.dst_multblk_type =3D DWAXIDMAC_MBLK_TYPE_LL; config.src_multblk_type =3D DWAXIDMAC_MBLK_TYPE_LL; config.tt_fc =3D DWAXIDMAC_TT_FC_MEM_TO_MEM_DMAC; --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 79A85C61DA4 for ; Mon, 13 Mar 2023 17:17:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231585AbjCMRRl (ORCPT ); Mon, 13 Mar 2023 13:17:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbjCMRRZ (ORCPT ); Mon, 13 Mar 2023 13:17:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 831BA56152; Mon, 13 Mar 2023 10:16:56 -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 ams.source.kernel.org (Postfix) with ESMTPS id F262AB811AE; Mon, 13 Mar 2023 17:15:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B12F9C43444; Mon, 13 Mar 2023 17:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727738; bh=JRKBUa5JXVxlNgvhy7KVhNfMBjTnbpEYzC/sl0OoIDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bGryyCWuMURvsTurldq07AiHtbwoa8rCEUpMjBxrDURk+DOUZ/gOXyOokbyWbGKR/ /8bxGUpay+83Cwlnnf5qr/jAoep+mOzrW0WPiO+OImza88MKXpdPTjdzF8xJW2Gx8T eRVxrHiVAnugk/lJBZW2k2kiww3uuNKS3K2FqV9z2bhPUCAqYjcIBgx5djchzLFS1L Zpr1mmmtMNbMXBRq1lamM0/CpNOoi5u5J+C2+ZlYVMcs+RuvFB0O3TffZM1esPIp11 ixDQoCqg5Fud2z76z7BCEnA5EifZxYyN60wXwvGzK3QkUGWckYwF0kwU04iwJ2CEx9 ojtUUSYcfo+0w== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] dmaengine: dw-axi-dmac: remove redudant axi_dma_disable() calling Date: Tue, 14 Mar 2023 01:04:43 +0800 Message-Id: <20230313170450.897-5-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" axi_dma_suspend() will soon call axi_dma_disable(), remove the redudant axi_dma_disable() callin. Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 1 - 1 file changed, 1 deletion(-) 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 891776528619..410222e7224c 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -1535,7 +1535,6 @@ static int dw_remove(struct platform_device *pdev) axi_chan_disable(&chip->dw->chan[i]); axi_chan_irq_disable(&chip->dw->chan[i], DWAXIDMAC_IRQ_ALL); } - axi_dma_disable(chip); =20 pm_runtime_disable(chip->dev); axi_dma_suspend(chip); --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 4D5F8C61DA4 for ; Mon, 13 Mar 2023 17:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230503AbjCMRRP (ORCPT ); Mon, 13 Mar 2023 13:17:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbjCMRRA (ORCPT ); Mon, 13 Mar 2023 13:17:00 -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 2F29A5A928; Mon, 13 Mar 2023 10:16:33 -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 C7D1261381; Mon, 13 Mar 2023 17:15:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 318E9C4339B; Mon, 13 Mar 2023 17:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727740; bh=Wq9HdywcRzw2m/st4OKSeu8XmLXjFD1NNFfAN6itaz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sKgd+ztaC39soHjcw/Zova9uilv09zfak4DBc6q5EpKhTdjMsEKuqZEbB1FWzkTTu j2apkY5HKm8HXIvXu6IEDUIQYId4xdoE27ejvIrCItoeam7kSIiwqjA+mNUAeLt/Qi xuQbCXysqla3PlCHbm9OqCwrBY0tLXDEX/cb8uWdmJulSjMPr21NPwHStU6+E/K9uD wrajF/s6kdeFzBilf9JukGJSLltythKuNtvhNJvhNVSR5ZWiOb7SyBcX26cX9kTxro TJISaXkvnCIZQXwuRgLgJRl4whOx0Xfm8qRXv5r/RNnmtV9l9MEN0iu0VbA+k/R3dQ Re6Ny4Jucq0JQ== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] dmaengine: dw-axi-dmac: delay irq getting until request_irq Date: Tue, 14 Mar 2023 01:04:44 +0800 Message-Id: <20230313170450.897-6-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" This is to prepare for per-channel irq support in next patch. In per-channel irq case, we need to parse dt firstly to know whether the platform is per-channel irq or not. Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 410222e7224c..6087fb7d567a 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -1395,10 +1395,6 @@ static int dw_probe(struct platform_device *pdev) chip->dev =3D &pdev->dev; chip->dw->hdata =3D hdata; =20 - chip->irq =3D platform_get_irq(pdev, 0); - if (chip->irq < 0) - return chip->irq; - chip->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(chip->regs)) return PTR_ERR(chip->regs); @@ -1426,6 +1422,10 @@ static int dw_probe(struct platform_device *pdev) if (!dw->chan) return -ENOMEM; =20 + chip->irq =3D platform_get_irq(pdev, 0); + if (chip->irq < 0) + return chip->irq; + ret =3D devm_request_irq(chip->dev, chip->irq, dw_axi_dma_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip); if (ret) --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 003C0C74A5B for ; Mon, 13 Mar 2023 17:23:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229743AbjCMRXx (ORCPT ); Mon, 13 Mar 2023 13:23:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjCMRXa (ORCPT ); Mon, 13 Mar 2023 13:23:30 -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 E0389D530; Mon, 13 Mar 2023 10:22:33 -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 4B64261423; Mon, 13 Mar 2023 17:15:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FF99C433EF; Mon, 13 Mar 2023 17:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727741; bh=X0v6md0ShrzygWDpZi0pa8rfM30TOG9ETPBgqjPAHbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xaf+tiZJ5OBAxeLGXmtyAFMCaeq0qoTTinLpwYLsvKb2RnUjeoKuTMS3fZUZesLc+ BoPZKR79Y+UxocHkR6KE3hlui5VQMCLKHE3zlCN8peiq5LRPXWD/DSorMegDYdH1bD sK8QgIATwiJng5ZJ7dSVUHVeKAO8d5k25YA+64t5oAFFWLGfmP+4iKxFfgs5GzWa9h liOQScDI/mEeU9NXKDXNo/jxONKWq3BOUzhGqAwzWyys7bPIuT2nC7EAwTqiVjh99R cFkDTQG2fSJn//tCt4AU5M15pcbCuAJNnugUqTcAV/KHJS+XWJj/8cSNGM/v1Ccadx rnaxm4DGNwNvw== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] dmaengine: dw-axi-dmac: move ch irq handling into common routine Date: Tue, 14 Mar 2023 01:04:45 +0800 Message-Id: <20230313170450.897-7-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" In next patch, we will add per-channel irq support, we will use the common routine in per-channel irq handler. Signed-off-by: Jisheng Zhang --- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) 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 6087fb7d567a..796fd0136781 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -1101,13 +1101,30 @@ static void axi_chan_block_xfer_complete(struct axi= _dma_chan *chan) spin_unlock_irqrestore(&chan->vc.lock, flags); } =20 +static void dw_axi_dma_handle_ch(struct axi_dma_chan *chan) +{ + u32 status; + + /* Poll, clear and process this channel interrupt status */ + status =3D axi_chan_irq_read(chan); + axi_chan_irq_clear(chan, status); + + dev_vdbg(chan->chip->dev, "%s IRQ status: 0x%08x\n", axi_chan_name(chan),= status); + + if (status & DWAXIDMAC_IRQ_ALL_ERR) + axi_chan_handle_err(chan, status); + else if (status & DWAXIDMAC_IRQ_DMA_TRF) + axi_chan_block_xfer_complete(chan); + +} + static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id) { struct axi_dma_chip *chip =3D dev_id; struct dw_axi_dma *dw =3D chip->dw; struct axi_dma_chan *chan; =20 - u32 status, i; + u32 i; =20 /* Disable DMAC interrupts. We'll enable them after processing channels */ axi_dma_irq_disable(chip); @@ -1115,16 +1132,7 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, voi= d *dev_id) /* Poll, clear and process every channel interrupt status */ for (i =3D 0; i < dw->hdata->nr_channels; i++) { chan =3D &dw->chan[i]; - status =3D axi_chan_irq_read(chan); - axi_chan_irq_clear(chan, status); - - dev_vdbg(chip->dev, "%s %u IRQ status: 0x%08x\n", - axi_chan_name(chan), i, status); - - if (status & DWAXIDMAC_IRQ_ALL_ERR) - axi_chan_handle_err(chan, status); - else if (status & DWAXIDMAC_IRQ_DMA_TRF) - axi_chan_block_xfer_complete(chan); + dw_axi_dma_handle_ch(chan); } =20 /* Re-enable interrupts */ --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 ED4EDC61DA4 for ; Mon, 13 Mar 2023 17:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231461AbjCMRXA (ORCPT ); Mon, 13 Mar 2023 13:23:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbjCMRWn (ORCPT ); Mon, 13 Mar 2023 13:22:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 922118317B; Mon, 13 Mar 2023 10:21:40 -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 ams.source.kernel.org (Postfix) with ESMTPS id 59337B811B6; Mon, 13 Mar 2023 17:15:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 200E5C433D2; Mon, 13 Mar 2023 17:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727743; bh=BENT+Gyh2C5823xlOfoa81398QX+6CAqsChvkHIBGOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OAUPmfhl0MJEIjwtmCduDdD8aCkqfvNEOohRkEne7CshXZqSdrT6OeF04a80e3e8e v4C9/etA6G7YvWU7Kb7RR7BEJuKCc6vh04nOTvcirodB2MbeuoAa1xhyPCwFslTCaw WadHH2xfttyeSr3Ds0XTN2aD8UTYdADUfCsfXzmMJUeceqwkFHMlP2lPjlpfZDae/4 jQnzyza24xwy/dk94S7g6maWIRvL1sMblB+p21oS3SNU3DMGU1nEArgO7df2RCOotV oNbrP3B2aFPWYut+4fgEquB+tFi7D1l6z4vEqM+ZRyAjDVaC4eGDFK/QGkADTPr97p D6icQ9a0x0dRA== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] dmaengine: dw-axi-dmac: support per channel irq Date: Tue, 14 Mar 2023 01:04:46 +0800 Message-Id: <20230313170450.897-8-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" Each channel can have its own irq, support this case. Signed-off-by: Jisheng Zhang --- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 48 +++++++++++++++---- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 2 + 2 files changed, 42 insertions(+), 8 deletions(-) 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 796fd0136781..edb1c089a8eb 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -1141,6 +1141,21 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, voi= d *dev_id) return IRQ_HANDLED; } =20 +static irqreturn_t dw_axi_dma_ch_interrupt(int irq, void *dev_id) +{ + struct axi_dma_chan *chan =3D dev_id; + + /* Disable DMAC interrupts. We'll enable them after processing channels */ + axi_chan_irq_sig_set(chan, DWAXIDMAC_IRQ_NONE); + + dw_axi_dma_handle_ch(chan); + + /* Re-enable interrupts */ + axi_chan_irq_sig_set(chan, DWAXIDMAC_IRQ_DMA_TRF | DWAXIDMAC_IRQ_ALL_ERR); + + return IRQ_HANDLED; +} + static int dma_chan_terminate_all(struct dma_chan *dchan) { struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); @@ -1375,6 +1390,8 @@ static int parse_device_properties(struct axi_dma_chi= p *chip) chip->dw->hdata->axi_rw_burst_len =3D tmp; } =20 + chip->dw->hdata->perch_irq =3D device_property_read_bool(dev, "snps,perch= _irq"); + return 0; } =20 @@ -1430,14 +1447,29 @@ static int dw_probe(struct platform_device *pdev) if (!dw->chan) return -ENOMEM; =20 - chip->irq =3D platform_get_irq(pdev, 0); - if (chip->irq < 0) - return chip->irq; - - ret =3D devm_request_irq(chip->dev, chip->irq, dw_axi_dma_interrupt, - IRQF_SHARED, KBUILD_MODNAME, chip); - if (ret) - return ret; + if (hdata->perch_irq) { + char irqname[8]; + for (i =3D 0; i < hdata->nr_channels; i++) { + snprintf(irqname, sizeof(irqname), "ch%u", i); + dw->chan[i].irq =3D platform_get_irq_byname(pdev, irqname); + if (dw->chan[i].irq < 0) + return dw->chan[i].irq; + ret =3D devm_request_irq(chip->dev, dw->chan[i].irq, + dw_axi_dma_ch_interrupt, + 0, KBUILD_MODNAME, &dw->chan[i]); + if (ret) + return ret; + } + } else { + chip->irq =3D platform_get_irq(pdev, 0); + if (chip->irq < 0) + return chip->irq; + + ret =3D devm_request_irq(chip->dev, chip->irq, dw_axi_dma_interrupt, + IRQF_SHARED, KBUILD_MODNAME, chip); + if (ret) + return ret; + } =20 INIT_LIST_HEAD(&dw->dma.channels); for (i =3D 0; i < hdata->nr_channels; i++) { diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dma= c/dw-axi-dmac.h index e9d5eb0fd594..83ac839b4394 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h @@ -33,6 +33,7 @@ struct dw_axi_dma_hcfg { /* Register map for DMAX_NUM_CHANNELS <=3D 8 */ bool reg_map_8_channels; bool restrict_axi_burst_len; + bool perch_irq; }; =20 struct axi_dma_chan { @@ -48,6 +49,7 @@ struct axi_dma_chan { struct axi_dma_desc *desc; struct dma_slave_config config; enum dma_transfer_direction direction; + int irq; bool cyclic; /* these other elements are all protected by vc.lock */ bool is_paused; --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 5B6F7C61DA4 for ; Mon, 13 Mar 2023 17:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231572AbjCMRSO (ORCPT ); Mon, 13 Mar 2023 13:18:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230426AbjCMRSA (ORCPT ); Mon, 13 Mar 2023 13:18:00 -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 B14FC81CE4; Mon, 13 Mar 2023 10:17:32 -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 319AE6142F; Mon, 13 Mar 2023 17:15:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91440C433EF; Mon, 13 Mar 2023 17:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727744; bh=LTJK1Q5mjYuDFo6XOCu0Yts3P4bL4yj+TgvZBGYtFVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=juz5mfjIHepuK/C9slExugzY1AT/hTly2K0djTFKQtMPZLNdsnTYzJnhImV3McZFf gP7768wE2sjelp9jgF6+BqLpQNziHenoA8Dqz++Bm+kYY8mlQFwJ1XwFgo706aqARH gJFidpFNx2JfKW2xGQN3mMdTAVlesx4ziduuwSKQYkFCXSOzyb2FVwtWxz6HIuHWRy XtqtVvZp+46HjJkDoHwwFlckYrF6ozr1KNRcSR1fkFMpK2UHnbsLinHqPnadrBuw7T IqYcX1S35y1wm/hwPjtcFt3/cBzq/DN6P3EufNXDfo5fs6APztcnbczjE5JzhP3y3R +JCWfbkyOWZEA== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] dmaengine: dw-axi-dmac: support dma-channel-mask Date: Tue, 14 Mar 2023 01:04:47 +0800 Message-Id: <20230313170450.897-9-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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 From nobody Wed Feb 11 16:10:17 2026 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 8C5BCC61DA4 for ; Mon, 13 Mar 2023 17:17:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231577AbjCMRRn (ORCPT ); Mon, 13 Mar 2023 13:17:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231239AbjCMRR3 (ORCPT ); Mon, 13 Mar 2023 13:17:29 -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 3544377CBA; Mon, 13 Mar 2023 10:16:58 -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 A21BB6144A; Mon, 13 Mar 2023 17:15:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CF0DC4339C; Mon, 13 Mar 2023 17:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727746; bh=eA2ZxLGWNR6IdxbFmS127kxHvHFaTkPGETvRqPfSGHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rz+HewYQDWhKf2yVjWlD3Ax9+Bei/7TPg13o2xwZJMK5x/cP9LYG78LNGMJ0j8/Od kKprT9xj8VyFk0GbUfCKCeXjqQnkpBzsAVxHRea9/0NxyNiez5/4/VWE0VYmijkZf+ Rs2jKa7+8pzb3SEeKfl4lzZ0lwJfab0c5PDZE8ZEvLAVn5D17sZm+z0D3s70ggk9BJ yUvMLmRQ1DmmAqJxmtDMjRKeJCjICW8tGdLwOChm+OsExmxIDJnRArIDxbHQF4D0E8 +uPUVPcchyBMj06+r2ukJZLkK7l5fFEGcapnljsHzX9WVOciblQefC38gn/zeNtUgC MGPe94fPoWuXg== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] dmaengine: dw-axi-dmac: try best to get residue when tx is running Date: Tue, 14 Mar 2023 01:04:48 +0800 Message-Id: <20230313170450.897-10-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" When tx is running, vchan_find_desc() will return NULL, try our best to get the residue in this case. Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 a6e46cb66000..1c1b9574985a 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -305,6 +305,7 @@ dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t= cookie, struct dma_tx_state *txstate) { struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); + struct axi_dma_desc *desc =3D NULL; struct virt_dma_desc *vdesc; enum dma_status status; u32 completed_length; @@ -322,9 +323,15 @@ dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_= t cookie, =20 vdesc =3D vchan_find_desc(&chan->vc, cookie); if (vdesc) { - length =3D vd_to_axi_desc(vdesc)->length; - completed_blocks =3D vd_to_axi_desc(vdesc)->completed_blocks; - len =3D vd_to_axi_desc(vdesc)->hw_desc[0].len; + desc =3D vd_to_axi_desc(vdesc); + } else if (chan->desc && chan->desc->vd.tx.cookie =3D=3D cookie) { + desc =3D chan->desc; + } + + if (desc) { + length =3D desc->length; + completed_blocks =3D desc->completed_blocks; + len =3D desc->hw_desc[0].len; completed_length =3D completed_blocks * len; bytes =3D length - completed_length; } @@ -425,6 +432,7 @@ static void axi_chan_block_xfer_start(struct axi_dma_ch= an *chan, axi_chan_irq_set(chan, irq_mask); =20 axi_chan_enable(chan); + chan->desc =3D first; } =20 static void axi_chan_start_first_queued(struct axi_dma_chan *chan) @@ -1188,6 +1196,7 @@ static int dma_chan_terminate_all(struct dma_chan *dc= han) spin_unlock_irqrestore(&chan->vc.lock, flags); =20 vchan_dma_desc_free_list(&chan->vc, &head); + chan->desc =3D NULL; =20 dev_vdbg(dchan2dev(dchan), "terminated: %s\n", axi_chan_name(chan)); =20 --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 AD3C1C61DA4 for ; Mon, 13 Mar 2023 17:17:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231522AbjCMRRT (ORCPT ); Mon, 13 Mar 2023 13:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231527AbjCMRRJ (ORCPT ); Mon, 13 Mar 2023 13:17:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACAF88092F; Mon, 13 Mar 2023 10:16:40 -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 ams.source.kernel.org (Postfix) with ESMTPS id B6EACB811AF; Mon, 13 Mar 2023 17:15:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81027C433EF; Mon, 13 Mar 2023 17:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727747; bh=iP3PWNMb+3tRizoMnR4yxUHqhZ9zp9+fFtQ/nNwpumk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r6B1QTM2G4QG7c6I9hwylzYb/x7Ch6gfDExVqIDhHFj0NuC8gZN0M2zyvSymKgzgJ /CLWU5n8lN5UGw5EO2P2WLvbSU+zpSmRi+Tq6+o3JIc7L10oZEy8UdMpeJVMxoO9Eg YIm2uQR1zaAZOAacvX5cIC1Z6fZfbByoC4bgpRBZkIJc/U30MzQ89EsCQkDMStoLgo sPbIegUeD9CCsAyvqwQVYE7zDF2x0tktW2tb9m1WNMmTywTUvcNchn+fM5nKpms/Ie 96KwQIjDECl+IW60bH8GQKSElYwSs77N09WjjKnZgfGeP6Z7osUFt8Z04WNt0zdS+c dgF+0478/dDuw== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] dmaengine: dw-axi-dmac: move dma_chan_tx_status() Date: Tue, 14 Mar 2023 01:04:49 +0800 Message-Id: <20230313170450.897-11-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" We will add polled support soon, for which we need to call dw_axi_dma_handle_ch() in dma_chan_tx_status(). Move the function to avoid pre-declaration. No functionality changes. Signed-off-by: Jisheng Zhang --- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) 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 1c1b9574985a..1d00793a83bf 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -300,48 +300,6 @@ static void vchan_desc_put(struct virt_dma_desc *vdesc) axi_desc_put(vd_to_axi_desc(vdesc)); } =20 -static enum dma_status -dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie, - struct dma_tx_state *txstate) -{ - struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); - struct axi_dma_desc *desc =3D NULL; - struct virt_dma_desc *vdesc; - enum dma_status status; - u32 completed_length; - unsigned long flags; - u32 completed_blocks; - size_t bytes =3D 0; - u32 length; - u32 len; - - status =3D dma_cookie_status(dchan, cookie, txstate); - if (status =3D=3D DMA_COMPLETE || !txstate) - return status; - - spin_lock_irqsave(&chan->vc.lock, flags); - - vdesc =3D vchan_find_desc(&chan->vc, cookie); - if (vdesc) { - desc =3D vd_to_axi_desc(vdesc); - } else if (chan->desc && chan->desc->vd.tx.cookie =3D=3D cookie) { - desc =3D chan->desc; - } - - if (desc) { - length =3D desc->length; - completed_blocks =3D desc->completed_blocks; - len =3D desc->hw_desc[0].len; - completed_length =3D completed_blocks * len; - bytes =3D length - completed_length; - } - - spin_unlock_irqrestore(&chan->vc.lock, flags); - dma_set_residue(txstate, bytes); - - return status; -} - static void write_desc_llp(struct axi_dma_hw_desc *desc, dma_addr_t adr) { desc->lli->llp =3D cpu_to_le64(adr); @@ -1166,6 +1124,48 @@ static irqreturn_t dw_axi_dma_ch_interrupt(int irq, = void *dev_id) return IRQ_HANDLED; } =20 +static enum dma_status +dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie, + struct dma_tx_state *txstate) +{ + struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); + struct axi_dma_desc *desc =3D NULL; + struct virt_dma_desc *vdesc; + enum dma_status status; + u32 completed_length; + unsigned long flags; + u32 completed_blocks; + size_t bytes =3D 0; + u32 length; + u32 len; + + status =3D dma_cookie_status(dchan, cookie, txstate); + if (status =3D=3D DMA_COMPLETE || !txstate) + return status; + + spin_lock_irqsave(&chan->vc.lock, flags); + + vdesc =3D vchan_find_desc(&chan->vc, cookie); + if (vdesc) { + desc =3D vd_to_axi_desc(vdesc); + } else if (chan->desc && chan->desc->vd.tx.cookie =3D=3D cookie) { + desc =3D chan->desc; + } + + if (desc) { + length =3D desc->length; + completed_blocks =3D desc->completed_blocks; + len =3D desc->hw_desc[0].len; + completed_length =3D completed_blocks * len; + bytes =3D length - completed_length; + } + + spin_unlock_irqrestore(&chan->vc.lock, flags); + dma_set_residue(txstate, bytes); + + return status; +} + static int dma_chan_terminate_all(struct dma_chan *dchan) { struct axi_dma_chan *chan =3D dchan_to_axi_dma_chan(dchan); --=20 2.39.2 From nobody Wed Feb 11 16:10:17 2026 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 779B0C74A4B for ; Mon, 13 Mar 2023 17:17:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230178AbjCMRR0 (ORCPT ); Mon, 13 Mar 2023 13:17:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231551AbjCMRRM (ORCPT ); Mon, 13 Mar 2023 13:17:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5E2C80902; Mon, 13 Mar 2023 10:16:42 -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 ams.source.kernel.org (Postfix) with ESMTPS id 417C3B811B2; Mon, 13 Mar 2023 17:15:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02C2CC4339E; Mon, 13 Mar 2023 17:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678727749; bh=do8+kPrEABA/+sArd48GuvtE5icgNiKsJ/7FNgFAelM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q/qc6WSx2eaxfWUOaCR+Jt4U8paKMjj7KnDAWCX+J3H2/KXdEoE/A1nkimEhlbjId Y209A1IzajyXtQfyP7cyCqN9F2qVAT6MTQVxk0cpCzRZYiLgRB0Ee1JeM29PeOievu vJHJWiMJTTSYjMJN799lYCJ47zl+b3YXI+ZhbcAntWpxIDHvUgOQn/bVWv0cGauw55 7T8uruloIifyaQnZb+FNgLYkHX+pkDSOqrXpuWmj6P7yHRglLFseQOd1MMQfcDCgpY LOyCZ5qowffCRz1O5QVnL7JcyO0U2rXTxEH9LLMEs3ivku9ahB4G+knIWDtqNed30M KAgELShJAfwYA== From: Jisheng Zhang To: Eugeniy Paltsev , Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] dmaengine: dw-axi-dmac: support polled mode Date: Tue, 14 Mar 2023 01:04:50 +0800 Message-Id: <20230313170450.897-12-jszhang@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313170450.897-1-jszhang@kernel.org> References: <20230313170450.897-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" Run in polled mode if the DMA_PREP_INTERRUPT flag is not provided. Signed-off-by: Jisheng Zhang --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 11 ++++++++++- drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) 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 1d00793a83bf..8daeb22d4560 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -383,7 +383,10 @@ static void axi_chan_block_xfer_start(struct axi_dma_c= han *chan, write_chan_llp(chan, first->hw_desc[0].llp | lms); =20 irq_mask =3D DWAXIDMAC_IRQ_DMA_TRF | DWAXIDMAC_IRQ_ALL_ERR; - axi_chan_irq_sig_set(chan, irq_mask); + if (chan->polled) + axi_chan_irq_sig_set(chan, DWAXIDMAC_IRQ_NONE); + else + axi_chan_irq_sig_set(chan, irq_mask); =20 /* Generate 'suspend' status but don't generate interrupt */ irq_mask |=3D DWAXIDMAC_IRQ_SUSPENDED; @@ -714,6 +717,7 @@ dw_axi_dma_chan_prep_cyclic(struct dma_chan *dchan, dma= _addr_t dma_addr, if (unlikely(!desc)) goto err_desc_get; =20 + chan->polled =3D !(flags & DMA_PREP_INTERRUPT); chan->direction =3D direction; desc->chan =3D chan; chan->cyclic =3D true; @@ -796,6 +800,7 @@ dw_axi_dma_chan_prep_slave_sg(struct dma_chan *dchan, s= truct scatterlist *sgl, =20 desc->chan =3D chan; desc->length =3D 0; + chan->polled =3D !(flags & DMA_PREP_INTERRUPT); chan->direction =3D direction; =20 for_each_sg(sgl, sg, sg_len, i) { @@ -859,6 +864,7 @@ dma_chan_prep_dma_memcpy(struct dma_chan *dchan, dma_ad= dr_t dst_adr, if (unlikely(!desc)) goto err_desc_get; =20 + chan->polled =3D !(flags & DMA_PREP_INTERRUPT); desc->chan =3D chan; num =3D 0; desc->length =3D 0; @@ -1139,6 +1145,9 @@ dma_chan_tx_status(struct dma_chan *dchan, dma_cookie= _t cookie, u32 length; u32 len; =20 + if (chan->polled) + dw_axi_dma_handle_ch(chan); + status =3D dma_cookie_status(dchan, cookie, txstate); if (status =3D=3D DMA_COMPLETE || !txstate) return status; diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dma= c/dw-axi-dmac.h index f57961620d2d..e4fbc38446ec 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h @@ -54,6 +54,7 @@ struct axi_dma_chan { bool cyclic; /* these other elements are all protected by vc.lock */ bool is_paused; + bool polled; }; =20 struct dw_axi_dma { --=20 2.39.2