From patchwork Sun Feb 6 01:35:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 534501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p161Zvf5020143 for ; Sun, 6 Feb 2011 01:35:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752038Ab1BFBfw (ORCPT ); Sat, 5 Feb 2011 20:35:52 -0500 Received: from na3sys009aog116.obsmtp.com ([74.125.149.240]:52019 "EHLO na3sys009aog116.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751948Ab1BFBfw convert rfc822-to-8bit (ORCPT ); Sat, 5 Feb 2011 20:35:52 -0500 Received: from source ([65.219.4.129]) (using TLSv1) by na3sys009aob116.postini.com ([74.125.148.12]) with SMTP ID DSNKTU369BeYwo/bpaf+igHtdBGw64535FH/@postini.com; Sat, 05 Feb 2011 17:35:51 PST Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by SC-OWA01.marvell.com ([10.93.76.21]) with mapi; Sat, 5 Feb 2011 17:35:47 -0800 From: Philip Rakity To: Chris Ball , Albert Herranz CC: "linux-mmc@vger.kernel.org" Date: Sat, 5 Feb 2011 17:35:46 -0800 Subject: Re: [BUG] CMD52 sent as first command not CMD0 Thread-Topic: [BUG] CMD52 sent as first command not CMD0 Thread-Index: AcvFni3m7rphzEgbQMaSm7x9P8Hdag== Message-ID: <173274DF-475D-44FB-8C34-25728D12ADBB@marvell.com> References: <20110206003845.GA15019@void.printf.net> <20110206011514.GA15322@void.printf.net> In-Reply-To: <20110206011514.GA15322@void.printf.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 06 Feb 2011 01:35:58 +0000 (UTC) ===== CMD52 is a reset for SDIO cards. CMD0 is not sufficient when the card is being re-initialized. Only send CMD52 if a) doing a reinitialize b) card is SDIO or SDIO_COMBO Signed-off-by: Philip Rakity --- drivers/mmc/core/core.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 30d4da4..f0ce6f6 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1521,7 +1521,12 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) mmc_hostname(host), __func__, host->f_init); #endif mmc_power_up(host); - sdio_reset(host); + + /* reset sdio before CMD0 when card is being reinitialized */ + if (host->card && + (host->card->type == MMC_TYPE_SDIO || + host->card->type == MMC_TYPE_SD_COMBO)) + sdio_reset(host); mmc_go_idle(host); mmc_hwungate_clock(host);