From: jh80.chung@samsung•com (Jaehoon Chung)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/6] mmc: sdhci-s3c: Fix local I/O clock gating
Date: Mon, 14 Jul 2014 17:05:29 +0900 [thread overview]
Message-ID: <53C38F49.7050504@samsung.com> (raw)
In-Reply-To: <1403618235-19353-2-git-send-email-t.figa@samsung.com>
Looks good to me.
Acked-by: Jaehoon Chung <jh80.chung@samsung•com>
On 06/24/2014 10:57 PM, Tomasz Figa wrote:
> For internal card detection mechanism it is required that the local I/O
> clock is always running. However while current implementation accounts
> for this, it does so incorrectly leading to race conditions and warnings
> about unbalanced clock disables.
>
> This patch fixes it by inverting the logic, which now increases local
> I/O clock enable count when internal card detect is used, instead of
> decreasing it otherwise.
>
> Signed-off-by: Tomasz Figa <t.figa@samsung•com>
> Cc: Ben Dooks <ben-linux@fluff•org>
> Cc: Chris Ball <chris@printf•net>
> Cc: Ulf Hansson <ulf.hansson@linaro•org>
> Cc: linux-mmc at vger.kernel.org
> ---
> drivers/mmc/host/sdhci-s3c.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index fa5954a..1795e1f 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -487,8 +487,13 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
> goto err_pdata_io_clk;
> }
>
> - /* enable the local io clock and keep it running for the moment. */
> - clk_prepare_enable(sc->clk_io);
> + /*
> + * Keep local I/O clock enabled for internal card detect pin
> + * or runtime PM is disabled.
> + */
> + if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL
> + || !IS_ENABLED(CONFIG_PM_RUNTIME))
> + clk_prepare_enable(sc->clk_io);
>
> for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
> char name[14];
> @@ -611,15 +616,13 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
> goto err_req_regs;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
> - if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL)
> - clk_disable_unprepare(sc->clk_io);
> -#endif
> return 0;
>
> err_req_regs:
> err_no_busclks:
> - clk_disable_unprepare(sc->clk_io);
> + if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL
> + || !IS_ENABLED(CONFIG_PM_RUNTIME))
> + clk_disable_unprepare(sc->clk_io);
>
> err_pdata_io_clk:
> sdhci_free_host(host);
>
next prev parent reply other threads:[~2014-07-14 8:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 13:57 [PATCH 0/6] Various Samsung fixes for v3.16-rc3 Tomasz Figa
2014-06-24 13:57 ` [PATCH 1/6] mmc: sdhci-s3c: Fix local I/O clock gating Tomasz Figa
2014-07-14 8:05 ` Jaehoon Chung [this message]
2014-06-24 13:57 ` [PATCH 2/6] ARM: EXYNOS: Fix core ID used by platsmp and hotplug code Tomasz Figa
2014-07-08 13:21 ` Kukjin Kim
2014-07-14 9:50 ` Tomasz Figa
2014-07-15 18:00 ` Kukjin Kim
2014-06-24 13:57 ` [PATCH 3/6] clk: samsung: exynos4: Remove SRC_MASK_ISP gates Tomasz Figa
2014-06-25 9:58 ` Daniel Drake
2014-06-25 10:10 ` Tomasz Figa
2014-06-30 13:50 ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality Tomasz Figa
2014-06-25 10:09 ` Daniel Drake
2014-06-25 11:41 ` Tomasz Figa
2014-06-25 11:43 ` [PATCH v2 " Tomasz Figa
2014-06-26 9:24 ` Daniel Drake
2014-07-14 9:52 ` Tomasz Figa
2014-07-08 13:48 ` [PATCH " Kukjin Kim
2014-07-08 13:54 ` Tomasz Figa
2014-07-15 18:02 ` Kukjin Kim
2014-07-15 23:59 ` Tomasz Figa
2014-07-21 10:30 ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 5/6] ARM: EXYNOS: Fix suspend/resume sequencies Tomasz Figa
2014-06-24 15:33 ` Abhilash Kesavan
2014-07-08 14:02 ` Kukjin Kim
2014-06-24 13:57 ` [PATCH 6/6] ARM: EXYNOS: Register cpuidle device only on Exynos4210 and 5250 Tomasz Figa
2014-07-08 14:15 ` Kukjin Kim
2014-07-08 15:45 ` Bartlomiej Zolnierkiewicz
2014-07-10 13:30 ` Kukjin Kim
2014-06-25 11:52 ` [PATCH v2 5/6] ARM: EXYNOS: Fix suspend/resume sequences Tomasz Figa
2014-07-14 9:54 ` Tomasz Figa
2014-07-15 11:19 ` Bartlomiej Zolnierkiewicz
2014-07-15 12:15 ` Tomasz Figa
2014-07-15 14:24 ` [PATCH v3] " Tomasz Figa
2014-07-15 14:26 ` Tomasz Figa
2014-07-17 14:42 ` Tomasz Figa
2014-07-21 10:23 ` Tomasz Figa
2014-07-15 17:31 ` [PATCH v2 5/6] " Chander Kashyap
2014-07-01 13:54 ` [PATCH 0/6] Various Samsung fixes for v3.16-rc3 Tomasz Figa
2014-07-07 23:25 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53C38F49.7050504@samsung.com \
--to=jh80.chung@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox