Message ID | 1491887431-31894-5-git-send-email-yangbo.lu@nxp.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show
Return-Path: <linux-mmc-owner@kernel.org> 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 31B8160381 for <patchwork-linux-mmc@patchwork.kernel.org>; Tue, 11 Apr 2017 05:25:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22D8E28450 for <patchwork-linux-mmc@patchwork.kernel.org>; Tue, 11 Apr 2017 05:25:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17C43284D9; Tue, 11 Apr 2017 05:25:26 +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 C9A76284D1 for <patchwork-linux-mmc@patchwork.kernel.org>; Tue, 11 Apr 2017 05:25:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753440AbdDKFZX (ORCPT <rfc822;patchwork-linux-mmc@patchwork.kernel.org>); Tue, 11 Apr 2017 01:25:23 -0400 Received: from mail-dm3nam03on0073.outbound.protection.outlook.com ([104.47.41.73]:64128 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753445AbdDKFZV (ORCPT <rfc822;linux-mmc@vger.kernel.org>); Tue, 11 Apr 2017 01:25:21 -0400 Received: from CY4PR03CA0023.namprd03.prod.outlook.com (10.168.162.33) by DM2PR0301MB1293.namprd03.prod.outlook.com (10.160.222.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 11 Apr 2017 05:25:20 +0000 Received: from BN1AFFO11FD033.protection.gbl (2a01:111:f400:7c10::162) by CY4PR03CA0023.outlook.office365.com (2603:10b6:903:33::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Tue, 11 Apr 2017 05:25:19 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD033.mail.protection.outlook.com (10.58.52.246) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Tue, 11 Apr 2017 05:25:19 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v3B5P7pB017167; Mon, 10 Apr 2017 22:25:17 -0700 From: Yangbo Lu <yangbo.lu@nxp.com> To: <linux-mmc@vger.kernel.org>, <ulf.hansson@linaro.org>, Adrian Hunter <adrian.hunter@intel.com> CC: Xiaobo Xie <xiaobo.xie@nxp.com>, Yangbo Lu <yangbo.lu@nxp.com> Subject: [v4, 4/5] mmc: sdhci: Control the delay between tuning commands Date: Tue, 11 Apr 2017 13:10:30 +0800 Message-ID: <1491887431-31894-5-git-send-email-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1491887431-31894-1-git-send-email-yangbo.lu@nxp.com> References: <1491887431-31894-1-git-send-email-yangbo.lu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131363619194838315; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39840400002)(39450400003)(39380400002)(39860400002)(39410400002)(39850400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(105606002)(106466001)(50986999)(47776003)(76176999)(2950100002)(6666003)(5003940100001)(36756003)(2906002)(189998001)(48376002)(54906002)(77096006)(53936002)(50466002)(104016004)(8656002)(4326008)(38730400002)(33646002)(50226002)(86362001)(81166006)(575784001)(85426001)(356003)(8936002)(8676002)(5660300001)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB1293; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD033; 1:gl6U0ZSFOcRqBZla5T1Vr0z97wj4aAG2+jQXBUn3JDdpYJlS2vt/fvoBspxMAsdheKNs12YeuURoP53JsTmtgvX2Q8Bkn1b4LOmXN+L7q6b74az4lBnevAQ7VhdNEeyFlSqzi9slmg7d+PWBThSNBjKkwjV2L6asmk4h6j9mGgVi0f7D0KNFa0blKhtKWaVXG8M/OXjg8ruXf5pIYMuJ0FuGxfJXVQLoUxcVtkeH/ESXNDtLy85azHuDWM+dgpq0t21xjhpt0NtJb6hMTA94pe8QshTuEGRUbNcG8aWbCzifWM7dJr5A3q0dBtfUGJOs787vib6xsfiNwo9tyPKoZsa1NhE4NNXfQ8lNq2HSOlMOQRNbqz5Z+W408adSzhXN9O0mXxbw7n0EP+guwn20HRDgQ8k6KRlicLyF04f8110TUBHFRBjXeCgITos3FK/GGrvyXtEAyW7SZd4whTsPpI7rckEo+R1eM7IYt2iuNRGEbEAZrw2C3z70NoDW80+XoW/E9JO7RQHwThH7jSsforDzlrFitRyl2qsrMknxwv4UpHVpLWSMzLNLmAcZU5xfu+0NyWrqIcBxLbFPzhTo4MkorHozb2NgsFWXMp2dI8WUqpv9LxVkeSuozbFDBs75yLJVojXF4j1Ik8F1/uGP+h5bkKbrGCwv9qM/kxvhb5h9sIp7WEZB7rL0goU+U7cJH13S4je6moxqLJSur7BnGFAnByv4TNJfeRK8FWaGze7QKCkjsxUftzce9sx6PdfFfTxBCtLc0PtjdM2ZJiJ0VQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: b6933835-f4c2-4844-3bcb-08d4809b24f9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:DM2PR0301MB1293; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1293; 3:VgMPrft2rLf5/Wi6scfGXB5ov374Fh/9pfPoO3qfYMdztMVzWF7orRGWgtNDNnYC1qwD6kaZ5rmvspYkRA0tla6WMadNGANXrm1byVE+COcmIM6UsF9beK0PFjwoGHm5O2m0D9jyxj8IvbSM5EwJZ2BMyDetQJUXS6xslnK7JDeMLuWxaD0iK8a0szHwyGl4uo9GYRJzfaYIdmgexZdb76kWbKd998VdAd4+vQ2TkvhSRtfi+YX6Vbfa1RfKyfj7wmzU4tCTUJ+NzOpOXM2+ifRZUhlCfXYWm/Ogl1bymLwzT7oWZHTKUEBLNwhu2Q0ZmUdhWcf2zJA9qqnEJPnyajoz1OXi7hmMyOlG3yEl2dj/FG/WdjqW+5R/PCpE77KkYug5eOkKQomK3glm8iQA6YkQJNnnahOoT6xjkn/gKor29kLtj5dA4+mjdVQC3vhb; 25:5TUan20XPpxenkQGGZnQDf1bd5xktD5mFRfRc5PAG/WqPaImSyPGx5mkZYBXRlZrRIo5U6dR/WoOjKLd6yY/p/mvVuc0ezBfVuz6AlOUhx5J2J3Ww/rXeyt5ni0bqeMay1cYAqOIA/nWdRxLYZDFD5OWbG8ior5BhINNezBdmspki9pABZIrXtF0FFRtwkNXuLU4t9zZArbdsoPsvDGkUYRRvkdnxivLTuhRpxLaRAARryLf4blJDtRpRoZv1RtYwNd6BBA/ubKm2Y2wby0bpiJJz0T5vxWxhcybaBpYxl6bM6wQe/vewPACT9ErmLL58RC8Hy3EL6rbOrlq9RJlQMmDQDWqDmhU6Ovgv5Jwrosw/3sxpZuz3JLP77+7ppohZvAyssVjSMoJIwGZNSzWOufYG5/V8elWnHe4kw4HKBSslKnS4nN8+yB9dESB9Cl8bVRzwkXaM5lDV0+3wc1nUg== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1293; 31:rO9futMPa+Ba2CxHE6Qtk9n+uQ7azINbVU5aCpcBGTh7v6KEJUUAF6OofDqacRX8oIoqtcOmDph98nQEax2S+RFayZV7nctJDjMDqFSvNXZxptLowxCf86XgZCpbBbbXL+iUevew7ff47vOa0VD7Bu59eVS0e4RUPBWptVLnAOXJXSDAPYTjkdMcUY5AhaUqi0nj3xryrUfoDKev611BjR9c229S0dF89/mb2N/3j6x0c0685T+H2KAJPg9rpvPZuOQ6rwk8T1gN5f2gIBJ6lJlc+yTPe8Cw/eyrC6PI18s= X-Microsoft-Antispam-PRVS: <DM2PR0301MB12933606CC755D6927788F5FF8000@DM2PR0301MB1293.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13017025)(13018025)(13024025)(13023025)(8121501046)(13015025)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259075)(20161123556025)(20161123561025)(20161123565025)(20161123563025); SRVR:DM2PR0301MB1293; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB1293; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1293; 4:DYcEhS/FQFyqS2wkfT7XgxFnandpYIml1SlpuDpi?= =?us-ascii?Q?DZf0FYjFQDyH2DVwMfe7rLKZN0tOBlt3wad/GTKBTjc/V2iO/V52t/vVNB5c?= =?us-ascii?Q?4yMT+5ux89UMKQNEyO09H5Vi/+EHQlnCqHhILMrzNbzjE2VeuDZLqjrbq/8l?= =?us-ascii?Q?lJlo1Fw4dFGrvaIkxFTomKedQQDJCO6RkMzLHQv32KfhCs7uyuxcfJJxBU5V?= =?us-ascii?Q?BuGg1wJZPO9QmIllWOfAa6URLDnbYaI6mAQhg4kvbZTa1/4tzjf13/al0Y8M?= =?us-ascii?Q?TOffFFExFfi4nIMdHfvX6bCfOrgq824a5E/cL3XD/EpMsuoDZCGDgJ0deg/C?= =?us-ascii?Q?tmUBDM01n92QJHxtzIXlBog8CMHVUZrLba79sLVxys+1VyPqmbiZyMp2LLZT?= =?us-ascii?Q?Sm4xnqeutpYDxnLScC15YC93mIqDyPYqDSw80L+K6wh83QPrISBpiwGAFyJp?= =?us-ascii?Q?UkL8sUWDZz1K+xXLMVw7gku8hrGmoUt8SnDrNNk9vnPL3NqzlryqJv8GvMKB?= =?us-ascii?Q?c2z3Vh8EQaVUIv4jb1s2IfyAtGb9ixsRMScSD6Zn4cnqnlpGoMWU+9RFKEmH?= =?us-ascii?Q?8Gir/gldKNz2+3PbrUeo2TXCvzOEJz7xLKogNYcNA7UVRoxhz7K6xS9MRzlt?= =?us-ascii?Q?HGtK2i22c6ljQEhaoDrnYvnJtJu3LpvJddB9oCLC8vKBUlKuOkSqTLH6xfBc?= =?us-ascii?Q?a2et+StBm2NMr+cGsJmY4upVp+mPFyJ41qOPhCmtcdiNJLebebgtaJ4lceZJ?= =?us-ascii?Q?OHgwDtox2leU6gdt5rjSpuO7GD4vdKpMFbsbAAaadv9+lDc6C9ERp1m5L443?= =?us-ascii?Q?GZEio/vc8C57puGGid/Wvhc+Ghu40YIqEHSp7DkWEvQIcTBVgJ2vm5RTYzbW?= =?us-ascii?Q?uZIiw1s87DrV7EWvk1GrDCPoQYdBE0TO50FeXIq5ulHESe0g4aORvgdP2FT4?= =?us-ascii?Q?DwKr1aBPJA6H/Y2IkZpAya0jXIU02EKxm0RGA5J6VA=3D=3D?= X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1293; 23:jYeOub63p9CwWVtlrL6PstxxxOS3do1aiWjW4RF?= =?us-ascii?Q?RQ7pr5Kdzb+jo2gMYLSfImSnU3z5S3ZxWUbhSLfH/8t+FU+qf4oNiuts9hr8?= =?us-ascii?Q?+MRYeQ2xAHF2Q38jUVy/TT7DcS147yG6PTsdGhojmGYJoNiJFweM+C47cvPR?= =?us-ascii?Q?nBITYuyyF/wKE3icl98/J5GArDWxCiu7h5D/7De8sf5aTHJmCvPB5ulYbt8F?= =?us-ascii?Q?gtbkPCQuxpwUWfYIreTGuiQtIvUCmrYWM4RQJ3RiQPBhKxErtunnA5enT5eD?= =?us-ascii?Q?5if+AaNwmlT3WTnnoPJgKMYeqS4A6W+s0ZAMNA0sdDaxfKVpWuFK76VdUtJW?= =?us-ascii?Q?XrrQTcthwMqLvRBmxcAHpw7NY5hx/9RgOeS/EmlsyDLciGLzTQNlvEMZeSgq?= =?us-ascii?Q?DlxakHqnElKPjnCth0+A9PiZhZc/t5E3cHmZOODMLvfVo5Esw0jJXeBZI5WZ?= =?us-ascii?Q?zLEoqSMUQJorej0eKcgRFnf+KVqf7dUywfJrSvY+sTGSRJ0x3qNFJ/D4IIde?= =?us-ascii?Q?dXmlXQxbLHtrBOJOrjURupIWOMjYNbk9ffqQYrQ1lT+aGKxUK8/2Q3F2GOxd?= =?us-ascii?Q?JMj3d3jjYepvMDOZycmw1X5YJYWVPq7onErZv3gH/C71Q5dOYRHgVkKNORSL?= =?us-ascii?Q?tFOPoHq4f5aUl7I/WZM5ptamtn3AZmsfMsIjSY3bKPjW8Fiv5Yh5mw328RMu?= =?us-ascii?Q?a3axV8zwfp8S9RfNgl8Cb4TnNIBvJdeEeTHaqGnwS7SguRdpKPnorNtVBTx/?= =?us-ascii?Q?oHk4bTXlN9yyQymioSt/WTWRDyRWxUdj+2Bs5lGJ+kTOF26BH5cpYbDCOllu?= =?us-ascii?Q?aWAu2qrlsteAc9TNpinzL4LqfilNfqB5XDwwyiIXGlASQqEh+bPMDEMDjfTh?= =?us-ascii?Q?dsoCJCkPjmXx8PT2HxIWUEmOkfy8eu4o+sRC14FAcgOJ4JzWz3WpX3RzzUEv?= =?us-ascii?Q?Cu1/0Cyr+FzOC0cHl3lqtlrScwb3gJgMy/WbEhZ2xapCnUGWoOd0gKESap+w?= =?us-ascii?Q?AB8OW2KG1v1iV4QmnNMRxFEpD6yRCRH0h4ZDOpLAte6fhT3GcERYIkr6mkD7?= =?us-ascii?Q?UL53SG4onmQbYvF6f6sjm8WMlcS2OP4zx5h6F8jdVnSiCY05A5Vi8zID2GVS?= =?us-ascii?Q?LvKkmiXwCk4Yb2yEn33/VirG+i9Meb/1XoN65iNa4DsLd8LT0levizHrk18i?= =?us-ascii?Q?6jyqfNfTK/00Mp60=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1293; 6:fbRXon74Sc1rnsJO3LfuKEsKuTSgcvnIZfTkK1IhKPpUHm89nl9rrg0d3NG2xFcvvqRUkDK7dvM1mt+LHFvYHpuxmomJH39xHsxNH+MtFrUhA3mwjiO9rKKR7/cDX7WZyYtSImqZgr/mWLhoxl8O1oS6tVRZP9IvZH7IlHGFkeDUpBulsV0iIvRh9/oZqorb/OKT9pknPETqmo36VfqZbo7gkhgkHfUvykveCCO5oJ2dxtKginbe4UdUqJ4eimvjsnrN1ruNZsx7Uul/Tg3LPGve3FQ9YTFOLInMz0qViABfw9rEsRN+jhdCLepfjfquZ1K6Ojqxoa42KdaYmI70VxIPvekpQN5nUnSi/pXN8izptGExppYnpIsv/LatFHgf09b3PZYXtQ2yjF0f02PvJocGGi8uOtvtNeISSAZRI3ecB0Hh/MA62uPtbX6+nf+4YBNynR3yJkGk2shff6RYzg==; 5:Ue2WLYzXH02n8B1QjiQWRIRbF7kSHay7kLiPUjGW698AzY98PYNITdT4egqPtHepKnW6yhBp6T/isXKzFFlUlGTWu3oPxO4+agnCzR/XRb2eTtzsUdBgpJfrDOovggHeLhGe9D3/jM6/y15EwBsA7EAVzrdzqMi7VdKeu4V4wcgGoPZkWNmw64x8yAqL+QSR; 24:bSIn4i5CvXp7AQlOdxxtvbY9oI4YBhXpgMkv3MF3L9TcvlOWRmG2E3dajgtPzNzWc00+Vk6uuJLrK0AOrKeTHeElTaweIvrkFLNcGK665i4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1293; 7:bxhpTTzbawI3dxgj0KamiWXQEanHsy2NVmkmk7LvsP2HTVqO62RAFf3hW0qBNDPrN0JRhUw4iw/HTstvMKEpLkYoMHEWlGNWk54/JkHQB0rNOaXNYmZ2hr969r69Uf58p3PKtkNanX7dV8zd611bBanlul/zaFg9WBECyxLGFVzq3I5cgY6un5VZPtPs7MbTdRimj+ZnezihACvns9u0CB59GANTY4sLCuel4I340FtPuevgfu149FJIE7Un6/4usszALlF03ZpmvOZdI9xbCA6SmMXM0bXLtlybc2jgVeang9VRxDaS6OpAuQZTMgDbMMYXp34TFTtVy1QRuslbZg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 05:25:19.2810 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1293 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-mmc.vger.kernel.org> X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4bdad89..ecd0d43 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2108,9 +2108,9 @@ static void __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode) break; } - /* eMMC spec does not require a delay between tuning cycles */ - if (opcode == MMC_SEND_TUNING_BLOCK) - mdelay(1); + /* Spec does not require a delay between tuning cycles */ + if (host->tuning_delay > 0) + mdelay(host->tuning_delay); } pr_info("%s: Tuning failed, falling back to fixed sampling clock\n", @@ -2172,6 +2172,9 @@ int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) host->mmc->retune_period = tuning_count; + if (host->tuning_delay < 0) + host->tuning_delay = opcode == MMC_SEND_TUNING_BLOCK; + sdhci_start_tuning(host); __sdhci_execute_tuning(host, opcode); @@ -3114,6 +3117,8 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->cqe_ier = SDHCI_CQE_INT_MASK; host->cqe_err_ier = SDHCI_CQE_INT_ERR_MASK; + host->tuning_delay = -1; + return host; } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 78437f8..0469fa1 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -538,6 +538,8 @@ struct sdhci_host { #define SDHCI_TUNING_MODE_1 0 #define SDHCI_TUNING_MODE_2 1 #define SDHCI_TUNING_MODE_3 2 + /* Delay (ms) between tuning commands */ + int tuning_delay; unsigned long private[0] ____cacheline_aligned; };