Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758368AbbKSLRL (ORCPT ); Thu, 19 Nov 2015 06:17:11 -0500 Received: from mail-yk0-f171.google.com ([209.85.160.171]:36317 "EHLO mail-yk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756715AbbKSLRJ (ORCPT ); Thu, 19 Nov 2015 06:17:09 -0500 MIME-Version: 1.0 In-Reply-To: <1447148610-2770-1-git-send-email-haibo.chen@freescale.com> References: <1447148610-2770-1-git-send-email-haibo.chen@freescale.com> Date: Thu, 19 Nov 2015 12:17:08 +0100 Message-ID: Subject: Re: [PATCH 1/2] mmc: sdhci-esdhc-imx: move the setting of watermark level out of probe From: Ulf Hansson To: Haibo Chen Cc: Dong Aisheng , linux-mmc , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2725 Lines: 68 On 10 November 2015 at 10:43, Haibo Chen wrote: > Currently, we config the watermark_level register only in probe. > This will cause the mmc write operation timeout issue after system > resume back in LPSR mode. Because in LPSR mode, after system resume > back, the watermark_level register(0x44) changes to 0x08000880, which > set the write watermark level as 0, and set the read watermark level > as 128. This value is incorrect. > > This patch move the setting of watermark level register out of probe, > so after system resume back, mmc driver can set this watermark level > register back to 0x10401040. This seems all reasonable! But... > > Signed-off-by: Haibo Chen > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 1f1582f..1508949 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -584,6 +584,14 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg) > mask = 0xffff & ~(ESDHC_CTRL_BUSWIDTH_MASK | ESDHC_CTRL_D3CD); > > esdhc_clrset_le(host, mask, new_val, reg); > + > + /* > + * The imx6q/imx7d ROM code will change the default watermark > + * level setting to something insane. Change it back here. > + */ > + if (esdhc_is_usdhc(imx_data)) > + writel(0x10401040, host->ioaddr + ESDHC_WTMK_LVL); > + ... why don't keep setting the watermark in ->probe() and instead just add it at as additional task to do at system PM resume? > return; > } > esdhc_clrset_le(host, 0xff, val, reg); > @@ -1155,13 +1163,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK > | SDHCI_QUIRK_BROKEN_ADMA; > > - /* > - * The imx6q ROM code will change the default watermark level setting > - * to something insane. Change it back here. > - */ > if (esdhc_is_usdhc(imx_data)) { > - writel(0x10401040, host->ioaddr + ESDHC_WTMK_LVL); > - > host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; > host->mmc->caps |= MMC_CAP_1_8V_DDR; > > -- > 1.9.1 > Kind regards Uffe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/