From patchwork Fri Feb 7 12:47:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= X-Patchwork-Id: 13964950 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53AC7C0219C for ; Fri, 7 Feb 2025 12:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EN5uKDKBs2TFBzx+EqNYKD0FORICT1RtSymVEFjrtcw=; b=AlKG6GJI1UUeIv hOyqHH/mMSdgSgU4PM2ECt3io38rQczLUcobYptNmbrItqkYUk2xDtpK0gp5LAPZWhS9P9qmeYIxJ dSPQMstn5HPb/W5ZAFiyCAoXcY6Xd4hOxg501YiZRbHLNrSY9NLdH40hqS1VkXrIqp4gxHf1RyaMY s7wFBCC8NIw23wPOIMB2q7Fm3uYJVMlS5LR/eia9ZSPcQi5qH4ARn9oMe+GEkuOOGUGhL746ByEQx ajdCrN0x5vGWty0bDEpqzZ9JfK9Q4v7nB1FV+F/Gteu+T8HEFeZSL3hjNg1txpKkrIWgM5Lh+Px8T iDNeWM+8PRsadkYgGYQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tgNow-00000009Zbx-16m5; Fri, 07 Feb 2025 12:50:58 +0000 Received: from fw2.prolan.hu ([193.68.50.107]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tgNmD-00000009Ytl-4033 for linux-arm-kernel@lists.infradead.org; Fri, 07 Feb 2025 12:48:11 +0000 Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id A63C7A1756; Fri, 7 Feb 2025 13:48:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=EN5uKDKBs2TFBzx+EqNY KD0FORICT1RtSymVEFjrtcw=; b=DXvx0o34J8tTdtOgr4q89tlci9jbO0RrQ6fW TXNr7u1PtxCsnh1BOEsqRK97S3nrRPxf4GT7h8Gs0bKnTLAE/z/JwbaRRqbQDTYN dD7s3YOw/jqtY4Wu8Jh8E46tn98ERfdFCavJR5OLn7cSGbK2gy8ITCkzEK3jVYNA DvAoWLv0Euejeb0kHXdMxiy+nEQ/cXxrNcbChdCtl2nyduSoe2xpQ4yBCteGFQ6F v/E+zIpAFn7+/QCptZZNjNHabqZOYi/wlE1IhoDuoOKaubX7AE7wmyxfgkjh0m8d U4QWu6hLhQjA6TTltdO2GsfZ/SRmgj6LEayrIp75UclgXB/UqhIn5kN/PAqm/c5T lkFPvRBqTNqyL9hyhmDsL4KZ0foqda9txlMoj/uvYvFwuRKKt0jJohUzLXO24S3d N109isuNKJzQSwvZ2TJLdZQqFD71W7r4AjXH0Dmq6SDHMrkE/kjAiMdAlBfbrGae nT8HgY51NWk9EPaM4R+BB0HLz/AiqWC7cXPHVMTmVR/PQPiNYTPIjfcwVnzuK8h/ 7uohdHTTg7g5iOMz0e+96WvyX1lAqpjK3xl4C0EOk1BiltDqV6E4z+30hQ+kHT9H EAd7c/vb3Qd3/ix1vbt1au1oYqvfoZ+8kmFMwL+A/OwqOYBcu9/inCAjVFcG3qI3 T4orMqc= From: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= To: , , Subject: [PATCH for-6.14 v3 3/4] spi: atmel-quadspi: Use `devm_dma_request_chan()` Date: Fri, 7 Feb 2025 13:47:58 +0100 Message-ID: <20250207124802.165408-4-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207124802.165408-1-csokas.bence@prolan.hu> References: <20250207124802.165408-1-csokas.bence@prolan.hu> MIME-Version: 1.0 X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1738932487;VERSION=7985;MC=1603935075;ID=401535;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A29ACD94852617560 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250207_044810_145180_880E6276 X-CRM114-Status: GOOD ( 14.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Mark Brown , =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= , Claudiu Beznea Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Leave releasing of DMA channels up to the devm facilities. This way we can eliminate the rest of the "goto ladder". Signed-off-by: Bence Csókás --- drivers/spi/atmel-quadspi.c | 44 ++++++++++--------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index abdc49d9d940..b1fb4426c78d 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -1288,18 +1288,20 @@ static int atmel_qspi_dma_init(struct spi_controller *ctrl) struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); int ret; - aq->rx_chan = dma_request_chan(&aq->pdev->dev, "rx"); + aq->rx_chan = devm_dma_request_chan(&aq->pdev->dev, "rx"); if (IS_ERR(aq->rx_chan)) { aq->rx_chan = NULL; return dev_err_probe(&aq->pdev->dev, PTR_ERR(aq->rx_chan), "RX DMA channel is not available\n"); } - aq->tx_chan = dma_request_chan(&aq->pdev->dev, "tx"); + aq->tx_chan = devm_dma_request_chan(&aq->pdev->dev, "tx"); if (IS_ERR(aq->tx_chan)) { ret = dev_err_probe(&aq->pdev->dev, PTR_ERR(aq->tx_chan), "TX DMA channel is not available\n"); - goto release_rx_chan; + aq->rx_chan = NULL; + aq->tx_chan = NULL; + return ret; } ctrl->dma_rx = aq->rx_chan; @@ -1310,20 +1312,6 @@ static int atmel_qspi_dma_init(struct spi_controller *ctrl) dma_chan_name(aq->tx_chan), dma_chan_name(aq->rx_chan)); return 0; - -release_rx_chan: - dma_release_channel(aq->rx_chan); - aq->rx_chan = NULL; - aq->tx_chan = NULL; - return ret; -} - -static void atmel_qspi_dma_release(struct atmel_qspi *aq) -{ - if (aq->rx_chan) - dma_release_channel(aq->rx_chan); - if (aq->tx_chan) - dma_release_channel(aq->tx_chan); } static const struct atmel_qspi_ops atmel_qspi_ops = { @@ -1428,14 +1416,13 @@ static int atmel_qspi_probe(struct platform_device *pdev) /* Request the IRQ */ irq = platform_get_irq(pdev, 0); - if (irq < 0) { - err = irq; - goto dma_release; - } + if (irq < 0) + return irq; + err = devm_request_irq(&pdev->dev, irq, atmel_qspi_interrupt, 0, dev_name(&pdev->dev), aq); if (err) - goto dma_release; + return err; pm_runtime_set_autosuspend_delay(&pdev->dev, 500); pm_runtime_use_autosuspend(&pdev->dev); @@ -1445,7 +1432,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) err = atmel_qspi_init(aq); if (err) - goto dma_release; + return err; err = spi_register_controller(ctrl); if (err) { @@ -1453,18 +1440,12 @@ static int atmel_qspi_probe(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - goto dma_release; + return err; } pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); return 0; - -dma_release: - if (aq->caps->has_dma) - atmel_qspi_dma_release(aq); - - return err; } static int atmel_qspi_sama7g5_suspend(struct atmel_qspi *aq) @@ -1514,9 +1495,6 @@ static void atmel_qspi_remove(struct platform_device *pdev) ret = pm_runtime_get_sync(&pdev->dev); if (ret >= 0) { - if (aq->caps->has_dma) - atmel_qspi_dma_release(aq); - if (aq->caps->has_gclk) { ret = atmel_qspi_sama7g5_suspend(aq); if (ret) From patchwork Fri Feb 7 12:47:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= X-Patchwork-Id: 13964951 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0EA5C02194 for ; Fri, 7 Feb 2025 12:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=91vGKH59fvOB6uF7f30sPCflWM08DH4/8R/h6OH+xOk=; b=qutOcmMDeOYDly MxPb3rgd+gGa9UTOYekaujeyeN6ccWEzVYF+tJ4fN1sUspDCH2KBrnqOK4vAcbuoTC4uvbcoKhpZ3 j+rimCPNEksev/b+Tutz6lQ1H1CaHcYzs1Wt+1Nq3AQprENBnUp2QKvUGjJPslM+Qwy22EIdgRAwp TgPcYQvF9ieWw9PdMSqJvJ/GvMfP4fOpW5MDE4XS0wsgaP0Xf/4nRUBS5oBed+YcI9Ykd1Ze9NbaG He6ZN2NrfD9N17m+ylgIBvg2jjVeYH61VaD+gHmD8RP5TE0othD15HlnvdHdT2a/OOXYNG+RwoLZi IoH2CHc09euNsaU3QLfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tgNqH-00000009ZnC-4AfN; Fri, 07 Feb 2025 12:52:21 +0000 Received: from fw2.prolan.hu ([193.68.50.107]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tgNmE-00000009Ytq-3AJQ for linux-arm-kernel@lists.infradead.org; Fri, 07 Feb 2025 12:48:12 +0000 Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 5F71CA1B00; Fri, 7 Feb 2025 13:48:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=91vGKH59fvOB6uF7f30s PCflWM08DH4/8R/h6OH+xOk=; b=UhJfmbjox9I7Pv8JXx0NkD5Yy3+79iEgxkUi 4etXnmKevAOaYoX2eQe3M1MYVhT/U5KVbz9ffvyyENKFiMKySEFsEcesQ3SrbwV6 kTdVWbOgJ+4FRg1KIL+3LP00DU4CYyDN9IexLk9A2KODf92IYSP5mt1mPM8Q+pAa R8UfY2+Tbjil2/ajUKMvsix2qgamkOyJ+Fn0rjPezUtK2wlqIBdeo75havH6Xf3Z UVOj5eXOHmQUUxCuBF2vTs+9JLn26T7DzcxLDdHYjXTON78lObH34D7fhyspB51J aDqUwF69SCi2mdC1a8HhE0dZteoH7mQWyYsMEsF1CxzKaDQ/iMDZg1B2i09x7c25 P+chjJcvqwJzSrC0zYOC+EHPOGF7dewFtH0qH3qsmuT45JaE0Kz2KkA0oV/+UNG5 XsZh+bKSG13SZptKjwZFTHsEetQ7xXCiwqtvS9e2RpqU9URmgDfEWnjEtg0R/fcW H30+KL6FOh4LTakhseuiNML+frmdKt2hrslmXfSzVFl5PBGsY7EEmkGkW7tUIAWF 0JpeqmcsU4Ovxi1S2HZ3+EONHcp5BrYqyQsm6uQL26g7qQuHOGT7ykhHF3LjNF+I CxlNrU1rDUuWVtoweC4ncaDnjmXgZgQbaRi87LFcyJqU9jP/mI5Yj/fiA+syMoKu 1G8m5U0= From: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= To: =?utf-8?b?Q3PDs2vDoXMsIEJlbmNl?= , "Varshini Rajendran" , Tudor Ambarus , Mark Brown , , , Subject: [PATCH for-6.14 v3 4/4] spi: atmel-quadspi: Fix unbalanced pm_runtime by using devm_ API Date: Fri, 7 Feb 2025 13:47:59 +0100 Message-ID: <20250207124802.165408-5-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207124802.165408-1-csokas.bence@prolan.hu> References: <20250207124802.165408-1-csokas.bence@prolan.hu> MIME-Version: 1.0 X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1738932488;VERSION=7984;MC=3743399358;ID=414258;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A2980D94852617560 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250207_044810_947514_916C05CB X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Dahl , Alexandre Belloni , Claudiu Beznea Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fix unbalanced PM in error path of `atmel_qspi_probe()` by using `devm_pm_runtime_*()` functions. Reported-by: Alexander Dahl Closes: https://lore.kernel.org/linux-spi/20250110-paycheck-irregular-bcddab1276c7@thorsis.com/ Fixes: 5af42209a4d2 ("spi: atmel-quadspi: Add support for sama7g5 QSPI") Signed-off-by: Bence Csókás --- drivers/spi/atmel-quadspi.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index b1fb4426c78d..f2164685d3d5 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -1426,22 +1426,18 @@ static int atmel_qspi_probe(struct platform_device *pdev) pm_runtime_set_autosuspend_delay(&pdev->dev, 500); pm_runtime_use_autosuspend(&pdev->dev); - pm_runtime_set_active(&pdev->dev); - pm_runtime_enable(&pdev->dev); - pm_runtime_get_noresume(&pdev->dev); + devm_pm_runtime_set_active(&pdev->dev); + devm_pm_runtime_enable(&pdev->dev); + devm_pm_runtime_get_noresume(&pdev->dev); err = atmel_qspi_init(aq); if (err) return err; err = spi_register_controller(ctrl); - if (err) { - pm_runtime_put_noidle(&pdev->dev); - pm_runtime_disable(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); - pm_runtime_dont_use_autosuspend(&pdev->dev); + if (err) return err; - } + pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); @@ -1511,10 +1507,6 @@ static void atmel_qspi_remove(struct platform_device *pdev) */ dev_warn(&pdev->dev, "Failed to resume device on remove\n"); } - - pm_runtime_disable(&pdev->dev); - pm_runtime_dont_use_autosuspend(&pdev->dev); - pm_runtime_put_noidle(&pdev->dev); } static int __maybe_unused atmel_qspi_suspend(struct device *dev)