From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751079AbdAWLZV (ORCPT ); Mon, 23 Jan 2017 06:25:21 -0500 Received: from dougal.metanate.com ([90.155.101.14]:55455 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750705AbdAWLZU (ORCPT ); Mon, 23 Jan 2017 06:25:20 -0500 Date: Mon, 23 Jan 2017 11:24:32 +0000 From: John Keeping To: Jaehoon Chung Cc: Romain Perier , Romain Perier , ulf.hansson@linaro.org, xzy.xu@rock-chips.com, Jaehoon Chung , Heiko =?UTF-8?B?U3TDvGJuZXI=?= , Randy Li , Shawn Lin , ayaka , linux-mmc@vger.kernel.org, Linux Kernel Mailing List , "open list:ARM/Rockchip SoC..." , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH] Revert "mmc: dw_mmc-rockchip: add runtime PM support" Message-ID: <20170123112432.08337d26.john@metanate.com> In-Reply-To: References: <1482939288-14950-1-git-send-email-ayaka@soulik.info> <7e37b8ad-39d0-3a94-f75a-2166ae2caf10@samsung.com> <7fb90b9e-75c3-0184-4f0a-d4113899b860@rock-chips.com> <04b667d9-2591-51ff-e024-047bbb6e17c3@rock-chips.com> <6ccade72-ae20-2ffa-1504-2536b9f03adf@soulik.info> <95648282-38f5-42c2-fd8b-ab603eb3a168@gmail.com> <0ccf164f-0d35-9cc3-f288-9b582db23efb@soulik.info> <20afb1da-9e45-f515-01bf-2f5365d20d61@samsung.com> <8f8c66f1-82d6-5151-ff64-ef62596aa10d@rock-chips.com> <2cdd0b6c-a099-595d-1c0b-be7933b0d4a6@collabora.com> Organization: Metanate Ltd X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Fri, 20 Jan 2017 15:08:57 +0900, Jaehoon Chung wrote: > On 01/17/2017 10:38 PM, Romain Perier wrote: > > In my case I can reproduce the issue on the rock2 and the firefly-rk3288. A workaround is to > > > > comment the line ".pm = <&pm_ops_foo>" . > > Sorry for late. I'm checking runtime PM for this. > After that, i will decide whether revert or not. I hit this problem on Rock2 when trying 4.10-rc4. The following patch fixes it for me. I'm not sure if this is safe in general or whether it should be guarded by a quirk that is enabled for RK3288. -- >8 -- Subject: [PATCH] mmc: dw_mmc: restore CIU state on resume At least on RK3288, asserting SDMMC_CTRL_RESET causes the CIU to reset and disable the clock. We need to send SDMMC_CMD_UPD_CLK after doing this in order to avoid the MMC host hanging. Signed-off-by: John Keeping --- drivers/mmc/host/dw_mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b44306b886cb..e7504dabcfb6 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3311,6 +3311,7 @@ int dw_mci_runtime_resume(struct device *dev) { int i, ret = 0; struct dw_mci *host = dev_get_drvdata(dev); + u32 sdmmc_cmd_bits = SDMMC_CMD_UPD_CLK | SDMMC_CMD_PRV_DAT_WAIT; if (host->cur_slot && (mmc_can_gpio_cd(host->cur_slot->mmc) || @@ -3357,6 +3358,9 @@ int dw_mci_runtime_resume(struct device *dev) if (slot->mmc->pm_flags & MMC_PM_KEEP_POWER) { dw_mci_set_ios(slot->mmc, &slot->mmc->ios); dw_mci_setup_bus(slot, true); + } else { + /* restore CIU */ + mci_send_cmd(slot, sdmmc_cmd_bits, 0); } } -- 2.11.0.197.gb556de5.dirty