From patchwork Fri Mar 4 11:32:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arindam Nath X-Patchwork-Id: 608721 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 p24BXOPq029838 for ; Fri, 4 Mar 2011 11:33:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754143Ab1CDLdV (ORCPT ); Fri, 4 Mar 2011 06:33:21 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:52223 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752094Ab1CDLdU (ORCPT ); Fri, 4 Mar 2011 06:33:20 -0500 Received: by iyb26 with SMTP id 26so1805952iyb.19 for ; Fri, 04 Mar 2011 03:33:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=Mg6r9X5KecFKh7J/M7evXPvlsCR+YNhqA+w785o+FRQ=; b=dU6Pzn5f/EUrQeP14BaaS8+Dcr35k9RrjuDHw4wSf/+hfq47hsb2X3XMJQoQLD4jZz SMbfOImlqlaHsPT6lFYpXxQ9plX9lJHqNDffI368IIP0Pq58XD0iNfQ3BMzq/GMV38iU Demd1lhdyBsNqGnXmAUB+/Uj5igwf5x9wt1II= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=OhdqCHqBwjuP25+bY5edRx0oyUgFgIBZJlkLLSBhRctNSkK+8/lPNf6/h5zq2Fd5RB 6eSP+loSZJ8RjlMy3FQuW/YA52LGKU0z17ZI0lekVfow2bOj1l0Yj9+vC/SmD/gndi0P gKI2NNI2xWRuCrpXPkoAE0kJx+JAtP0V5Tgec= Received: by 10.231.17.75 with SMTP id r11mr354096iba.4.1299238400033; Fri, 04 Mar 2011 03:33:20 -0800 (PST) Received: from localhost ([122.167.0.108]) by mx.google.com with ESMTPS id d21sm1877427ibg.9.2011.03.04.03.33.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Mar 2011 03:33:19 -0800 (PST) From: Arindam Nath To: cjb@laptop.org Cc: zhangfei.gao@gmail.com, prakity@marvell.com, subhashj@codeaurora.org, linux-mmc@vger.kernel.org, henry.su@amd.com, aaron.lu@amd.com, anath.amd@gmail.com, Arindam Nath Subject: [PATCH v2 01/12] mmc: sdhci: add support for auto CMD23 Date: Fri, 4 Mar 2011 17:02:38 +0530 Message-Id: <1299238369-1768-2-git-send-email-arindam.nath@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1299238369-1768-1-git-send-email-arindam.nath@amd.com> References: <1299238369-1768-1-git-send-email-arindam.nath@amd.com> 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]); Fri, 04 Mar 2011 11:33:25 +0000 (UTC) diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index d18c32b..b3f8a3c 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -188,6 +188,12 @@ static int mmc_decode_scr(struct mmc_card *card) scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4); scr->bus_widths = UNSTUFF_BITS(resp, 48, 4); + if (scr->sda_vsn == SCR_SPEC_VER_2) { + /* Check if Physical Layer Spec v3.0 is supported*/ + scr->sda_spec3 = UNSTUFF_BITS(resp, 47, 1); + if (scr->sda_spec3) + scr->cmd_support = UNSTUFF_BITS(resp, 32, 2); + } if (UNSTUFF_BITS(resp, 55, 1)) card->erased_byte = 0xFF; diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9e15f41..8914a25 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -25,6 +25,7 @@ #include #include +#include #include "sdhci.h" @@ -812,6 +813,30 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT); } +/* + * Does the Host Controller support Auto CMD23? + * + * There are four preconditions for Auto CMD23 to be supported: + * 1. Host Controller v3.00 or later + * 2. Card supports CMD23 + * 3. If DMA is used, it should be ADMA + * 4. Only when CMD18 or CMD25 is issued + */ +static int sdhci_host_auto_cmd23_supported(struct sdhci_host *host, + struct mmc_request *mrq) +{ + struct mmc_card *card = host->mmc->card; + + if ((host->version >= SDHCI_SPEC_300) && + card && (card->scr.cmd_support & SD_SCR_CMD23_SUPPORT) && + !(host->flags & SDHCI_USE_SDMA) && + ((mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) || + (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK))) + return 1; + + return 0; +} + static void sdhci_set_transfer_mode(struct sdhci_host *host, struct mmc_data *data) { @@ -825,10 +850,21 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, mode = SDHCI_TRNS_BLK_CNT_EN; if (data->blocks > 1) { if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) - mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_ACMD12; - else - mode |= SDHCI_TRNS_MULTI; + mode |= SDHCI_TRNS_ACMD12; + else if (sdhci_host_auto_cmd23_supported(host, host->mrq)) { + /* + * Host Controller v3.00 can automatically send CMD23 + * before CMD18 or CMD25. For that, we need to enable + * Auto CMD23 in the Transfer Mode register and + * program the block count in Argument 2 register. + */ + mode |= SDHCI_TRNS_AUTO_CMD23; + sdhci_writel(host, data->blocks, SDHCI_ARGUMENT2); + } + + mode |= SDHCI_TRNS_MULTI; } + if (data->flags & MMC_DATA_READ) mode |= SDHCI_TRNS_READ; if (host->flags & SDHCI_REQ_USE_DMA) @@ -1131,6 +1167,23 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) #ifndef SDHCI_USE_LEDS_CLASS sdhci_activate_led(host); #endif + /* + * Since the block count for CMD23 has already been specified in the + * Argument 2 register, we don't need CMD12 to stop multiple block + * transfers. + */ + if (sdhci_host_auto_cmd23_supported(host, mrq)) { + if (mrq->stop) { + /* + * Save the stop command here to be used during + * error recovery + */ + host->saved_abort_cmd = mrq->data->stop; + mrq->data->stop = NULL; + mrq->stop = NULL; + } + } + if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) { if (mrq->stop) { mrq->data->stop = NULL; @@ -1396,6 +1449,7 @@ static void sdhci_timeout_timer(unsigned long data) if (host->data) { host->data->error = -ETIMEDOUT; + host->data->stop = host->saved_abort_cmd; sdhci_finish_data(host); } else { if (host->cmd) @@ -1534,9 +1588,10 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) host->data->error = -EIO; } - if (host->data->error) + if (host->data->error) { + host->data->stop = host->saved_abort_cmd; sdhci_finish_data(host); - else { + } else { if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL)) sdhci_transfer_pio(host); @@ -1792,6 +1847,10 @@ int sdhci_add_host(struct sdhci_host *host) host->flags &= ~SDHCI_USE_ADMA; } + /* If the host can perform ADMA operation, we reset SDMA flag */ + if (host->flags & SDHCI_USE_ADMA) + host->flags &= ~SDHCI_USE_SDMA; + if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { if (host->ops->enable_dma) { if (host->ops->enable_dma(host)) { diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 6e0969e..223762c 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -25,6 +25,7 @@ */ #define SDHCI_DMA_ADDRESS 0x00 +#define SDHCI_ARGUMENT2 SDHCI_DMA_ADDRESS #define SDHCI_BLOCK_SIZE 0x04 #define SDHCI_MAKE_BLKSZ(dma, blksz) (((dma & 0x7) << 12) | (blksz & 0xFFF)) @@ -37,6 +38,7 @@ #define SDHCI_TRNS_DMA 0x01 #define SDHCI_TRNS_BLK_CNT_EN 0x02 #define SDHCI_TRNS_ACMD12 0x04 +#define SDHCI_TRNS_AUTO_CMD23 0x08 #define SDHCI_TRNS_READ 0x10 #define SDHCI_TRNS_MULTI 0x20 diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 8ce0827..22b0335 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -58,9 +58,13 @@ struct mmc_ext_csd { struct sd_scr { unsigned char sda_vsn; + unsigned char sda_spec3; unsigned char bus_widths; #define SD_SCR_BUS_WIDTH_1 (1<<0) #define SD_SCR_BUS_WIDTH_4 (1<<2) + unsigned char cmd_support; +#define SD_SCR_CMD20_SUPPORT (1<<0) +#define SD_SCR_CMD23_SUPPORT (1<<1) }; struct sd_ssr { diff --git a/include/linux/mmc/sd.h b/include/linux/mmc/sd.h index 3fd85e0..178363b 100644 --- a/include/linux/mmc/sd.h +++ b/include/linux/mmc/sd.h @@ -59,7 +59,7 @@ #define SCR_SPEC_VER_0 0 /* Implements system specification 1.0 - 1.01 */ #define SCR_SPEC_VER_1 1 /* Implements system specification 1.10 */ -#define SCR_SPEC_VER_2 2 /* Implements system specification 2.00 */ +#define SCR_SPEC_VER_2 2 /* Implements system specification 2.00 - 3.0x */ /* * SD bus widths diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 83bd9f7..282d158 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -145,6 +145,8 @@ struct sdhci_host { unsigned int ocr_avail_sd; unsigned int ocr_avail_mmc; + struct mmc_command *saved_abort_cmd; /* Abort command saved for data error recovery */ + unsigned long private[0] ____cacheline_aligned; }; #endif /* __SDHCI_H */