Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp6452343ybh; Thu, 8 Aug 2019 00:15:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0C9uoSz9MqPxTMgv0XukXHXj+VtPrEk/2evrmByGusl8aJue8HpMmMLAIobjqYG11hdPk X-Received: by 2002:aa7:956d:: with SMTP id x13mr14048943pfq.132.1565248520593; Thu, 08 Aug 2019 00:15:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565248520; cv=none; d=google.com; s=arc-20160816; b=G1/K/xsXYEN5oQUTKIpZBJpSg1qF42XG4oi7hQFYuQKukY1BHVy+kBgrncPbefsUig 6IjXsf1A+mNZnVzZs/J+67ZPETlwIyNLFjYDjuGFBF3L7HyleYvSh1HU/MF1Wfftmxm+ 6qjZ/rTJnqYTZNOrfDid3L4ODd8O0foOVigi7nB0TxLpni8zTlo0FD2YphIKXWUwdmwv AziiUQgYjfE2BdBYwzh0VUqxf84fgnhK9tGHGsoiXqvd+J7TlqlFW+fNVsiwqYaHDViA TXpcKdRsoB45ZwsViiHqLH9wE8bB3qVL5Wuxe6KWYxiWnBYK/InseEjp/Cm4ZgugMsGO IUdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:from:references:cc:to:subject; bh=Ao2qpX1u/IuoY8aJAboZw3rA0jxnYKHNZ4kicpAdZhI=; b=JGHNmRjxXkGsM5/rJB+MZb1Gcfb4mTExZCgZ+lBmNiqs/L8LGOpt3sN/TAc1HnUYhK snStBO7/yWrFgV0UV03UHdySxBJL7V7ZvyQFH8rY6MowMJgtTGjm/fwgJlVJSMTWZ+Rg TkLZmI07izTu5QKR2osqPPfT/qTXgmfFyG1ta0LBDJeVgA1pUBpkg9stTrsvPLKFjkrF ypxhZDtoEqZnNk6XMWadAdNb7tqLAcqSebBfAMlL7Syzyf/OdYSdQquwSVLm1eEyxY5z jQzXjHML2sSADcCS0XKRsW2NQgPfNybbgBWG99Myu1OwSeVvDr0w+6jf2rbsoRKaMRrI 7XjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i188si51460643pfe.96.2019.08.08.00.15.05; Thu, 08 Aug 2019 00:15:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731314AbfHHHNF (ORCPT + 99 others); Thu, 8 Aug 2019 03:13:05 -0400 Received: from mga07.intel.com ([134.134.136.100]:21121 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731227AbfHHHNF (ORCPT ); Thu, 8 Aug 2019 03:13:05 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Aug 2019 00:13:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,360,1559545200"; d="scan'208";a="182512892" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.122]) ([10.237.72.122]) by FMSMGA003.fm.intel.com with ESMTP; 08 Aug 2019 00:13:02 -0700 Subject: Re: [PATCH V5 1/3] mmc: sdhci: Fix O2 Host data read/write DLL Lock Phase shift issue To: "Shirley Her (SC)" , "ulf.hansson@linaro.org" , "linux-mmc@vger.kernel.org" , "linux-kernel@vger.kernel.org" Cc: "Chevron Li (WH)" , "Louis Lu (TP)" , "Max Huang (SC)" , "Shaper Liu (WH)" References: <1565212148-30092-1-git-send-email-shirley.her@bayhubtech.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <881b17b2-fa2a-658e-eb90-4d837e09f18e@intel.com> Date: Thu, 8 Aug 2019 10:11:56 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <1565212148-30092-1-git-send-email-shirley.her@bayhubtech.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/08/19 12:09 AM, Shirley Her (SC) wrote: > Fix data read/write error in HS200 mode due to chip DLL lock phase shift Please change the patch subject and commit message to match what the patch actually does. > > Signed-off-by:Shirley Her > --- > change in V5: > 1. split 2 patches into 3 patches > 2. make dll_adjust_count start from 0 > 3. fix ret overwritten issue > 4. use break instead of goto > > change in V4: > 1. add a bug fix for V3 > > change in V3: > 1. add more explanation in dll_recovery and execute_tuning function > 2. move dll_adjust_count to O2_host struct > 3. fix some coding style error > 4. renaming O2_PLL_WDT_CONTROL1 TO O2_PLL_DLL_WDT_CONTROL1 > > change in V2: > 1. use usleep_range instead of udelay > 2. move dll_adjust_count to sdhci-pci-o2micro.c > > chagne in V1: > 1. add error recovery function to relock DLL with correct phase > 2. retuning HS200 after DLL locked > --- > drivers/mmc/host/sdhci-pci-o2micro.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c > index 9dc4548..b3a33d9 100644 > --- a/drivers/mmc/host/sdhci-pci-o2micro.c > +++ b/drivers/mmc/host/sdhci-pci-o2micro.c > @@ -51,7 +51,7 @@ > #define O2_SD_VENDOR_SETTING2 0x1C8 > #define O2_SD_HW_TUNING_DISABLE BIT(4) > > -#define O2_PLL_WDT_CONTROL1 0x1CC > +#define O2_PLL_DLL_WDT_CONTROL1 0x1CC > #define O2_PLL_FORCE_ACTIVE BIT(18) > #define O2_PLL_LOCK_STATUS BIT(14) > #define O2_PLL_SOFT_RESET BIT(12) > @@ -316,23 +316,23 @@ static void sdhci_o2_enable_internal_clock(struct sdhci_host *host) > u32 scratch32; > > /* PLL software reset */ > - scratch32 = sdhci_readl(host, O2_PLL_WDT_CONTROL1); > + scratch32 = sdhci_readl(host, O2_PLL_DLL_WDT_CONTROL1); > scratch32 |= O2_PLL_SOFT_RESET; > - sdhci_writel(host, scratch32, O2_PLL_WDT_CONTROL1); > + sdhci_writel(host, scratch32, O2_PLL_DLL_WDT_CONTROL1); > udelay(1); > scratch32 &= ~(O2_PLL_SOFT_RESET); > - sdhci_writel(host, scratch32, O2_PLL_WDT_CONTROL1); > + sdhci_writel(host, scratch32, O2_PLL_DLL_WDT_CONTROL1); > > /* PLL force active */ > scratch32 |= O2_PLL_FORCE_ACTIVE; > - sdhci_writel(host, scratch32, O2_PLL_WDT_CONTROL1); > + sdhci_writel(host, scratch32, O2_PLL_DLL_WDT_CONTROL1); > > /* Wait max 20 ms */ > timeout = ktime_add_ms(ktime_get(), 20); > while (1) { > bool timedout = ktime_after(ktime_get(), timeout); > > - scratch = sdhci_readw(host, O2_PLL_WDT_CONTROL1); > + scratch = sdhci_readw(host, O2_PLL_DLL_WDT_CONTROL1); > if (scratch & O2_PLL_LOCK_STATUS) > break; > if (timedout) { > @@ -350,9 +350,9 @@ static void sdhci_o2_enable_internal_clock(struct sdhci_host *host) > > out: > /* Cancel PLL force active */ > - scratch32 = sdhci_readl(host, O2_PLL_WDT_CONTROL1); > + scratch32 = sdhci_readl(host, O2_PLL_DLL_WDT_CONTROL1); > scratch32 &= ~O2_PLL_FORCE_ACTIVE; > - sdhci_writel(host, scratch32, O2_PLL_WDT_CONTROL1); > + sdhci_writel(host, scratch32, O2_PLL_DLL_WDT_CONTROL1); > } > > static int sdhci_o2_get_cd(struct mmc_host *mmc) >