mmc: Test bus-width for old MMC devices (v2)
PATCH 1/1 mmc: Test bus-width for old MMC devices (v2)
From: Aries Lee <[email protected]>
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]
v1->v2:
- Rebased to the code with DDR support, set DDR bit properly
- Return always error when bus-switching fallback failed
- Define MMC_BUS_TEST_{R|W} in linux/mmc/mmc.h
- Add quirk MMC_CAP_BUS_WIDTH_TEST -- default not used for compatibility
- Ignore errors on BUS_TEST_W -- improves chances test will work
---
Chris, this is a revised version of the patch. Philip merged his patch into this version and tested. Please apply.
drivers/mmc/core/mmc.c | 76 ++++++++++++++++++++------------ drivers/mmc/core/mmc_ops.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ 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, 160 insertions(+), 30 deletions(-)
drivers/mmc/core/mmc.c +47 -29
@@ -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; + +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 linux +*/ +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); } }
drivers/mmc/core/mmc_ops.c +102 -0
105 lines not on this page · raw message
drivers/mmc/core/mmc_ops.h +1 -0
@@ -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
drivers/mmc/host/sdhci.c +6 -1
@@ -23,6 +23,7 @@#include <linux/leds.h> +#include <linux/mmc/mmc.h> #include <linux/mmc/host.h> #include "sdhci.h"
@@ -1518,7 +1519,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));
drivers/mmc/host/sdhci.h +1 -0
@@ -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
include/linux/mmc/host.h +1 -0
@@ -169,6 +169,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 */
include/linux/mmc/mmc.h +2 -0
@@ -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 */
Signature · 1 line
1.7.3.1
PATCH 1/1 mmc: Enable bus-width tests on SDHCI host
Let's enable the new bus-width tests on SDHCI hosts unless 1-bit data is set forcibly.
---
This is a patch to be applied after
"mmc: Test bus-width for old MMC devices (v2)"
drivers/mmc/host/sdhci.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/mmc/host/sdhci.c +3 -1
@@ -1888,8 +1888,10 @@ int sdhci_add_host(struct sdhci_host *host)* their platform code before calling sdhci_add_host(), and we * won't assume 8-bit width for hosts without that CAP. */ -if (!(host->quirks &SDHCI_QUIRK_FORCE_1_BIT_DATA )) +if (!(host->quirks &SDHCI_QUIRK_FORCE_1_BIT_DATA )) { mmc->caps |=MMC_CAP_4_BIT_DATA ; + mmc->caps |=MMC_CAP_BUS_WIDTH_TEST ; + }if (caps &SDHCI_CAN_DO_HISPD ) mmc->caps |=MMC_CAP_SD_HIGHSPEED |MMC_CAP_MMC_HIGHSPEED ;
Signature · 1 line
1.7.3.1
Re: [PATCH] mmc: Enable bus-width tests on SDHCI host
At Wed, 15 Dec 2010 14:17:27 +0100,
Quoted 5 lines · Takashi Iwai
Let's enable the new bus-width tests on SDHCI hosts unless 1-bit data is set forcibly.
Signed-off-by Takashi Iwai <[email protected]>
Please drop this patch.
After a short discussion with Philip, we concluded that it's safer to enable in individual platform side.
I'll send a patch for enabling the feature for JMicron chips later again.
thanks,
Takashi
Quoted 28 lines
---
This is a patch to be applied after
"mmc: Test bus-width for old MMC devices (v2)"drivers/mmc/host/sdhci.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)drivers/mmc/host/sdhci.c +3
-1@@ -1888,8 +1888,10 @@ int sdhci_add_host(struct sdhci_host *host)* their platform code before calling sdhci_add_host(), and we * won't assume 8-bit width for hosts without that CAP. */ -if (!(host->quirks &SDHCI_QUIRK_FORCE_1_BIT_DATA )) +if (!(host->quirks &SDHCI_QUIRK_FORCE_1_BIT_DATA )) { mmc->caps |=MMC_CAP_4_BIT_DATA ; + mmc->caps |=MMC_CAP_BUS_WIDTH_TEST ; + }if (caps &SDHCI_CAN_DO_HISPD ) mmc->caps |=MMC_CAP_SD_HIGHSPEED |MMC_CAP_MMC_HIGHSPEED ;Signature · 1 line
1.7.3.1
PATCH 1/1 mmc/sdhci: Enable bus-width test for JMicron controllers
---
This is a patch to be applied after
"mmc: Test bus-width for old MMC devices (v2)"
and a replacement for the previous "mmc: Enable bus-width tests on SDHCI host" patch. Instead of enabling all for sdhci, this one turns on the feature only for JMicron, just to be safer.
drivers/mmc/host/sdhci-pci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-pci.c +2 -0
@@ -381,6 +381,8 @@ static int jmicron_probe_slot(struct sdhci_pci_slot *slot) slot->chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB388_ESD)jmicron_enable_mmc (slot->host,1 ); + slot->host->mmc->caps |=MMC_CAP_BUS_WIDTH_TEST ; +return 0 ; }
Signature · 1 line
1.7.3.1
Re: [PATCH] mmc/sdhci: Enable bus-width test for JMicron controllers
Hi Takashi,
Quoted 20 lines · Takashi Iwai
Signed-off-by Takashi Iwai <[email protected]>---
This is a patch to be applied after
"mmc: Test bus-width for old MMC devices (v2)"and a replacement for the previous "mmc: Enable bus-width tests on SDHCI host" patch. Instead of enabling all for sdhci, this one turns on the feature only for JMicron, just to be safer.
drivers/mmc/host/sdhci-pci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)drivers/mmc/host/sdhci-pci.c +0
-0
drivers/mmc/host/sdhci-pci.c static int jmicron_probe_slot(struct sdhci_pci_slot *slot) · line 388
Quoted 8 lines
drivers/mmc/host/sdhci-pci.c +2
-0@@ -381,6 +381,8 @@ static int jmicron_probe_slot(struct sdhci_pci_slot *slot) slot->chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB388_ESD)jmicron_enable_mmc (slot->host,1 ); + slot->host->mmc->caps |=MMC_CAP_BUS_WIDTH_TEST ; +return 0 ; }
Thanks, pushed to mmc-next.
(Do others on the list agree that bus-width testing should be whitelisted per-host like this?)
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Hi Takashi,
Quoted 16 lines · Takashi Iwai
From: Aries Lee <[email protected]>
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]
v1->v2:
- Rebased to the code with DDR support, set DDR bit properly
- Return always error when bus-switching fallback failed
- Define MMC_BUS_TEST_{R|W} inlinux/mmc/mmc.h
- Add quirkMMC_CAP_BUS_WIDTH_TEST-- default not used for compatibility
- Ignore errors onBUS_TEST_W-- improves chances test will work
Quoted 4 lines
Signed-off-by Aries Lee <[email protected]>Signed-off-by Takashi Iwai <[email protected]>Signed-off-by Philip Rakity <[email protected]>Tested-by Philip Rakity <[email protected]>
This looks good, but adds a warning:
drivers/mmc/core/mmc.c: In function ‘mmc_init_card’:drivers/mmc/core/mmc.c:547: warning: ‘bus_width’ may be used uninitialized in this function
Thanks,
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Chris,
It is not possible for bus_width to be not initialized. This would imply ARRAY_SIZE(bus_widths) is 1. Certainly not true. We could just initialize by changing
+ unsigned idx, bus_width;
to
+ unsigned idx, bus_width = 0;
I wonder what compiler are you using so we can avoid this issue in future.
Philip
+ 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;
+
+ 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 */
Quoted 34 lines · Chris Ball
Hi Takashi,
Quoted 16 lines · Takashi Iwai
From: Aries Lee <[email protected]>
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]
v1->v2:
- Rebased to the code with DDR support, set DDR bit properly
- Return always error when bus-switching fallback failed
- Define MMC_BUS_TEST_{R|W} inlinux/mmc/mmc.h
- Add quirkMMC_CAP_BUS_WIDTH_TEST-- default not used for compatibility
- Ignore errors onBUS_TEST_W-- improves chances test will workQuoted 4 lines
Signed-off-by Aries Lee <[email protected]>Signed-off-by Takashi Iwai <[email protected]>Signed-off-by Philip Rakity <[email protected]>Tested-by Philip Rakity <[email protected]>This looks good, but adds a warning:
drivers/mmc/core/mmc.c: In function ‘mmc_init_card’:drivers/mmc/core/mmc.c:547: warning: ‘bus_width’ may be used uninitialized in this functionThanks,
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Hi Philip,
Quoted 1 line · Philip Rakity
It is not possible for
bus_widthto be not initialized. This would implyARRAY_SIZE(bus_widths)is 1. Certainly not true.
Right, I agree. We should fix the warning anyway.
Review
Quoted 4 lines
We could just initialize by changing
drivers/mmc/core/mmc.c +1
-0+unsigned idx, bus_width;to
(quoted diff) +1
-0+ unsigned idx, bus_width = 0;
Okay, I've pushed to mmc-next with that change.
Quoted 1 line
I wonder what compiler are you using so we can avoid this issue in future.
Ah, good point -- I was building with a gcc 4.1.2 ARM cross-compiler, and using a gcc 4.5.1 cross-build instead avoids the warning.
Thanks,
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
At Fri, 17 Dec 2010 03:43:42 +0000,
Quoted 7 lines · Chris Ball
Hi Philip,
Quoted 1 line · Philip Rakity
It is not possible for
bus_widthto be not initialized. This would implyARRAY_SIZE(bus_widths)is 1. Certainly not true.Right, I agree. We should fix the warning anyway.
Well, this is always a gray-zone question. One prefers fixing it either via uninitialized_var() or by setting a bogus value. But, this would cover any possible real bug in future. Thus another prefers ignoring it, because it's just a compiler bug (mostly of old gcc).
After all, it's up to maintainer, so take as you like :)
thanks,
Takashi
Quoted 18 lines
Review
Quoted 4 lines
We could just initialize by changing
drivers/mmc/core/mmc.c +1
-0+unsigned idx, bus_width;to
(quoted diff) +1
-0+ unsigned idx, bus_width = 0;Okay, I've pushed to mmc-next with that change.
Quoted 1 line
I wonder what compiler are you using so we can avoid this issue in future.
Ah, good point -- I was building with a gcc 4.1.2 ARM cross-compiler, and using a gcc 4.5.1 cross-build instead avoids the warning.
Thanks,
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Quoted 15 lines · Takashi Iwai
At Fri, 17 Dec 2010 03:43:42 +0000,
Quoted 7 lines · Chris Ball
Hi Philip,
Quoted 1 line · Philip Rakity
It is not possible for
bus_widthto be not initialized. This would implyARRAY_SIZE(bus_widths)is 1. Certainly not true.Right, I agree. We should fix the warning anyway.
Well, this is always a gray-zone question. One prefers fixing it either via
uninitialized_var()or by setting a bogus value. But, this would cover any possible real bug in future. Thus another prefers ignoring it, because it's just a compiler bug (mostly of old gcc).
Quoted 27 lines
After all, it's up to maintainer, so take as you like :)
thanks,
Takashi
Quoted 18 lines
Quoted 4 lines
We could just initialize by changing
+ unsigned idx,bus_width;
to
+ unsigned idx,bus_width= 0;Okay, I've pushed to mmc-next with that change.
Quoted 1 line
I wonder what compiler are you using so we can avoid this issue in future.
Ah, good point -- I was building with a gcc 4.1.2 ARM cross-compiler, and using a gcc 4.5.1 cross-build instead avoids the warning.
Thanks,
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child
Could you help adding this modification?
We found error happen since bus_width is not set at these condition:
1. ddr=0
2. not set MMC_CAP_BUS_WIDTH_TEST
drivers/mmc/core/mmc.c +5 -1
@@ -586,7 +586,11 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, }else if (ddr) {mmc_card_set_ddr_mode (card);mmc_set_bus_width_ddr (card->host, bus_width, ddr); - } + + }else +mmc_set_bus_width (card->host, + bus_widths[idx]); + }if (!oldcard)
Can you please try this diff and see if it works for you.
Will do formal patch after your testing. What card is failing ?
Please let me know the manufacturing information so can add card to my test suite.
Philip
drivers/mmc/core/mmc.c +4 -3
@@ -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 ;
@@ -586,7 +586,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, }else if (ddr) {mmc_card_set_ddr_mode (card);mmc_set_bus_width_ddr (card->host, bus_width, ddr); - } + }else +mmc_set_bus_width (card->host, bus_width); }if (!oldcard)
Philip
Quoted 66 lines · zhangfei gao
Quoted 15 lines · Takashi Iwai
At Fri, 17 Dec 2010 03:43:42 +0000,
Quoted 7 lines · Chris Ball
Hi Philip,
Quoted 1 line · Philip Rakity
It is not possible for
bus_widthto be not initialized. This would implyARRAY_SIZE(bus_widths)is 1. Certainly not true.Right, I agree. We should fix the warning anyway.
Well, this is always a gray-zone question. One prefers fixing it either via
uninitialized_var()or by setting a bogus value. But, this would cover any possible real bug in future. Thus another prefers ignoring it, because it's just a compiler bug (mostly of old gcc).Quoted 27 lines
After all, it's up to maintainer, so take as you like :)
thanks,
Takashi
Quoted 18 lines
Quoted 4 lines
We could just initialize by changing
+ unsigned idx,bus_width;
to
+ unsigned idx,bus_width= 0;Okay, I've pushed to mmc-next with that change.
Quoted 1 line
I wonder what compiler are you using so we can avoid this issue in future.
Ah, good point -- I was building with a gcc 4.1.2 ARM cross-compiler, and using a gcc 4.5.1 cross-build instead avoids the warning.
Thanks,
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per ChildCould you help adding this modification?
We found error happen sincebus_widthis not set at these condition:
1. ddr=0
2. not setMMC_CAP_BUS_WIDTH_TESTdrivers/mmc/core/mmc.c +5
-1@@ -586,7 +586,11 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, }else if (ddr) {mmc_card_set_ddr_mode (card);mmc_set_bus_width_ddr (card->host, bus_width, ddr); - } + + }else +mmc_set_bus_width (card->host, + bus_widths[idx]); + }if (!oldcard)
Philip Rakity
Tested-byZhangfei,
Reproduced the problem on mmp2. Fix enclosed. Slight change from Zhangfei original suggestion.
Please confirm by adding tested-by.
Philip
Quoted 1 line
From
8b35e007d67dd593ff5e8a07b564c438e8303aaeMon Sep 17 00:00:00 2001
From: Philip Rakity <[email protected]>
Date: Tue, 21 Dec 2010 11:29:33 -0800
Subject: [PATCH] mmc: fix regression testing bus width when CAP not defined
First reported by Zhangfei Gao.
set mmc bus width before checking for CAP for mmc bus width testing. set bus width when card is not ddr
--- drivers/mmc/core/mmc.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/core/mmc.c +4 -3
@@ -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 ;
@@ -586,7 +586,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, }else if (ddr) {mmc_card_set_ddr_mode (card);mmc_set_bus_width_ddr (card->host, bus_width, ddr); - } + }else +mmc_set_bus_width (card->host, bus_width); }if (!oldcard)
Signature · 1 line
1.6.0.4
Quoted 15 lines · Philip Rakity
Can you please try this diff and see if it works for you.
Will do formal patch after your testing. What card is failing ?
Please let me know the manufacturing information so can add card to my test suite.
Philip
drivers/mmc/core/mmc.c +0
-0
drivers/mmc/core/mmc.c static int mmc_init_card(struct mmc_host *host, u32 ocr, · line 562
Quoted 5 lines
drivers/mmc/core/mmc.c +2
-0@@ -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);
Test OK,
Curious why move here, then mmc_set_bus_width_ddr is called twice in fact when ddr=0 && (!(host->caps & MMC_CAP_BUS_WIDTH_TEST)), though not impact function.mmc_set_bus_width is mmc_set_bus_width_ddr(host, width, MMC_SDR_MODE).
Quoted 96 lines
drivers/mmc/core/mmc.c +2
-3/** 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;@@ -586,7 +586,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, } else if (ddr) { mmc_card_set_ddr_mode(card); mmc_set_bus_width_ddr(card->host, bus_width, ddr); - } + } else + mmc_set_bus_width (card->host, bus_width); } if (!oldcard)Philip
Quoted 66 lines · zhangfei gao
Quoted 15 lines · Takashi Iwai
At Fri, 17 Dec 2010 03:43:42 +0000,
Quoted 7 lines · Chris Ball
Hi Philip,
Quoted 1 line · Philip Rakity
It is not possible for
bus_widthto be not initialized. This would implyARRAY_SIZE(bus_widths)is 1. Certainly not true.Right, I agree. We should fix the warning anyway.
Well, this is always a gray-zone question. One prefers fixing it either via
uninitialized_var()or by setting a bogus value. But, this would cover any possible real bug in future. Thus another prefers ignoring it, because it's just a compiler bug (mostly of old gcc).Quoted 27 lines
After all, it's up to maintainer, so take as you like :)
thanks,
Takashi
Quoted 18 lines
Quoted 4 lines
We could just initialize by changing
+ unsigned idx,bus_width;
to
+ unsigned idx,bus_width= 0;Okay, I've pushed to mmc-next with that change.
Quoted 1 line
I wonder what compiler are you using so we can avoid this issue in future.
Ah, good point -- I was building with a gcc 4.1.2 ARM cross-compiler, and using a gcc 4.5.1 cross-build instead avoids the warning.
Thanks,
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per ChildCould you help adding this modification?
We found error happen sincebus_widthis not set at these condition:
1. ddr=0
2. not setMMC_CAP_BUS_WIDTH_TESTdrivers/mmc/core/mmc.c +5
-1@@ -586,7 +586,11 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, } else if (ddr) { mmc_card_set_ddr_mode(card); mmc_set_bus_width_ddr(card->host, bus_width, ddr); - } + + } else + mmc_set_bus_width(card->host, + bus_widths[idx]); + } if (!oldcard)
At Tue, 21 Dec 2010 22:56:32 -0500,
Quoted 12 lines · zhangfei gao
Quoted 10 lines · Philip Rakity
Can you please try this diff and see if it works for you.
Will do formal patch after your testing. What card is failing ?
Please let me know the manufacturing information so can add card to my test suite.
Philip
Quoted 15 lines
drivers/mmc/core/mmc.c static int mmc_init_card(struct mmc_host *host, u32 ocr, · line 562
Quoted 10 lines
drivers/mmc/core/mmc.c +2
-0@@ -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);Test OK,
Curious why move here, thenmmc_set_bus_width_ddris called twice in fact when ddr=0 && (!(host->caps &MMC_CAP_BUS_WIDTH_TEST)), though not impact function.mmc_set_bus_widthismmc_set_bus_width_ddr(host, width, MMC_SDR_MODE).
Right. How about the patch below? This one just moves the call before caps test, so it's simpler (and avoiding double calls).
thanks,
Takashi
===
From b66b9704f8d2fefa402741fb17949224b2766b4f Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 22 Dec 2010 09:54:33 +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.
--- drivers/mmc/core/mmc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/core/mmc.c +2 -2
@@ -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 ;
Signature · 1 line
1.7.3.4
Quoted 76 lines · Takashi Iwai
At Tue, 21 Dec 2010 22:56:32 -0500,
Quoted 12 lines · zhangfei gao
Quoted 10 lines · Philip Rakity
Can you please try this diff and see if it works for you.
Will do formal patch after your testing. What card is failing ?
Please let me know the manufacturing information so can add card to my test suite.
Philip
Quoted 15 lines
drivers/mmc/core/mmc.c static int mmc_init_card(struct mmc_host *host, u32 ocr, · line 562
Quoted 10 lines
drivers/mmc/core/mmc.c +2
-0@@ -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);Test OK,
Curious why move here, thenmmc_set_bus_width_ddris called twice in fact when ddr=0 && (!(host->caps &MMC_CAP_BUS_WIDTH_TEST)), though not impact function.mmc_set_bus_widthismmc_set_bus_width_ddr(host, width, MMC_SDR_MODE).Right. How about the patch below? This one just moves the call before caps test, so it's simpler (and avoiding double calls).
thanks,
Takashi
===
Fromb66b9704f8d2fefa402741fb17949224b2766b4fMon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Wed, 22 Dec 2010 09:54:33 +0100
Subject: [PATCH] mmc: fixmmc_set_bus_width_ddr()call without bus-width-test capWith the bus-width test patch, mmc_set_bus_width*() isn't called properly when the driver doesn't set
MMC_CAP_BUS_WIDTHand no DDR mode. This patch fixes the regression by moving the call up before the cap test.Signed-off-by Takashi Iwai <[email protected]>---
drivers/mmc/core/mmc.c | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)drivers/mmc/core/mmc.c +2
-3@@ -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; --
Quoted 1 line
1.7.3.4
It's also works, solve (ddr=0 & (!(host->caps & MMC_CAP_BUS_WIDTH_TEST))) issue. Is it possible to merge to original patch.
Thanks
Quoted 3 lines
Hi Takashi,
Quoted 25 lines · Takashi Iwai
Subject: [PATCH] mmc: fix
mmc_set_bus_width_ddr()call without bus-width-test capWith the bus-width test patch, mmc_set_bus_width*() isn't called properly when the driver doesn't set
MMC_CAP_BUS_WIDTHand no DDR mode. This patch fixes the regression by moving the call up before the cap test.Signed-off-by Takashi Iwai <[email protected]>--- drivers/mmc/core/mmc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)drivers/mmc/core/mmc.c +2
-0@@ -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
drivers/mmc/core/mmc.c static int mmc_init_card(struct mmc_host *host, u32 ocr, · line 572
Quoted 8 lines
drivers/mmc/core/mmc.c +0
-2@@ -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 ;
Thanks, I've pushed this fix to mmc-next now.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child