Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795060410; b=LN31zv76l08c5oiuhFK9vM7Wa8G3DWn5jcxS2jUUl73RWmAIaxUWkiDIU0/ehT0Np+tW MaUFHq2sJvgtLAPRr3nw+HRAby3NVttolNjH96KpJKDkQnU2fvRjjXAZR37J8jODEDtAw Gbg0NXNPWXvkO7CCfXEQLi3Rx8M9Kgapq3TgPn2pX32bXFuxwogL2i2uGyWm31bPmZkr4 WAzKi9BB4i2IhTVC+w6WjuICKRXfA8/xHNyqYo3vYXGx0Z8wN6uVyB4QGkHQJkqteseBC 9mj4W0gcmL1AyVaqGe4gaolOrfJffzTemDLd4kE/d6taeukNmrNvOnZmeksIQqWtlvg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060410; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=BfpbdVh36vZsQNhc+RzXVOgCpczga05tj8yr2m+7P48=; b=ixzDF2NWwTAYVMgVj/NIEUdLL38NZTgm7oTfjcb7UecV3Uwj46zJqrRCfW2XECVx14+o YwOiwDeZLIcdWeB/ToZRhfQ2s7R4SvT/JQ45euNvZZIfD+ASMkH1tcsabY4GjX3AA1s/Z 4CKERO8IG6zhLzpV09TwL++PA8K+Ap1WWHxy+JVy+FD3f10tOw9rTqJqUD33++3Afaskf llnMa90xcplB4yAKmYShGpbHbbTpwB2h8eGJWhRjshQrLxkFDEJn9VoGEo1ZgS4bcwDri wyHisOlJlCn9cOBgaWG/f+o8FZeYiE6JkjRnE/cfvVS+7yQlcXgM3BQRnrUPcL4DVvg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=tIP+B5Ev; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4185606A32A; Thu, 19 Nov 2026 03:53:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=tIP+B5Ev Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3C531F000C4; Thu, 19 Nov 2026 03:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060410; bh=BfpbdVh36vZsQNhc+RzXVOgCpczga05tj8yr2m+7P48=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tIP+B5EvMdJ3qfmD5cGZne7GCWWbfmQr2w//jQ2YYyIKleUD2H9O5CdMoP8kMkt0D xv6cLgQyDkG5w82C89CtA4ZuO5tn0Ehbk6kaNZWjxK7d7LnRcDV6QtiIqCj7o83saq ohvpo302xDQHotw11zEymq2sqWfQNAKB25a8CCPs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Golla Nagendra , Frank Li , Vinod Koul , Sasha Levin Subject: [PATCH 5.10 1188/1848] dmaengine: zynqmp_dma: Fix chan probe/remove error handling Date: Wed, 18 Nov 2026 15:53:46 +0100 Message-ID: <20261118150009.245966268@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Golla Nagendra [ Upstream commit 0266dac57019201a14a81245d22750ab221d6c66 ] Keep the real platform_get_irq() error by returning ret directly, stage IRQ setup via a local ret variable, and assign chan->irq only after devm_request_irq() succeeds. Initialize chan->irq to -1 and initialize chan->common.device_node before it may be touched by teardown. In channel remove, free IRQ only for valid IRQ numbers and delete the channel node only when it is linked. Register the channel node only after successful IRQ setup. On channel probe failure in zynqmp_dma_probe(), route cleanup through the existing free_chan_resources teardown path. Fixes: b0cc417c1637 ("dmaengine: Add Xilinx zynqmp dma engine driver support") Signed-off-by: Golla Nagendra Reviewed-by: Frank Li Link: https://patch.msgid.link/20260814045616.1661199-4-nagendra.golla@amd.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/xilinx/zynqmp_dma.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c index 504dc00415c30..bc1f497732bc4 100644 --- a/drivers/dma/xilinx/zynqmp_dma.c +++ b/drivers/dma/xilinx/zynqmp_dma.c @@ -207,7 +207,7 @@ struct zynqmp_dma_desc_sw { * @desc_pool_p: Physical allocated descriptor base * @desc_free_cnt: Descriptor available count * @dev: The dma device - * @irq: Channel IRQ + * @irq: Linux IRQ number, or -1 when not registered * @is_dmacoherent: Tells whether dma operations are coherent or not * @tasklet: Cleanup work after irq * @idle : Channel status; @@ -873,10 +873,11 @@ static void zynqmp_dma_chan_remove(struct zynqmp_dma_chan *chan) if (!chan) return; - if (chan->irq) + if (chan->irq >= 0) devm_free_irq(chan->zdev->dev, chan->irq, chan); tasklet_kill(&chan->tasklet); - list_del(&chan->common.device_node); + if (!list_empty(&chan->common.device_node)) + list_del(&chan->common.device_node); } /** @@ -893,13 +894,14 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev, struct resource *res; struct device_node *node = pdev->dev.of_node; const struct zynqmp_dma_config *match_data; - int err; + int err, ret; chan = devm_kzalloc(zdev->dev, sizeof(*chan), GFP_KERNEL); if (!chan) return -ENOMEM; chan->dev = zdev->dev; chan->zdev = zdev; + chan->irq = -1; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); chan->regs = devm_ioremap_resource(&pdev->dev, res); @@ -933,22 +935,26 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev, INIT_LIST_HEAD(&chan->pending_list); INIT_LIST_HEAD(&chan->done_list); INIT_LIST_HEAD(&chan->free_list); + INIT_LIST_HEAD(&chan->common.device_node); dma_cookie_init(&chan->common); chan->common.device = &zdev->common; - list_add_tail(&chan->common.device_node, &zdev->common.channels); - zynqmp_dma_init(chan); - chan->irq = platform_get_irq(pdev, 0); - if (chan->irq < 0) - return -ENXIO; - err = devm_request_irq(&pdev->dev, chan->irq, zynqmp_dma_irq_handler, 0, + ret = platform_get_irq(pdev, 0); + if (ret < 0) + return ret; + + err = devm_request_irq(&pdev->dev, ret, zynqmp_dma_irq_handler, 0, "zynqmp-dma", chan); if (err) return err; + chan->irq = ret; + chan->desc_size = sizeof(struct zynqmp_dma_desc_ll); chan->idle = true; + list_add_tail(&chan->common.device_node, &zdev->common.channels); + return 0; } @@ -1104,7 +1110,7 @@ static int zynqmp_dma_probe(struct platform_device *pdev) ret = zynqmp_dma_chan_probe(zdev, pdev); if (ret) { dev_err_probe(&pdev->dev, ret, "Probing channel failed\n"); - goto err_disable_pm; + goto free_chan_resources; } p->dst_addr_widths = BIT(zdev->chan->bus_width / 8); -- 2.53.0