From patchwork Mon Sep 6 01:37:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hein_Tibosch X-Patchwork-Id: 177932 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=0.1 required=2.9 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_WEB autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Mon, 06 Sep 2010 03:17:30 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OsRGx-0006rd-VG for chris@printf.net; Mon, 06 Sep 2010 03:17:29 +0100 Received: by mail.laptop.org (Postfix) id 7C8EA240D8; Sun, 5 Sep 2010 22:17:08 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 71089240D7 for ; Sun, 5 Sep 2010 22:17:08 -0400 (EDT) X-ASG-Debug-ID: 1283739445-0b7493a00001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id RbsM9zrGRidAiYTH for ; Sun, 05 Sep 2010 22:17:25 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755015Ab0IFCRZ (ORCPT ); Sun, 5 Sep 2010 22:17:25 -0400 Received: from bosmailout20.eigbox.net ([66.96.187.20]:43487 "EHLO bosmailout20.eigbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754958Ab0IFCRY (ORCPT ); Sun, 5 Sep 2010 22:17:24 -0400 X-Greylist: delayed 2139 seconds by postgrey-1.27 at vger.kernel.org; Sun, 05 Sep 2010 22:17:24 EDT Received: from bosmailscan21.eigbox.net ([10.20.15.21]) by bosmailout20.eigbox.net with esmtp (Exim) id 1OsQiO-0004Fk-1y; Sun, 05 Sep 2010 21:41:44 -0400 Received: from bosimpout01.eigbox.net ([10.20.55.1]) by bosmailscan21.eigbox.net with esmtp (Exim) id 1OsQiJ-0007QQ-Vr; Sun, 05 Sep 2010 21:41:40 -0400 Received: from bosauthsmtp12.eigbox.net ([10.20.18.12]) by bosimpout01.eigbox.net with NO UCE id 3DdZ1f0010FdZ9W01DdZiH; Sun, 05 Sep 2010 21:37:33 -0400 X-EN-OrigOutIP: 10.20.18.12 X-EN-IMPSID: 3DdZ1f0010FdZ9W01DdZiH Received: from [202.70.59.41] (helo=[10.13.79.4]) by bosauthsmtp12.eigbox.net with esmtpa (Exim) id 1OsQiI-0006Sn-Q9; Sun, 05 Sep 2010 21:41:39 -0400 Message-ID: <4C8445CF.8020406@yahoo.es> Date: Mon, 06 Sep 2010 09:37:19 +0800 From: Hein_Tibosch User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.8) Gecko/20100802 Thunderbird/3.1.2 MIME-Version: 1.0 To: Andrew Morton CC: Chris Ball , Matt Fleming , Pierre Ossman , Ben Nizette , Sascha Hauer , Adrian Hunter , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org X-ASG-Orig-Subj: [PATCH v5] mmc: Make ID freq configurable Subject: [PATCH v5] mmc: Make ID freq configurable References: <4C80187D.9000304@yahoo.es> <20100905201448.GA22819@console-pimps.org> <20100905204336.GA23574@void.printf.net> <20100905212218.GA23622@console-pimps.org> In-Reply-To: <20100905212218.GA23622@console-pimps.org> X-EN-UserInfo: 3946c951b80c12a8be5482963a0b1232:e0ae43bc192b431f8b69f09a37527cbc X-EN-AuthUser: hein@htibosch.net X-EN-OrigIP: 202.70.59.41 X-EN-OrigHost: unknown Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1283739445 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40048 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff -Nurp a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c 2010-08-29 23:36:04.000000000 +0800 +++ b/drivers/mmc/core/core.c 2010-09-06 09:16:35.000000000 +0800 @@ -907,12 +907,7 @@ static void mmc_power_up(struct mmc_host */ mmc_delay(10); - if (host->f_min > 400000) { - pr_warning("%s: Minimum clock frequency too high for " - "identification mode\n", mmc_hostname(host)); - host->ios.clock = host->f_min; - } else - host->ios.clock = 400000; + host->ios.clock = host->f_init; host->ios.power_mode = MMC_POWER_ON; mmc_set_ios(host); @@ -1404,6 +1399,8 @@ void mmc_rescan(struct work_struct *work u32 ocr; int err; unsigned long flags; + int i; + const unsigned freqs[] = { 400000, 300000, 200000, 100000 }; spin_lock_irqsave(&host->lock, flags); @@ -1443,55 +1440,70 @@ void mmc_rescan(struct work_struct *work if (host->ops->get_cd && host->ops->get_cd(host) == 0) goto out; - mmc_claim_host(host); + for (i = 0; i < ARRAY_SIZE(freqs); i++) { + mmc_claim_host(host); - mmc_power_up(host); - sdio_reset(host); - mmc_go_idle(host); + if (freqs[i] >= host->f_min) + host->f_init = freqs[i]; + else if (!i || freqs[i-1] > host->f_min) + host->f_init = host->f_min; + else { + mmc_release_host(host); + goto out; + } + pr_info("%s: %s: trying to init card at %u Hz\n", + mmc_hostname(host), __func__, host->f_init); - mmc_send_if_cond(host, host->ocr_avail); + mmc_power_up(host); + sdio_reset(host); + mmc_go_idle(host); - /* - * First we search for SDIO... - */ - err = mmc_send_io_op_cond(host, 0, &ocr); - if (!err) { - if (mmc_attach_sdio(host, ocr)) { - mmc_claim_host(host); - /* try SDMEM (but not MMC) even if SDIO is broken */ - if (mmc_send_app_op_cond(host, 0, &ocr)) - goto out_fail; + mmc_send_if_cond(host, host->ocr_avail); + + /* + * First we search for SDIO... + */ + err = mmc_send_io_op_cond(host, 0, &ocr); + if (!err) { + if (mmc_attach_sdio(host, ocr)) { + mmc_claim_host(host); + /* + * Try SDMEM (but not MMC) even if SDIO + * is broken. + */ + if (mmc_send_app_op_cond(host, 0, &ocr)) + goto out_fail; + + if (mmc_attach_sd(host, ocr)) + mmc_power_off(host); + } + goto out; + } + /* + * ...then normal SD... + */ + err = mmc_send_app_op_cond(host, 0, &ocr); + if (!err) { if (mmc_attach_sd(host, ocr)) mmc_power_off(host); + goto out; } - goto out; - } - - /* - * ...then normal SD... - */ - err = mmc_send_app_op_cond(host, 0, &ocr); - if (!err) { - if (mmc_attach_sd(host, ocr)) - mmc_power_off(host); - goto out; - } - /* - * ...and finally MMC. - */ - err = mmc_send_op_cond(host, 0, &ocr); - if (!err) { - if (mmc_attach_mmc(host, ocr)) - mmc_power_off(host); - goto out; - } + /* + * ...and finally MMC. + */ + err = mmc_send_op_cond(host, 0, &ocr); + if (!err) { + if (mmc_attach_mmc(host, ocr)) + mmc_power_off(host); + goto out; + } out_fail: - mmc_release_host(host); - mmc_power_off(host); - + mmc_release_host(host); + mmc_power_off(host); + } out: if (host->caps & MMC_CAP_NEEDS_POLL) mmc_schedule_delayed_work(&host->detect, HZ); diff -Nurp a/include/linux/mmc/host.h b/include/linux/mmc/host.h --- a/include/linux/mmc/host.h 2010-08-29 23:36:04.000000000 +0800 +++ b/include/linux/mmc/host.h 2010-09-03 05:16:21.000000000 +0800 @@ -123,6 +123,7 @@ struct mmc_host { const struct mmc_host_ops *ops; unsigned int f_min; unsigned int f_max; + unsigned int f_init; u32 ocr_avail; struct notifier_block pm_notify;