| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <09611EF13E604BFABF76F582032C1526@hacdom.okisemi.com>
Date: Wed, 19 Jan 2011 15:30:23 +0900
From: "Tomoya MORINAGA" <tomoya-linux@....okisemi.com>
To: "'Philip Rakity'" <prakity@...vell.com>, <cjb@...top.org>
Cc: "'Kyungmin Park'" <kmpark@...radead.org>,
<linux-mmc@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<andrew.chih.howe.khor@...el.com>, <kok.howg.ewe@...el.com>,
"Toshiharu Okada" <toshiharu-linux@....okisemi.com>
Subject: RE: A MMC card transfer issue
Hi Philip, Chris
> For 1 bit transcend cards you need these 2 patches.
Thank you for your information.
It seems these patches aren't applied for kernel-2.6.37, right ?
Will you apply these patches for kernel-2.6.38?
BTW, I attached dmesg log when inserts MMC card with kernel-2.6.37.
Thanks,
-----------------------------------------
Tomoya MORINAGA
OKI SEMICONDUCTOR CO., LTD.
> -----Original Message-----
> From: Philip Rakity [mailto:prakity@...vell.com]
> Sent: Wednesday, January 19, 2011 3:05 PM
> To: Tomoya MORINAGA
> Cc: Kyungmin Park; linux-mmc@...r.kernel.org;
> linux-kernel@...r.kernel.org;
> andrew.chih.howe.khor@...el.com; kok.howg.ewe@...el.com
> Subject: Re: A MMC card transfer issue
>
>
> For 1 bit transcend cards you need these 2 patches.
>
>
> From 22113efd00491310da802f3b1a9a66cfcf415fac Mon Sep 17 00:00:00 2001
> From: Aries Lee <arieslee@...cron.com>
> Date: Wed, 15 Dec 2010 08:14:24 +0100
> Subject: [PATCH] mmc: Test bus-width for old MMC devices
>
> Some old MMC devices fail with the 4/8 bits the driver tries
> to use exclusively. This patch adds a test for the given bus
> setup and falls back to the lower bit mode (until 1-bit mode)
> when the test fails.
>
> [Major rework and refactoring by tiwai]
> [Quirk addition and many fixes by prakity]
>
> Signed-off-by: Aries Lee <arieslee@...cron.com>
> Signed-off-by: Takashi Iwai <tiwai@...e.de>
> Signed-off-by: Philip Rakity <prakity@...vell.com>
> Tested-by: Philip Rakity <prakity@...vell.com>
> Signed-off-by: Chris Ball <cjb@...top.org>
> ---
> drivers/mmc/core/mmc.c | 76 ++++++++++++++++++++-------------
> drivers/mmc/core/mmc_ops.c | 101
> ++++++++++++++++++++++++++++++++++++++++++++
> drivers/mmc/core/mmc_ops.h | 1 +
> drivers/mmc/host/sdhci.c | 7 +++-
> drivers/mmc/host/sdhci.h | 1 +
> include/linux/mmc/host.h | 1 +
> include/linux/mmc/mmc.h | 2 +
> 7 files changed, 159 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 76bb621..1d8409f 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -534,39 +534,57 @@ static int mmc_init_card(struct
> mmc_host *host, u32 ocr,
> */
> if ((card->csd.mmca_vsn >= CSD_SPEC_VER_4) &&
> (host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) {
> - unsigned ext_csd_bit, bus_width;
> -
> - if (host->caps & MMC_CAP_8_BIT_DATA) {
> - if (ddr)
> - ext_csd_bit = EXT_CSD_DDR_BUS_WIDTH_8;
> - else
> - ext_csd_bit = EXT_CSD_BUS_WIDTH_8;
> - bus_width = MMC_BUS_WIDTH_8;
> - } else {
> - if (ddr)
> - ext_csd_bit = EXT_CSD_DDR_BUS_WIDTH_4;
> - else
> - ext_csd_bit = EXT_CSD_BUS_WIDTH_4;
> - bus_width = MMC_BUS_WIDTH_4;
> + static unsigned ext_csd_bits[][2] = {
> + { EXT_CSD_BUS_WIDTH_8,
> EXT_CSD_DDR_BUS_WIDTH_8 },
> + { EXT_CSD_BUS_WIDTH_4,
> EXT_CSD_DDR_BUS_WIDTH_4 },
> + { EXT_CSD_BUS_WIDTH_1, EXT_CSD_BUS_WIDTH_1 },
> + };
> + static unsigned bus_widths[] = {
> + MMC_BUS_WIDTH_8,
> + MMC_BUS_WIDTH_4,
> + MMC_BUS_WIDTH_1
> + };
> + unsigned idx, bus_width = 0;
> +
> + if (host->caps & MMC_CAP_8_BIT_DATA)
> + idx = 0;
> + else
> + idx = 1;
> + for (; idx < ARRAY_SIZE(bus_widths); idx++) {
> + bus_width = bus_widths[idx];
> + if (bus_width == MMC_BUS_WIDTH_1)
> + ddr = 0; /* no DDR for 1-bit width */
> + err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> + EXT_CSD_BUS_WIDTH,
> + ext_csd_bits[idx][0]);
> + if (!err) {
> + /*
> + * If controller can't handle
> bus width test,
> + * use the highest bus width to maintain
> + * compatibility with previous
> MMC behavior.
> + */
> + if (!(host->caps &
> MMC_CAP_BUS_WIDTH_TEST))
> + break;
> + mmc_set_bus_width_ddr(card->host,
> +
> bus_width, MMC_SDR_MODE);
> + err = mmc_bus_test(card, bus_width);
> + if (!err)
> + break;
> + }
> }
>
> - err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> - EXT_CSD_BUS_WIDTH, ext_csd_bit);
> -
> - if (err && err != -EBADMSG)
> - goto free_card;
> -
> + if (!err && ddr) {
> + err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
> + EXT_CSD_BUS_WIDTH,
> + ext_csd_bits[idx][1]);
> + }
> if (err) {
> printk(KERN_WARNING "%s: switch to bus
> width %d ddr %d "
> - "failed\n", mmc_hostname(card->host),
> - 1 << bus_width, ddr);
> - err = 0;
> - } else {
> - if (ddr)
> - mmc_card_set_ddr_mode(card);
> - else
> - ddr = MMC_SDR_MODE;
> -
> + "failed\n", mmc_hostname(card->host),
> + 1 << bus_width, ddr);
> + goto free_card;
> + } else if (ddr) {
> + mmc_card_set_ddr_mode(card);
> mmc_set_bus_width_ddr(card->host,
> bus_width, ddr);
> }
> }
> diff --git a/drivers/mmc/core/mmc_ops.c
> b/drivers/mmc/core/mmc_ops.c index 326447c..60842f8 100644
> --- a/drivers/mmc/core/mmc_ops.c
> +++ b/drivers/mmc/core/mmc_ops.c
> @@ -462,3 +462,104 @@ int mmc_send_status(struct mmc_card
> *card, u32 *status)
> return 0;
> }
>
> +static int
> +mmc_send_bus_test(struct mmc_card *card, struct mmc_host
> *host, u8 opcode,
> + u8 len)
> +{
> + struct mmc_request mrq;
> + struct mmc_command cmd;
> + struct mmc_data data;
> + struct scatterlist sg;
> + u8 *data_buf;
> + u8 *test_buf;
> + int i, err;
> + static u8 testdata_8bit[8] = { 0x55, 0xaa, 0, 0, 0, 0, 0, 0 };
> + static u8 testdata_4bit[4] = { 0x5a, 0, 0, 0 };
> +
> + /* dma onto stack is unsafe/nonportable, but callers to this
> + * routine normally provide temporary on-stack buffers ...
> + */
> + data_buf = kmalloc(len, GFP_KERNEL);
> + if (!data_buf)
> + return -ENOMEM;
> +
> + if (len == 8)
> + test_buf = testdata_8bit;
> + else if (len == 4)
> + test_buf = testdata_4bit;
> + else {
> + printk(KERN_ERR "%s: Invalid bus_width %d\n",
> + mmc_hostname(host), len);
> + kfree(data_buf);
> + return -EINVAL;
> + }
> +
> + if (opcode == MMC_BUS_TEST_W)
> + memcpy(data_buf, test_buf, len);
> +
> + memset(&mrq, 0, sizeof(struct mmc_request));
> + memset(&cmd, 0, sizeof(struct mmc_command));
> + memset(&data, 0, sizeof(struct mmc_data));
> +
> + mrq.cmd = &cmd;
> + mrq.data = &data;
> + cmd.opcode = opcode;
> + cmd.arg = 0;
> +
> + /* NOTE HACK: the MMC_RSP_SPI_R1 is always correct here, but we
> + * rely on callers to never use this with "native"
> calls for reading
> + * CSD or CID. Native versions of those commands use
> the R2 type,
> + * not R1 plus a data block.
> + */
> + cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
> +
> + data.blksz = len;
> + data.blocks = 1;
> + if (opcode == MMC_BUS_TEST_R)
> + data.flags = MMC_DATA_READ;
> + else
> + data.flags = MMC_DATA_WRITE;
> +
> + data.sg = &sg;
> + data.sg_len = 1;
> + sg_init_one(&sg, data_buf, len);
> + mmc_wait_for_req(host, &mrq);
> + err = 0;
> + if (opcode == MMC_BUS_TEST_R) {
> + for (i = 0; i < len / 4; i++)
> + if ((test_buf[i] ^ data_buf[i]) != 0xff) {
> + err = -EIO;
> + break;
> + }
> + }
> + kfree(data_buf);
> +
> + if (cmd.error)
> + return cmd.error;
> + if (data.error)
> + return data.error;
> +
> + return err;
> +}
> +
> +int mmc_bus_test(struct mmc_card *card, u8 bus_width) {
> + int err, width;
> +
> + if (bus_width == MMC_BUS_WIDTH_8)
> + width = 8;
> + else if (bus_width == MMC_BUS_WIDTH_4)
> + width = 4;
> + else if (bus_width == MMC_BUS_WIDTH_1)
> + return 0; /* no need for test */
> + else
> + return -EINVAL;
> +
> + /*
> + * Ignore errors from BUS_TEST_W. BUS_TEST_R will fail if there
> + * is a problem. This improves chances that the test will work.
> + */
> + mmc_send_bus_test(card, card->host, MMC_BUS_TEST_W, width);
> + err = mmc_send_bus_test(card, card->host,
> MMC_BUS_TEST_R, width);
> + return err;
> +}
> diff --git a/drivers/mmc/core/mmc_ops.h
> b/drivers/mmc/core/mmc_ops.h index 653eb8e..e6d44b8 100644
> --- a/drivers/mmc/core/mmc_ops.h
> +++ b/drivers/mmc/core/mmc_ops.h
> @@ -26,6 +26,7 @@ int mmc_send_cid(struct mmc_host *host, u32
> *cid); int mmc_spi_read_ocr(struct mmc_host *host, int
> highcap, u32 *ocrp); int mmc_spi_set_crc(struct mmc_host
> *host, int use_crc); int mmc_card_sleepawake(struct mmc_host
> *host, int sleep);
> +int mmc_bus_test(struct mmc_card *card, u8 bus_width);
>
> #endif
>
> diff --git a/drivers/mmc/host/sdhci.c
> b/drivers/mmc/host/sdhci.c index 5569886..d5febe5 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -23,6 +23,7 @@
>
> #include <linux/leds.h>
>
> +#include <linux/mmc/mmc.h>
> #include <linux/mmc/host.h>
>
> #include "sdhci.h"
> @@ -1521,7 +1522,11 @@ static void sdhci_data_irq(struct
> sdhci_host *host, u32 intmask)
>
> if (intmask & SDHCI_INT_DATA_TIMEOUT)
> host->data->error = -ETIMEDOUT;
> - else if (intmask & (SDHCI_INT_DATA_CRC |
> SDHCI_INT_DATA_END_BIT))
> + else if (intmask & SDHCI_INT_DATA_END_BIT)
> + host->data->error = -EILSEQ;
> + else if ((intmask & SDHCI_INT_DATA_CRC) &&
> + SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND))
> + != MMC_BUS_TEST_R)
> host->data->error = -EILSEQ;
> else if (intmask & SDHCI_INT_ADMA_ERROR) {
> printk(KERN_ERR "%s: ADMA error\n",
> mmc_hostname(host->mmc)); diff --git
> a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index
> 1efe7dc..6e0969e 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -52,6 +52,7 @@
> #define SDHCI_CMD_RESP_SHORT_BUSY 0x03
>
> #define SDHCI_MAKE_CMD(c, f) (((c & 0xff) << 8) | (f & 0xff))
> +#define SDHCI_GET_CMD(c) ((c>>8) & 0x3f)
>
> #define SDHCI_RESPONSE 0x10
>
> diff --git a/include/linux/mmc/host.h
> b/include/linux/mmc/host.h index 3a85e73..bcb793e 100644
> --- a/include/linux/mmc/host.h
> +++ b/include/linux/mmc/host.h
> @@ -172,6 +172,7 @@ struct mmc_host {
> #define MMC_CAP_1_2V_DDR (1 << 12) /* can support */
> /* DDR mode at 1.2V */
> #define MMC_CAP_POWER_OFF_CARD (1 << 13) /* Can
> power off after boot */
> +#define MMC_CAP_BUS_WIDTH_TEST (1 << 14) /*
> CMD14/CMD19 bus width ok */
>
> mmc_pm_flag_t pm_caps; /* supported pm
> features */
>
> diff --git a/include/linux/mmc/mmc.h
> b/include/linux/mmc/mmc.h index 956fbd87..612301f 100644
> --- a/include/linux/mmc/mmc.h
> +++ b/include/linux/mmc/mmc.h
> @@ -40,7 +40,9 @@
> #define MMC_READ_DAT_UNTIL_STOP 11 /* adtc [31:0] dadr
> R1 */
> #define MMC_STOP_TRANSMISSION 12 /* ac
> R1b */
> #define MMC_SEND_STATUS 13 /* ac [31:16] RCA
> R1 */
> +#define MMC_BUS_TEST_R 14 /* adtc
> R1 */
> #define MMC_GO_INACTIVE_STATE 15 /* ac [31:16] RCA
> */
> +#define MMC_BUS_TEST_W 19 /* adtc
> R1 */
> #define MMC_SPI_READ_OCR 58 /* spi
> spi_R3 */
> #define MMC_SPI_CRC_ON_OFF 59 /* spi [0:0] flag
> spi_R1 */
>
> --
> 1.7.3.5
>
>
>
> From 08c82dfad2458f8f9b83126224a85e7ea9e2b046 Mon Sep 17 00:00:00 2001
> From: Takashi Iwai <tiwai@...e.de>
> Date: Wed, 22 Dec 2010 09:59:44 +0100
> Subject: [PATCH] mmc: fix mmc_set_bus_width_ddr() call
> without bus-width-test cap
>
> With the bus-width test patch, mmc_set_bus_width*() isn't
> called properly
> when the driver doesn't set MMC_CAP_BUS_WIDTH and no DDR mode.
> This patch fixes the regression by moving the call up before
> the cap test.
>
> Signed-off-by: Takashi Iwai <tiwai@...e.de>
> Reviewed-by: Chris Ball <cjb@...top.org>
> Signed-off-by: Chris Ball <cjb@...top.org>
> ---
> drivers/mmc/core/mmc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 1d8409f..c86dd73 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -558,6 +558,8 @@ static int mmc_init_card(struct mmc_host
> *host, u32 ocr,
> EXT_CSD_BUS_WIDTH,
> ext_csd_bits[idx][0]);
> if (!err) {
> + mmc_set_bus_width_ddr(card->host,
> +
> bus_width, MMC_SDR_MODE);
> /*
> * If controller can't handle
> bus width test,
> * use the highest bus width to maintain
> @@ -565,8 +567,6 @@ static int mmc_init_card(struct mmc_host
> *host, u32 ocr,
> */
> if (!(host->caps &
> MMC_CAP_BUS_WIDTH_TEST))
> break;
> - mmc_set_bus_width_ddr(card->host,
> -
> bus_width, MMC_SDR_MODE);
> err = mmc_bus_test(card, bus_width);
> if (!err)
> break;
> --
> 1.7.3.5
>
>
>
> On Jan 18, 2011, at 4:36 PM, Tomoya MORINAGA wrote:
>
> > Hi Philip,
> >
> > On Wednesday, December 01, 2010 10:31 AM, Philip Rakity wrote:
> > > Thanks very much, I'll plan on sending this to Linus
> tomorrow, along
> > > with the rest of my .37 queue, unless there are any more review
> > > comments from anyone.
> >
> > We tried to use the MMC card like the following on kernel-2.6.37.
> >
> > On Tuesday, November 09, 2010 2:40 PM, Tomoya MORINAGA wrote:
> > > I am facing the issue about some MMC cards on Intel EG20T PCH
> > > (Platform Controller Hub).
> > > The linux version is 2.6.36.
> > > I can not transfer data the MMC cards (e.g. Transcned MMC card).
> > > The card is 1 bit bus width. And the card is according to MMC
> > > specification V3.x.
> > > And the EG20T has a 4 bit bus width capability Linux MMC
> > > standard driver decides the card bus width as 4 bit, if the
> > > MMC specification version is larger than or equal to V4.0
> like below.
> >
> > However it seems the issue remains to be seen.
> > Have you fixed the MMC unrecognized issue in kernel-2.6.37?
> >
> > Thanks,
> > -----------------------------------------
> > Tomoya MORINAGA
> > OKI SEMICONDUCTOR CO., LTD.
>
Download attachment "mmc_log" of type "application/octet-stream" (123714 bytes)
Powered by blists - more mailing lists