Dear all,
Since the member host->ext_caps is a duplicate of host->caps2 which
is already accepted in mainline by maintainer. I will resend my
patch by using the existing caps2 member of struct mmc_host .
regards
Girish K S
On 28 September 2011 10:30, Girish K S <girish.shivananjappa@xxxxxxxxxx> wrote:
> This patch adds the support of the HS200 bus speed for
> eMMC 4.5 devices.
> The eMMC 4.5 devices have support for 200MHz bus speed.
> The mmc core and host modules have been touched to add support
> for this module.
> It is necessary to know the card type in the sdhci.c file to
> add support for eMMC tuning function. So card.h file is included
> to import the card data structure.
>
> Signed-off-by: Girish K S <girish.shivananjappa@xxxxxxxxxx>
> ---
> Changes in v1:
> Case statements in switch that produce same result have
> been combined to reduce repeated assignments.
> patch recreated after rebase to chris balls mmc-next branch.
> Changes in v2:
> Rebased to latest chris-mmc/mmc-next branch. Resolved indentation
> problems identified in review. This patch has to be applied before
> the patch released for modifying the printk messages.
>
> drivers/mmc/core/bus.c | 3 +-
> drivers/mmc/core/mmc.c | 91 +++++++++++++++++++++++++++++++++++++++++----
> drivers/mmc/host/sdhci.c | 36 +++++++++++++++---
> include/linux/mmc/card.h | 3 +
> include/linux/mmc/host.h | 8 ++++
> include/linux/mmc/mmc.h | 8 +++-
> include/linux/mmc/sdhci.h | 1 +
> 7 files changed, 134 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index 393d817..a0aa7ab 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -301,10 +301,11 @@ int mmc_add_card(struct mmc_card *card)
> mmc_card_ddr_mode(card) ? "DDR " : "",
> type);
> } else {
> - printk(KERN_INFO "%s: new %s%s%s card at address %04x\n",
> + printk(KERN_INFO "%s: new %s%s%s%s card at address %04x\n",
> mmc_hostname(card->host),
> mmc_sd_card_uhs(card) ? "ultra high speed " :
> (mmc_card_highspeed(card) ? "high speed " : ""),
> + (mmc_card_hs200(card) ? "HS200 " : ""),
> mmc_card_ddr_mode(card) ? "DDR " : "",
> type, card->rca);
> }
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index c632b1f..382bf39 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -283,6 +283,39 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
> }
> card->ext_csd.raw_card_type = ext_csd[EXT_CSD_CARD_TYPE];
> switch (ext_csd[EXT_CSD_CARD_TYPE] & EXT_CSD_CARD_TYPE_MASK) {
> + case EXT_CSD_CARD_TYPE_SDR_200 |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_200 | EXT_CSD_CARD_TYPE_DDR_1_8V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_200 | EXT_CSD_CARD_TYPE_DDR_1_2V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_200 | EXT_CSD_CARD_TYPE_DDR_52 |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + card->ext_csd.hs_max_dtr = 200000000;
> + card->ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_200;
> + break;
> + case EXT_CSD_CARD_TYPE_SDR_1_2V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_1_2V | EXT_CSD_CARD_TYPE_DDR_1_8V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_1_2V | EXT_CSD_CARD_TYPE_DDR_1_2V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_1_2V | EXT_CSD_CARD_TYPE_DDR_52 |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + card->ext_csd.hs_max_dtr = 200000000;
> + card->ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_1_2V;
> + break;
> + case EXT_CSD_CARD_TYPE_SDR_1_8V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_1_8V | EXT_CSD_CARD_TYPE_DDR_1_8V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_1_8V | EXT_CSD_CARD_TYPE_DDR_1_2V |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + case EXT_CSD_CARD_TYPE_SDR_1_8V | EXT_CSD_CARD_TYPE_DDR_52 |
> + EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
> + card->ext_csd.hs_max_dtr = 200000000;
> + card->ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_1_8V;
> + break;
> case EXT_CSD_CARD_TYPE_DDR_52 | EXT_CSD_CARD_TYPE_52 |
> EXT_CSD_CARD_TYPE_26:
> card->ext_csd.hs_max_dtr = 52000000;
> @@ -624,6 +657,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> {
> struct mmc_card *card;
> int err, ddr = 0;
> + int hs_sdr = 0;
> u32 cid[4];
> unsigned int max_dtr;
> u32 rocr;
> @@ -797,10 +831,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> /*
> * Activate high speed (if supported)
> */
> - if ((card->ext_csd.hs_max_dtr != 0) &&
> - (host->caps & MMC_CAP_MMC_HIGHSPEED)) {
> - err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> - EXT_CSD_HS_TIMING, 1, 0);
> + if (card->ext_csd.hs_max_dtr != 0) {
> + if ((card->ext_csd.hs_max_dtr > 52000000) &&
> + (host->ext_caps & MMC_CAP_HIGHSPEED_200))
> + err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> + EXT_CSD_HS_TIMING, 2, 0);
> + else if (host->caps & MMC_CAP_MMC_HIGHSPEED)
> + err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> + EXT_CSD_HS_TIMING, 1, 0);
> +
> if (err && err != -EBADMSG)
> goto free_card;
>
> @@ -809,7 +848,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> mmc_hostname(card->host));
> err = 0;
> } else {
> - mmc_card_set_highspeed(card);
> + if (card->ext_csd.hs_max_dtr > 52000000)
> + mmc_card_set_hs200(card);
> + else
> + mmc_card_set_highspeed(card);
> mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
> }
> }
> @@ -819,7 +861,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> */
> max_dtr = (unsigned int)-1;
>
> - if (mmc_card_highspeed(card)) {
> + if (mmc_card_highspeed(card) || mmc_card_hs200(card)) {
> if (max_dtr > card->ext_csd.hs_max_dtr)
> max_dtr = card->ext_csd.hs_max_dtr;
> } else if (max_dtr > card->csd.max_dtr) {
> @@ -845,6 +887,22 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> }
>
> /*
> + * Indicate HS200 SDR mode (if supported).
> + */
> + if (mmc_card_hs200(card)) {
> + if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_SDR_1_8V)
> + && ((host->ext_caps & (MMC_CAP_HS200_1_8V_SDR |
> + MMC_CAP_HS200))
> + == (MMC_CAP_HS200_1_8V_SDR | MMC_CAP_HS200)))
> + hs_sdr = MMC_1_8V_SDR_MODE;
> + else if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_SDR_1_2V)
> + && ((host->ext_caps & (MMC_CAP_HS200_1_2V_SDR |
> + MMC_CAP_HS200))
> + == (MMC_CAP_HS200_1_2V_SDR | MMC_CAP_HS200)))
> + hs_sdr = MMC_1_2V_SDR_MODE;
> + }
> +
> + /*
> * Activate wide bus and DDR (if supported).
> */
> if ((card->csd.mmca_vsn >= CSD_SPEC_VER_4) &&
> @@ -884,16 +942,24 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> if (!err) {
> mmc_set_bus_width(card->host, bus_width);
>
> + if ((host->ext_caps & MMC_CAP_HS200) &&
> + card->host->ops->execute_tuning)
> + err = card->host->ops-> \
> + execute_tuning(card->host);
> +
> /*
> * If controller can't handle bus width test,
> * compare ext_csd previously read in 1 bit mode
> * against ext_csd at new bus width
> */
> - if (!(host->caps & MMC_CAP_BUS_WIDTH_TEST))
> + if (!(host->caps & MMC_CAP_BUS_WIDTH_TEST) &&
> + !err)
> err = mmc_compare_ext_csds(card,
> bus_width);
> - else
> + else if (!err)
> err = mmc_bus_test(card, bus_width);
> + else
> + pr_warning("tuning execution failed\n");
> if (!err)
> break;
> }
> @@ -942,6 +1008,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
> mmc_card_set_ddr_mode(card);
> mmc_set_timing(card->host, MMC_TIMING_UHS_DDR50);
> mmc_set_bus_width(card->host, bus_width);
> + } else if (hs_sdr) {
> + if (hs_sdr == EXT_CSD_CARD_TYPE_SDR_1_2V) {
> + err = mmc_set_signal_voltage(host,
> + MMC_SIGNAL_VOLTAGE_120, 0);
> + if (err)
> + goto err;
> + }
> + mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
> + mmc_set_bus_width(card->host, bus_width);
> }
> }
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index d66a7a1..8582b5a 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -25,6 +25,7 @@
>
> #include <linux/mmc/mmc.h>
> #include <linux/mmc/host.h>
> +#include <linux/mmc/card.h>
>
> #include "sdhci.h"
>
> @@ -993,7 +994,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
> flags |= SDHCI_CMD_INDEX;
>
> /* CMD19 is special in that the Data Present Select should be set */
> - if (cmd->data || (cmd->opcode == MMC_SEND_TUNING_BLOCK))
> + if (cmd->data || (cmd->opcode == MMC_SEND_TUNING_BLOCK) ||
> + (cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200))
> flags |= SDHCI_CMD_DATA;
>
> sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND);
> @@ -1623,10 +1625,13 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)
> * Host Controller needs tuning only in case of SDR104 mode
> * and for SDR50 mode when Use Tuning for SDR50 is set in
> * Capabilities register.
> + * If the Host Controller supports the HS200 mode then tuning
> + * function has to be executed.
> */
> if (((ctrl & SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR104) ||
> (((ctrl & SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR50) &&
> - (host->flags & SDHCI_SDR50_NEEDS_TUNING)))
> + (host->flags & SDHCI_SDR50_NEEDS_TUNING)) ||
> + (host->flags & SDHCI_HS200_NEEDS_TUNING))
> ctrl |= SDHCI_CTRL_EXEC_TUNING;
> else {
> spin_unlock(&host->lock);
> @@ -1661,7 +1666,10 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)
> if (!tuning_loop_counter && !timeout)
> break;
>
> - cmd.opcode = MMC_SEND_TUNING_BLOCK;
> + if (mmc->card->type == MMC_TYPE_MMC)
> + cmd.opcode = MMC_SEND_TUNING_BLOCK_HS200;
> + else
> + cmd.opcode = MMC_SEND_TUNING_BLOCK;
> cmd.arg = 0;
> cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
> cmd.retries = 0;
> @@ -1676,7 +1684,17 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)
> * block to the Host Controller. So we set the block size
> * to 64 here.
> */
> - sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64), SDHCI_BLOCK_SIZE);
> + if (mmc->card->type == MMC_TYPE_MMC) {
> + if (mmc->ios.bus_width == MMC_BUS_WIDTH_8)
> + sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128),
> + SDHCI_BLOCK_SIZE);
> + else if (mmc->ios.bus_width == MMC_BUS_WIDTH_4)
> + sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),
> + SDHCI_BLOCK_SIZE);
> + } else {
> + sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64),
> + SDHCI_BLOCK_SIZE);
> + }
>
> /*
> * The tuning block is sent by the card to the host controller.
> @@ -2047,12 +2065,14 @@ static void sdhci_show_adma_error(struct sdhci_host *host) { }
>
> static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
> {
> + u32 command;
> BUG_ON(intmask == 0);
>
> /* CMD19 generates _only_ Buffer Read Ready interrupt */
> if (intmask & SDHCI_INT_DATA_AVAIL) {
> - if (SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND)) ==
> - MMC_SEND_TUNING_BLOCK) {
> + command = SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND));
> + if ((command == MMC_SEND_TUNING_BLOCK) ||
> + (command == MMC_SEND_TUNING_BLOCK_HS200)) {
> host->tuning_done = 1;
> wake_up(&host->buf_ready_int);
> return;
> @@ -2567,6 +2587,10 @@ int sdhci_add_host(struct sdhci_host *host)
> if (caps[1] & SDHCI_USE_SDR50_TUNING)
> host->flags |= SDHCI_SDR50_NEEDS_TUNING;
>
> + /* Does the host needs tuning for HS200? */
> + if (mmc->ext_caps & MMC_CAP_HS200)
> + host->flags |= SDHCI_HS200_NEEDS_TUNING;
> +
> /* Driver Type(s) (A, C, D) supported by the host */
> if (caps[1] & SDHCI_DRIVER_TYPE_A)
> mmc->caps |= MMC_CAP_DRIVER_TYPE_A;
> diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
> index 5294ddf..15e5ce2 100644
> --- a/include/linux/mmc/card.h
> +++ b/include/linux/mmc/card.h
> @@ -178,6 +178,7 @@ struct mmc_card {
> #define MMC_STATE_HIGHSPEED_DDR (1<<4) /* card is in high speed mode */
> #define MMC_STATE_ULTRAHIGHSPEED (1<<5) /* card is in ultra high speed mode */
> #define MMC_CARD_SDXC (1<<6) /* card is SDXC */
> +#define MMC_STATE_HIGHSPEED_200 (1<<7) /* card is in HS200 mode */
> unsigned int quirks; /* card quirks */
> #define MMC_QUIRK_LENIENT_FN0 (1<<0) /* allow SDIO FN0 writes outside of the VS CCCR range */
> #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1) /* use func->cur_blksize */
> @@ -313,6 +314,7 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
> #define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT)
> #define mmc_card_readonly(c) ((c)->state & MMC_STATE_READONLY)
> #define mmc_card_highspeed(c) ((c)->state & MMC_STATE_HIGHSPEED)
> +#define mmc_card_hs200(c) ((c)->state & MMC_STATE_HIGHSPEED_200)
> #define mmc_card_blockaddr(c) ((c)->state & MMC_STATE_BLOCKADDR)
> #define mmc_card_ddr_mode(c) ((c)->state & MMC_STATE_HIGHSPEED_DDR)
> #define mmc_sd_card_uhs(c) ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
> @@ -321,6 +323,7 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
> #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
> #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
> #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
> +#define mmc_card_set_hs200(c) ((c)->state |= MMC_STATE_HIGHSPEED_200)
> #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
> #define mmc_card_set_ddr_mode(c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR)
> #define mmc_sd_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
> diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
> index aed5bc7..9d460d7 100644
> --- a/include/linux/mmc/host.h
> +++ b/include/linux/mmc/host.h
> @@ -60,6 +60,8 @@ struct mmc_ios {
> #define MMC_SDR_MODE 0
> #define MMC_1_2V_DDR_MODE 1
> #define MMC_1_8V_DDR_MODE 2
> +#define MMC_1_2V_SDR_MODE 3
> +#define MMC_1_8V_SDR_MODE 4
>
> unsigned char signal_voltage; /* signalling voltage (1.8V or 3.3V) */
>
> @@ -236,6 +238,12 @@ struct mmc_host {
> #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */
> #define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */
>
> + unsigned long ext_caps; /* extended Host capabilities */
> +#define MMC_CAP_HS200 (1 << 0) /* Host supports HS200 mode */
> +#define MMC_CAP_HS200_1_8V_SDR (1 << 1) /* can support */
> +#define MMC_CAP_HS200_1_2V_SDR (1 << 2) /* can support */
> +#define MMC_CAP_HIGHSPEED_200 (1 << 3) /* Can do MMC HS200 timing */
> +
> unsigned int caps2; /* More host capabilities */
>
> #define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */
> diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
> index 50af227..3f2e210 100644
> --- a/include/linux/mmc/mmc.h
> +++ b/include/linux/mmc/mmc.h
> @@ -51,6 +51,7 @@
> #define MMC_READ_SINGLE_BLOCK 17 /* adtc [31:0] data addr R1 */
> #define MMC_READ_MULTIPLE_BLOCK 18 /* adtc [31:0] data addr R1 */
> #define MMC_SEND_TUNING_BLOCK 19 /* adtc R1 */
> +#define MMC_SEND_TUNING_BLOCK_HS200 21 /* adtc R1 */
>
> /* class 3 */
> #define MMC_WRITE_DAT_UNTIL_STOP 20 /* adtc [31:0] data addr R1 */
> @@ -321,13 +322,18 @@ struct _mmc_csd {
>
> #define EXT_CSD_CARD_TYPE_26 (1<<0) /* Card can run at 26MHz */
> #define EXT_CSD_CARD_TYPE_52 (1<<1) /* Card can run at 52MHz */
> -#define EXT_CSD_CARD_TYPE_MASK 0xF /* Mask out reserved bits */
> +#define EXT_CSD_CARD_TYPE_MASK 0x3F /* Mask out reserved bits */
> #define EXT_CSD_CARD_TYPE_DDR_1_8V (1<<2) /* Card can run at 52MHz */
> /* DDR mode @1.8V or 3V I/O */
> #define EXT_CSD_CARD_TYPE_DDR_1_2V (1<<3) /* Card can run at 52MHz */
> /* DDR mode @1.2V I/O */
> #define EXT_CSD_CARD_TYPE_DDR_52 (EXT_CSD_CARD_TYPE_DDR_1_8V \
> | EXT_CSD_CARD_TYPE_DDR_1_2V)
> +#define EXT_CSD_CARD_TYPE_SDR_1_8V (1<<4) /* Card can run at 200MHz */
> +#define EXT_CSD_CARD_TYPE_SDR_1_2V (1<<5) /* Card can run at 200MHz */
> + /* SDR mode @1.2V I/O */
> +#define EXT_CSD_CARD_TYPE_SDR_200 (EXT_CSD_CARD_TYPE_SDR_1_8V \
> + | EXT_CSD_CARD_TYPE_SDR_1_2V)
>
> #define EXT_CSD_BUS_WIDTH_1 0 /* Card is in 1 bit mode */
> #define EXT_CSD_BUS_WIDTH_4 1 /* Card is in 4 bit mode */
> diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
> index 5666f3a..b6e81bd 100644
> --- a/include/linux/mmc/sdhci.h
> +++ b/include/linux/mmc/sdhci.h
> @@ -115,6 +115,7 @@ struct sdhci_host {
> #define SDHCI_NEEDS_RETUNING (1<<5) /* Host needs retuning */
> #define SDHCI_AUTO_CMD12 (1<<6) /* Auto CMD12 support */
> #define SDHCI_AUTO_CMD23 (1<<7) /* Auto CMD23 support */
> +#define SDHCI_HS200_NEEDS_TUNING (1<<8) /* HS200 needs tuning */
>
> unsigned int version; /* SDHCI spec. version */
>
> --
> 1.7.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
