From patchwork Wed Aug 27 07:26:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 4786541 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F3389F37E for ; Wed, 27 Aug 2014 07:45:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 628732015E for ; Wed, 27 Aug 2014 07:45:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 724102012D for ; Wed, 27 Aug 2014 07:45:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753554AbaH0Hps (ORCPT ); Wed, 27 Aug 2014 03:45:48 -0400 Received: from mail-bn1blp0187.outbound.protection.outlook.com ([207.46.163.187]:22937 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751187AbaH0Hpr (ORCPT ); Wed, 27 Aug 2014 03:45:47 -0400 Received: from BN3PR0301CA0059.namprd03.prod.outlook.com (25.160.152.155) by BL2PR03MB324.namprd03.prod.outlook.com (10.141.68.27) with Microsoft SMTP Server (TLS) id 15.0.1015.9; Wed, 27 Aug 2014 07:45:45 +0000 Received: from BN1BFFO11FD017.protection.gbl (2a01:111:f400:7c10::1:180) by BN3PR0301CA0059.outlook.office365.com (2a01:111:e400:401e::27) with Microsoft SMTP Server (TLS) id 15.0.1015.19 via Frontend Transport; Wed, 27 Aug 2014 07:45:45 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD017.mail.protection.outlook.com (10.58.144.80) with Microsoft SMTP Server (TLS) id 15.0.1010.11 via Frontend Transport; Wed, 27 Aug 2014 07:45:44 +0000 Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s7R7jZGt024520; Wed, 27 Aug 2014 00:45:42 -0700 From: Dong Aisheng To: CC: , , , , Subject: [PATCH V3 1/6] mmc: sdhci: add platfrom get_max_timeout_count hook Date: Wed, 27 Aug 2014 15:26:27 +0800 Message-ID: <1409124392-28899-2-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1409124392-28899-1-git-send-email-b29396@freescale.com> References: <1409124392-28899-1-git-send-email-b29396@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199003)(189002)(33646002)(81342001)(77156001)(20776003)(74662001)(64706001)(110136001)(99396002)(104016003)(80022001)(50986999)(31966008)(76176999)(74502001)(62966002)(44976005)(6806004)(83322001)(77982001)(97736001)(68736004)(21056001)(19580395003)(19580405001)(79102001)(81542001)(46102001)(50226001)(50466002)(4396001)(76482001)(48376002)(85852003)(36756003)(95666004)(92566001)(92726001)(2351001)(107046002)(89996001)(229853001)(83072002)(105606002)(106466001)(26826002)(85306004)(93916002)(102836001)(84676001)(47776003)(87936001)(90102001)(87286001)(104166001)(88136002)(42262002); DIR:OUT; SFP:; SCL:1; SRVR:BL2PR03MB324; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 0316567485 Received-SPF: Fail (protection.outlook.com: domain of freescale.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; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Aisheng.Dong@freescale.com; X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the max timeout count is hardcode to 1 << 27 for calcuate the max_busy_timeout, however, for some platforms the max timeout count may not be 1 << 27, e.g. i.MX uSDHC is 1 << 28. Thus 1 << 27 is not correct for such platform. It is also possible that other platforms may have different values. To be flexible, we add a get_max_timeout_count hook to get the correct maximum timeout value for these platforms. Reviewed-by: Shawn Guo Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci.c | 11 ++++++++--- drivers/mmc/host/sdhci.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4cc2ff9..d633f288 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1196,8 +1196,11 @@ clock_set: host->mmc->actual_clock = (host->max_clk * clk_mul) / real_div; if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) { host->timeout_clk = host->mmc->actual_clock / 1000; - host->mmc->max_busy_timeout = - (1 << 27) / host->timeout_clk; + mmc->max_busy_timeout = + host->ops->get_max_timeout_count ? + host->ops->get_max_timeout_count(host) : + 1 << 27; + mmc->max_busy_timeout /= host->timeout_clk; } } @@ -2937,7 +2940,9 @@ int sdhci_add_host(struct sdhci_host *host) if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) host->timeout_clk = mmc->f_max / 1000; - mmc->max_busy_timeout = (1 << 27) / host->timeout_clk; + mmc->max_busy_timeout = host->ops->get_max_timeout_count ? + host->ops->get_max_timeout_count(host) : 1 << 27; + mmc->max_busy_timeout /= host->timeout_clk; mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23; mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD; diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 4a5cd5e..b130509 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -281,6 +281,7 @@ struct sdhci_ops { unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); unsigned int (*get_timeout_clock)(struct sdhci_host *host); + unsigned int (*get_max_timeout_count)(struct sdhci_host *host); void (*set_bus_width)(struct sdhci_host *host, int width); void (*platform_send_init_74_clocks)(struct sdhci_host *host, u8 power_mode);