linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org,
	Ian Molton <ian.molton@codethink.co.uk>,
	Chris Ball <chris@printf.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
	Linux-sh list <linux-sh@vger.kernel.org>,
	linux-kernel@vger.kernel.org,
	Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 10/12] mmc: sdhi: Fixup system PM suspend lock-up
Date: Mon, 25 Aug 2014 12:26:02 +0000	[thread overview]
Message-ID: <1408969564-6335-11-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1408969564-6335-1-git-send-email-ulf.hansson@linaro.org>

At system PM suspend, the tmio core accessed the internal registers of
the controller without first moving the device into active state. This
caused a lock-up in system PM suspend phase.

The reason for the register access were masking of IRQs. Since that is
managed via the runtime PM suspend path, let's just re-use that path
for system PM suspend.

In other words force the device into runtime PM suspend state at system
PM suspend and restore it to active state at system PM resume.

Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/mmc/host/sh_mobile_sdhi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index 4cd0f09..2dafe28 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -332,7 +332,8 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev)
 }
 
 static const struct dev_pm_ops tmio_mmc_dev_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(tmio_mmc_host_suspend, tmio_mmc_host_resume)
+	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+			pm_runtime_force_resume)
 	SET_PM_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
 			tmio_mmc_host_runtime_resume,
 			NULL)
-- 
1.9.1


  parent reply	other threads:[~2014-08-25 12:26 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-25 12:25 [PATCH 00/12] mmc: tmio: Fixup PM support Ulf Hansson
2014-08-25 12:25 ` [PATCH 01/12] mmc: tmio: Keep host active while SDIO IRQ is enabled Ulf Hansson
2014-08-25 12:25 ` [PATCH 02/12] mmc: tmio: Keep host active while serving requests Ulf Hansson
2014-08-25 12:25 ` [PATCH 03/12] mmc: tmio: Extract bus_width modifications to a separate function Ulf Hansson
2014-08-25 12:25 ` [PATCH 04/12] mmc: tmio: Restructure ->set_ios() and adapt ->probe() to it Ulf Hansson
2014-08-25 12:25 ` [PATCH 05/12] mmc: tmio: Handle clock gating from runtime PM functions Ulf Hansson
2014-08-25 12:25 ` [PATCH 06/12] mmc: tmio: Mask all IRQs when inactive Ulf Hansson
2014-08-25 12:25 ` [PATCH 07/12] mmc: tmio: Make runtime PM callbacks available for CONFIG_PM Ulf Hansson
2014-08-25 12:26 ` [PATCH 08/12] mmc: sdhi: " Ulf Hansson
2014-08-25 12:26 ` [PATCH 09/12] mmc: tmio_mmc: Enable runtime PM support Ulf Hansson
2014-08-25 12:26 ` Ulf Hansson [this message]
2014-08-26  7:43   ` [PATCH 10/12] mmc: sdhi: Fixup system PM suspend lock-up Geert Uytterhoeven
2014-08-25 12:26 ` [PATCH 11/12] mmc: tmio_mmc: " Ulf Hansson
2014-08-25 12:26 ` [PATCH 12/12] mmc: tmio: Remove library functions for system PM Ulf Hansson
2014-08-26  7:46 ` [PATCH 00/12] mmc: tmio: Fixup PM support Geert Uytterhoeven
2014-08-27 12:59   ` Ulf Hansson

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=1408969564-6335-11-git-send-email-ulf.hansson@linaro.org \
    --to=ulf.hansson@linaro.org \
    --cc=chris@printf.net \
    --cc=geert@linux-m68k.org \
    --cc=ian.molton@codethink.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).