From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: Re: [PATCH 2/2] mmc: sdhci-esdhc-imx: enable IPG clock for sdio interrupts Date: Wed, 03 Dec 2014 10:25:13 +0100 Message-ID: <1417598713.2419.1.camel@pengutronix.de> References: <1417538845-10867-1-git-send-email-stefan@agner.ch> <1417538845-10867-2-git-send-email-stefan@agner.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:56819 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750845AbaLCJZS (ORCPT ); Wed, 3 Dec 2014 04:25:18 -0500 In-Reply-To: <1417538845-10867-2-git-send-email-stefan@agner.ch> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Stefan Agner Cc: chris@printf.net, ulf.hansson@linaro.org, anton@enomsg.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, rmk+kernel@arm.linux.org.uk, shawn.guo@linaro.org, b29396@freescale.com, linux-arm-kernel@lists.infradead.org Am Dienstag, den 02.12.2014, 17:47 +0100 schrieb Stefan Agner: > Enable IPG clock for sdio interrupts while runtime PM, since this > clock is needed for register access. The need of this clock has been > verified on Vybrid, but this is probably true for i.MX53 and maybe > others. The need for bus access during runtime suspend has been > introduced with be138554a792 ("mmc: sdhci: allow sdio interrupts > while sdhci runtime suspended"). > Am I reading this wrong, or is this commit actually doing something different than what the commit message says? This does _not_ enable the IPG clock during runtime PM, in fact it is disabling it while suspending even with SDIO ints enabled, which is wrong, as no SDIO interrupts will be delivered with this clock disabled. One thing that seems to be wrong with the current code is that the state of sdhci_sdio_irq_enabled could change between a runtime suspend and resume, so to keep the clocks balanced the driver has to remember if it disabled those two clocks in the suspend path and always enable them in that case in the resume path. Regards, Lucas > Signed-off-by: Stefan Agner > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 587ee0e..b7e9ad1 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1193,10 +1193,10 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) > > ret = sdhci_runtime_suspend_host(host); > > - if (!sdhci_sdio_irq_enabled(host)) { > + if (!sdhci_sdio_irq_enabled(host)) > clk_disable_unprepare(imx_data->clk_per); > - clk_disable_unprepare(imx_data->clk_ipg); > - } > + > + clk_disable_unprepare(imx_data->clk_ipg); > clk_disable_unprepare(imx_data->clk_ahb); > > return ret; > @@ -1208,10 +1208,10 @@ static int sdhci_esdhc_runtime_resume(struct device *dev) > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct pltfm_imx_data *imx_data = pltfm_host->priv; > > - if (!sdhci_sdio_irq_enabled(host)) { > + if (!sdhci_sdio_irq_enabled(host)) > clk_prepare_enable(imx_data->clk_per); > - clk_prepare_enable(imx_data->clk_ipg); > - } > + > + clk_prepare_enable(imx_data->clk_ipg); > clk_prepare_enable(imx_data->clk_ahb); > > return sdhci_runtime_resume_host(host); -- Pengutronix e.K. | Lucas Stach | Industrial Linux Solutions | http://www.pengutronix.de/ |