From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64F01FBE8 for ; Thu, 1 Jun 2023 13:28:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5831C433EF; Thu, 1 Jun 2023 13:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1685626103; bh=uJ8L7AO4wzVHur2033HwHSDDb6sceRbhHHm6R832R2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O5dhTmtHhhyMF7sCtN4B+eh6h9aKf0uSKqnGRnM/XoQ/z9s/icFCAorLTrFHFSD2j a2avTrZEkK4Is5h+dnNBv6HXmChKP4Ir7YjEUN8yTh8Hj4dec0GWrEbQ+P6nEEJ/iW kQZ1r37XuRsQ6CTmMeTur0v3BGE8/BMrkyIBgZ+M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Claudiu Beznea , Vinod Koul , Sasha Levin Subject: [PATCH 6.1 31/42] dmaengine: at_xdmac: disable/enable clock directly on suspend/resume Date: Thu, 1 Jun 2023 14:21:40 +0100 Message-Id: <20230601131940.438303233@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230601131939.051934720@linuxfoundation.org> References: <20230601131939.051934720@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Claudiu Beznea [ Upstream commit 2de5ddb5e68c94b781b3789bca1ce52000d7d0e0 ] Runtime PM APIs for at_xdmac just plays with clk_enable()/clk_disable() letting aside the clk_prepare()/clk_unprepare() that needs to be executed as the clock is also prepared on probe. Thus instead of using runtime PM force suspend/resume APIs use clk_disable_unprepare() + pm_runtime_put_noidle() on suspend and clk_prepare_enable() + pm_runtime_get_noresume() on resume. This approach as been chosen instead of using runtime PM force suspend/resume with clk_unprepare()/clk_prepare() as it looks simpler and the final code is better. While at it added the missing pm_runtime_mark_last_busy() on suspend before decrementing the reference counter. Fixes: 650b0e990cbd ("dmaengine: at_xdmac: add runtime pm support") Signed-off-by: Claudiu Beznea Link: https://lore.kernel.org/r/20230214151827.1050280-2-claudiu.beznea@microchip.com Signed-off-by: Vinod Koul Stable-dep-of: 44fe8440bda5 ("dmaengine: at_xdmac: do not resume channels paused by consumers") Signed-off-by: Sasha Levin --- drivers/dma/at_xdmac.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index bfc8ae2143957..7f7557e4c31d7 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -1993,6 +1993,7 @@ static int __maybe_unused atmel_xdmac_suspend(struct device *dev) at_xdmac_off(atxdmac); clk_disable_unprepare(atxdmac->clk); + return 0; } @@ -2009,6 +2010,8 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev) if (ret) return ret; + pm_runtime_get_noresume(atxdmac->dev); + at_xdmac_axi_config(pdev); /* Clear pending interrupts. */ -- 2.39.2