From patchwork Mon Mar 17 09:34:42 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: 14019030 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 F1538C282EC for ; Mon, 17 Mar 2025 09:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: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:CC: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+FYeznGF05qGpks00rXyInbtPfAnR/GvyHPNTPLvUWs=; b=VwGFf2B7YAPk7BVkR5QAG800iU 3lT9e+N0zxQ5Z2z27wMwCCinznpma3Nc6kZQboDasidZ1YBcC5NKFFtvxh4O/r+r/Vyt/9M1MwLOd D7lgF2G+58naOkQjJbPi3hzTA63ndGDZn3A1sQr0wxvrAT3wKcz/36sVsqeB2xH8taka7l5E09QI+ Jay/5BEvCMf8ldPJeR0+ukx40F7QoTw7SKBpkhzx2n64Wm5TFq1K4W18grlb/YVhMp9EGqGBXL1jb ROgSr7mI4lS6YYZnzzifnTZC1uXKDyy2u+BY6c3e1RK9Lz8IGpshKMuEh5dSZ6A8sa5j/P2n4hj5D 4F59/lmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tu6v5-00000001xu7-3JAz; Mon, 17 Mar 2025 09:38:03 +0000 Received: from fw2.prolan.hu ([193.68.50.107]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tu6sE-00000001wtP-31Uu for linux-arm-kernel@lists.infradead.org; Mon, 17 Mar 2025 09:35:08 +0000 Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id E14BEA02E3; Mon, 17 Mar 2025 10:34:55 +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=+FYeznGF05qGpks00rXy InbtPfAnR/GvyHPNTPLvUWs=; b=sUUWU1vgSO1NmcKKjrDIwKrJy6vUMjnuToZG 5g89H7LbJdzisR4B+lx5Pip93dpgRY6em1zgi6kCMNLw5tN81I16g8BsG/r8xokL uDGtb7lhNBE81WdGY3qDo+cYjQU1HWVjOu965jMLJxuwUtQ+48Zo1TgnFhDuozYP oXDISf+99ycS6XFpGJ/GYKRO3Wv+PMGD7cfb5uErnX3TaVSBVE9c64fWVNMsnpnn u1ZUaDvWxS1urUhuZP9GicFezuZ2mtfgV0EO1dM61r7XMYemj5c2RVwFYLRAZI8G QwRGn/Xxyf5wbHuveCtBu9zarkceD3c1M/g8YojrXFKBdA6k2oo/isKhEQsT2NjV /p+mekwEnuDYXxUo2YYVtJa/rc7jefrPLH0DLMtwRqQudnR0+fXM9KGlTcIw+UJa Dq/B0NJqg96dnpVZGourFCQJzfU1UsPid/jHO0V/Exir1OfL8eefZzMMZd/X6HCB 8uXns+Tvc67RoCuCRT/MrUR9aWm0JrTglDiDDU1t8qxmglA3ZAxkJCsl0d+DB2qZ pJzNXxsAT3rqmfBLA8ocIl+8JBiuzjNJbYLuQjEgpvDdSlYhm7SxqkTSroL6FRvy 9UhJ6kiZeCF79WyMa4DBpCDUe69+PJtKmzSsyj8DFTObkfm4Yv4MnUDu4XblQ/uL QwECytQ= From: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= To: , , =?utf-8?b?Q3PDs2vDoXMsIEJlbmNl?= , "Varshini Rajendran" , Tudor Ambarus , Mark Brown , , CC: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Danilo Krummrich , Alexander Dahl , "Nicolas Ferre" , Alexandre Belloni , Claudiu Beznea , Pavel Machek Subject: [PATCH v5 1/2] pm: runtime: Add new devm functions Date: Mon, 17 Mar 2025 10:34:42 +0100 Message-ID: <20250317093445.361821-2-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317093445.361821-1-csokas.bence@prolan.hu> References: <20250317093445.361821-1-csokas.bence@prolan.hu> MIME-Version: 1.0 X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1742204095;VERSION=7986;MC=658418503;ID=162300;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A2980D948526D7462 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250317_023507_211707_A95080C5 X-CRM114-Status: UNSURE ( 9.97 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add `devm_pm_runtime_set_active()` and `devm_pm_runtime_get_noresume()` for simplifying common use cases in drivers. Signed-off-by: Bence Csókás --- drivers/base/power/runtime.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/pm_runtime.h | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 9589ccb0fda2..821a8b4961d4 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1568,6 +1568,24 @@ void pm_runtime_enable(struct device *dev) } EXPORT_SYMBOL_GPL(pm_runtime_enable); +static void pm_runtime_set_suspended_action(void *data) +{ + pm_runtime_set_suspended(data); +} + +/** + * devm_pm_runtime_set_active - devres-enabled version of pm_runtime_set_active. + * + * @dev: Device to handle. + */ +int devm_pm_runtime_set_active(struct device *dev) +{ + pm_runtime_set_active(dev); + + return devm_add_action_or_reset(dev, pm_runtime_set_suspended_action, dev); +} +EXPORT_SYMBOL_GPL(devm_pm_runtime_set_active); + static void pm_runtime_disable_action(void *data) { pm_runtime_dont_use_autosuspend(data); @@ -1590,6 +1608,24 @@ int devm_pm_runtime_enable(struct device *dev) } EXPORT_SYMBOL_GPL(devm_pm_runtime_enable); +static void pm_runtime_put_noidle_action(void *data) +{ + pm_runtime_put_noidle(data); +} + +/** + * devm_pm_runtime_get_noresume - devres-enabled version of pm_runtime_get_noresume. + * + * @dev: Device to handle. + */ +int devm_pm_runtime_get_noresume(struct device *dev) +{ + pm_runtime_get_noresume(dev); + + return devm_add_action_or_reset(dev, pm_runtime_put_noidle_action, dev); +} +EXPORT_SYMBOL_GPL(devm_pm_runtime_get_noresume); + /** * pm_runtime_forbid - Block runtime PM of a device. * @dev: Device to handle. diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 7fb5a459847e..364355da349a 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -96,7 +96,9 @@ extern void pm_runtime_new_link(struct device *dev); extern void pm_runtime_drop_link(struct device_link *link); extern void pm_runtime_release_supplier(struct device_link *link); +int devm_pm_runtime_set_active(struct device *dev); extern int devm_pm_runtime_enable(struct device *dev); +int devm_pm_runtime_get_noresume(struct device *dev); /** * pm_suspend_ignore_children - Set runtime PM behavior regarding children. @@ -294,7 +296,9 @@ static inline bool pm_runtime_blocked(struct device *dev) { return true; } static inline void pm_runtime_allow(struct device *dev) {} static inline void pm_runtime_forbid(struct device *dev) {} +static inline int devm_pm_runtime_set_active(struct device *dev) { return 0; } static inline int devm_pm_runtime_enable(struct device *dev) { return 0; } +static inline int devm_pm_runtime_get_noresume(struct device *dev) { return 0; } static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {} static inline void pm_runtime_get_noresume(struct device *dev) {} From patchwork Mon Mar 17 09:34:43 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: 14019032 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 983E5C282EC for ; Mon, 17 Mar 2025 09:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: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:CC: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kNhLXI+/riZgGlyun993ceq6nIOh5kKXKpw5hxNT8to=; b=agNETb6lCyPyCs9HrBY4YwspAa 3moH9NL3tHdjg/M53uwMU87k8EwrTL2CMJQNVE4bo/26BD/VyV5Jik4Mw6uroXJYpJ1fpdtCUGGw2 YcuGnOfWOssIvxUzsdsg8jGBpn3eUuSr3rD5e7xeTyHTgkaCKLoVNG/w7h0LpKqWcWYuIDB5V29Dp kv/312qVJwzju5OS4mbJwipue2yx0PmjNWUfTcJa8NPiFGv1S/b61SErNud/KoliP0nd4nhG2UsQo UPLZo5oDi2fUFGjP6apnOWtpGA48YLcB2QnrLqdfILiU49ebOCZv0fvQReXes8OAnvO07I/6nUPOW SzKEJEBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tu6yP-00000001yVL-0z1t; Mon, 17 Mar 2025 09:41:29 +0000 Received: from fw2.prolan.hu ([193.68.50.107]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tu6sE-00000001wtZ-2yPn for linux-arm-kernel@lists.infradead.org; Mon, 17 Mar 2025 09:35:09 +0000 Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 9F7E4A03CE; Mon, 17 Mar 2025 10:34:56 +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=kNhLXI+/riZgGlyun993 ceq6nIOh5kKXKpw5hxNT8to=; b=tFKrITnzbpzNEXu4W5eCBaP/V0hPvuMOE7P4 RX5s6EqoZIcDfyJovFkfu1oO/Njvf3KkERfUJIxglIB+RMmiiSqNl3GUP/LIWZFV aeLNCdwF0mti8rwQG/P3K50tG4QLg7UJh2jWSw3a0BUCeU0LFyYGaxiTdqlE55aE f3aYazNQg81NyYhNMKcRsgeuYg6cUxns3uDgKm2uRSt4DiQbDVpKNOCG4Vw0eoib AWW5fus1jdLQ3byAvTSx/MZcq9vNn8L/v90h1PSkTKlcsr+wTyChhSuo7A5rh+Hj 1L16fZanqMlO7YgCCiWQkaGZBR2QeqVudXuDdK9PQeo90+DwlJj6NfhBXSs6B6te RLX3xU/XMbNYbgZ8g+TG5kUwW6JGuc5GYnHWhjfeY6WiOUt2/2TVkkZFXmdLltwS 5Yh/8+gt2Ky2sGujcyd8XQac7rOiuJsrduXlSkzW/DwebIKqMfdooDszIj5LDebb XXQB6TSjV2sfql8dqYXpFSLTRHJXRlHDTZruJifEcONPe/pqjeeti5GkqLUxtxCL oTg48RqS96mXvGRuCnXXn+UAZQXMDF0OM02kC7kQ/JY3kxvqYtH69ha+2BJM/a3+ srVxDPvCo9JiMtF6Jwyze6Pqjdpl4mUTzb56IQ8ReJgOmmCvRctMlw6xkJzTTdAm hEO0aVs= From: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= To: , , =?utf-8?b?Q3PDs2vDoXMsIEJlbmNl?= , "Varshini Rajendran" , Tudor Ambarus , Mark Brown , , CC: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , Danilo Krummrich , Alexander Dahl , "Nicolas Ferre" , Alexandre Belloni , Claudiu Beznea Subject: [PATCH v5 2/2] spi: atmel-quadspi: Fix unbalanced pm_runtime by using devm_ API Date: Mon, 17 Mar 2025 10:34:43 +0100 Message-ID: <20250317093445.361821-3-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317093445.361821-1-csokas.bence@prolan.hu> References: <20250317093445.361821-1-csokas.bence@prolan.hu> MIME-Version: 1.0 X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1742204096;VERSION=7986;MC=3178520588;ID=162301;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A2980D948526D7462 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250317_023507_212895_41FB0631 X-CRM114-Status: GOOD ( 10.13 ) 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: , 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 d8c9be64d006..ddd12600a6f1 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -1439,22 +1439,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) goto dma_release; 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) goto dma_release; - } + pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); @@ -1533,10 +1529,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)