From patchwork Tue Jan 3 06:59:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 9494511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD83260413 for ; Tue, 3 Jan 2017 06:59:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFBC320246 for ; Tue, 3 Jan 2017 06:59:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2F7626861; Tue, 3 Jan 2017 06:59:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D8BA20246 for ; Tue, 3 Jan 2017 06:59:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757171AbdACG7p (ORCPT ); Tue, 3 Jan 2017 01:59:45 -0500 Received: from lucky1.263xmail.com ([211.157.147.131]:55183 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757161AbdACG7p (ORCPT ); Tue, 3 Jan 2017 01:59:45 -0500 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.139]) by lucky1.263xmail.com (Postfix) with ESMTP id 9A1FA8F686; Tue, 3 Jan 2017 14:59:34 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from [172.16.12.182] (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 95D3C7AD; Tue, 3 Jan 2017 14:59:34 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: linux-rockchip@lists.infradead.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: <0621800f0b97e8e4fee20cd79952ab45> X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from [172.16.12.182] (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 157222YOKAH; Tue, 03 Jan 2017 14:59:35 +0800 (CST) Subject: Re: [PATCH] mmc: dw_mmc: update clock after ctrl reset in runtime resume To: Ziyuan Xu , ulf.hansson@linaro.org, jh80.chung@samsung.com References: <1483425987-21805-1-git-send-email-xzy.xu@rock-chips.com> Cc: shawn.lin@rock-chips.com, linux-mmc@vger.kernel.org, randy.li@rock-chips.com, linux-rockchip@lists.infradead.org From: Shawn Lin Message-ID: <5e789711-b5de-5564-4538-a89d9ed9ca05@rock-chips.com> Date: Tue, 3 Jan 2017 14:59:03 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <1483425987-21805-1-git-send-email-xzy.xu@rock-chips.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Ziyuan, On 2017/1/3 14:46, Ziyuan Xu wrote: > Immediately after reset, issue the command which sets > update_clock_register_only bit, the card clock will restart. > > MMC_PM_KEEP_POWER is disabled for SD card and eMMC slots, so that they > have no chance to invoke dw_mci_setup_bus for update clock behaviour. > Let's consummate it. > > Fixes: e9ed883 ("mmc: dw_mmc: add runtime PM callback") > Reported-by: Randy Li > Signed-off-by: Ziyuan Xu > --- > drivers/mmc/host/dw_mmc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index b44306b..71715b4 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -3357,6 +3357,8 @@ 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 { > + mci_send_cmd(slot, SDMMC_CMD_UPD_CLK, 0); > } > } Thanks for sending this, but I think the better fix we talked about offlist may be... otherwise there still some unhandled cases once the reset is failure. > > --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3324,7 +3324,7 @@ int dw_mci_runtime_resume(struct device *dev) if (ret) goto err; - if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) { + if (!dw_mci_reset(host)) { clk_disable_unprepare(host->ciu_clk); ret = -ENODEV; goto err;