regression: sd cards no longer recognized

regression: sd cards no longer recognized

[Alexander Elbs]

Hi,

on a dell vostro with an integrated SD card reader I have the problem, that
inserted SD cards are no longer recognized.
The reader is a "O2 Micro, Inc. Integrated MMC/SD Controller (rev 02)"
(1217:7120).

Doing a git bisect I found that commit 49c468f "mmc: sd: add support for uhs
bus speed mode selection" caused this regression.

Looking more closely into it I found that the flag SDHCI_CTRL_HISPD is always
set even on MMC_TIMING_UHS_SDR12 (which is an alias for MMC_TIMING_LEGACY).

If that flag in that case is not set (as was before commit 49c468f) my reader
works fine again.

Could you include that fix or does it break other readers?

Regards,
Alexander Elbs

---
 drivers/mmc/host/sdhci.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6d8eea3..8872e92 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1364,8 +1364,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host,
struct mmc_ios *ios)
                if ((ios->timing == MMC_TIMING_UHS_SDR50) ||
                    (ios->timing == MMC_TIMING_UHS_SDR104) ||
                    (ios->timing == MMC_TIMING_UHS_DDR50) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR25) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR12))
+                   (ios->timing == MMC_TIMING_UHS_SDR25))
                        ctrl |= SDHCI_CTRL_HISPD;
 
                ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
-- 
Alexander Elbs  ***  eMail alex@segv.de

Re: regression: sd cards no longer recognized

[Chris Ball]

Hi Alexander,

On Sun, Jan 01 2012, Alexander Elbs wrote:
> Hi,
>
> on a dell vostro with an integrated SD card reader I have the problem, that
> inserted SD cards are no longer recognized.
> The reader is a "O2 Micro, Inc. Integrated MMC/SD Controller (rev 02)"
> (1217:7120).
>
> Doing a git bisect I found that commit 49c468f "mmc: sd: add support for uhs
> bus speed mode selection" caused this regression.
>
> Looking more closely into it I found that the flag SDHCI_CTRL_HISPD is always
> set even on MMC_TIMING_UHS_SDR12 (which is an alias for MMC_TIMING_LEGACY).
>
> If that flag in that case is not set (as was before commit 49c468f) my reader
> works fine again.
>
> Could you include that fix or does it break other readers?
>
> Regards,
> Alexander Elbs
>
> ---
>  drivers/mmc/host/sdhci.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 6d8eea3..8872e92 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1364,8 +1364,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host,
> struct mmc_ios *ios)
>                 if ((ios->timing == MMC_TIMING_UHS_SDR50) ||
>                     (ios->timing == MMC_TIMING_UHS_SDR104) ||
>                     (ios->timing == MMC_TIMING_UHS_DDR50) ||
> -                   (ios->timing == MMC_TIMING_UHS_SDR25) ||
> -                   (ios->timing == MMC_TIMING_UHS_SDR12))
> +                   (ios->timing == MMC_TIMING_UHS_SDR25))
>                         ctrl |= SDHCI_CTRL_HISPD;
>  
>                 ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);

Thanks for the report -- adding Arindam and Philip to CC for comments.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: regression: sd cards no longer recognized

[Philip Rakity]

Ack-by: Philip Rakity <prakity@marvell.com>

On Jan 2, 2012, at 4:29 PM, Chris Ball wrote:

> Hi Alexander,
> 
> On Sun, Jan 01 2012, Alexander Elbs wrote:
>> Hi,
>> 
>> on a dell vostro with an integrated SD card reader I have the problem, that
>> inserted SD cards are no longer recognized.
>> The reader is a "O2 Micro, Inc. Integrated MMC/SD Controller (rev 02)"
>> (1217:7120).
>> 
>> Doing a git bisect I found that commit 49c468f "mmc: sd: add support for uhs
>> bus speed mode selection" caused this regression.
>> 
>> Looking more closely into it I found that the flag SDHCI_CTRL_HISPD is always
>> set even on MMC_TIMING_UHS_SDR12 (which is an alias for MMC_TIMING_LEGACY).
>> 
>> If that flag in that case is not set (as was before commit 49c468f) my reader
>> works fine again.
>> 
>> Could you include that fix or does it break other readers?
>> 
>> Regards,
>> Alexander Elbs
>> 
>> ---
>> drivers/mmc/host/sdhci.c |    3 +--
>> 1 files changed, 1 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index 6d8eea3..8872e92 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -1364,8 +1364,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host,
>> struct mmc_ios *ios)
>>                if ((ios->timing == MMC_TIMING_UHS_SDR50) ||
>>                    (ios->timing == MMC_TIMING_UHS_SDR104) ||
>>                    (ios->timing == MMC_TIMING_UHS_DDR50) ||
>> -                   (ios->timing == MMC_TIMING_UHS_SDR25) ||
>> -                   (ios->timing == MMC_TIMING_UHS_SDR12))
>> +                   (ios->timing == MMC_TIMING_UHS_SDR25))
>>                        ctrl |= SDHCI_CTRL_HISPD;
>> 
>>                ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
> 
> Thanks for the report -- adding Arindam and Philip to CC for comments.
> 
> - Chris.
> -- 
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child

Re: regression: sd cards no longer recognized

[Chris Ball]

Hi,

On Mon, Jan 02 2012, Philip Rakity wrote:
> Ack-by: Philip Rakity <prakity@marvell.com>

Thanks.  Alexander, could you give me a "Signed-off-by:" for the record?

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

Re: regression: sd cards no longer recognized

[Alexander Elbs]

On Mon, Jan 02, 2012 at 08:24:55PM -0500, Chris Ball wrote:
> Hi,
> 
> On Mon, Jan 02 2012, Philip Rakity wrote:
> > Ack-by: Philip Rakity <prakity@marvell.com>
> 
> Thanks.  Alexander, could you give me a "Signed-off-by:" for the record?
> 


Signed-off-by: Alexander Elbs <alex@segv.de>
---
 drivers/mmc/host/sdhci.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 19ed580..5e0de61 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1364,8 +1364,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host,
struct mmc_ios *ios)
                if ((ios->timing == MMC_TIMING_UHS_SDR50) ||
                    (ios->timing == MMC_TIMING_UHS_SDR104) ||
                    (ios->timing == MMC_TIMING_UHS_DDR50) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR25) ||
-                   (ios->timing == MMC_TIMING_UHS_SDR12))
+                   (ios->timing == MMC_TIMING_UHS_SDR25))
                        ctrl |= SDHCI_CTRL_HISPD;
 
                ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
-- 
1.7.8.rc3

Re: regression: sd cards no longer recognized

[Chris Ball]

Hi,

On Tue, Jan 03 2012, Alexander Elbs wrote:
> On Mon, Jan 02, 2012 at 08:24:55PM -0500, Chris Ball wrote:
>> Hi,
>> 
>> On Mon, Jan 02 2012, Philip Rakity wrote:
>> > Ack-by: Philip Rakity <prakity@marvell.com>
>> 
>> Thanks.  Alexander, could you give me a "Signed-off-by:" for the record?
>
> Signed-off-by: Alexander Elbs <alex@segv.de>

Pushed to mmc-next for 3.3 with a stable@ tag, with ACKs from Philip and
Arindam.  Thanks very much for tracking this down, Alexander!

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

RE: regression: sd cards no longer recognized

[Nath, Arindam]

Acked-by: Arindam Nath <arindam.nath@amd.com>

> -----Original Message-----
> From: Philip Rakity [mailto:prakity@marvell.com]
> Sent: Tuesday, January 03, 2012 6:54 AM
> To: Chris Ball
> Cc: Alexander Elbs; Nath, Arindam; linux-mmc@vger.kernel.org
> Subject: Re: regression: sd cards no longer recognized
> 
> 
> Ack-by: Philip Rakity <prakity@marvell.com>
> 
> On Jan 2, 2012, at 4:29 PM, Chris Ball wrote:
> 
> > Hi Alexander,
> >
> > On Sun, Jan 01 2012, Alexander Elbs wrote:
> >> Hi,
> >>
> >> on a dell vostro with an integrated SD card reader I have the
> problem, that
> >> inserted SD cards are no longer recognized.
> >> The reader is a "O2 Micro, Inc. Integrated MMC/SD Controller (rev
> 02)"
> >> (1217:7120).
> >>
> >> Doing a git bisect I found that commit 49c468f "mmc: sd: add support
> for uhs
> >> bus speed mode selection" caused this regression.
> >>
> >> Looking more closely into it I found that the flag SDHCI_CTRL_HISPD
> is always
> >> set even on MMC_TIMING_UHS_SDR12 (which is an alias for
> MMC_TIMING_LEGACY).
> >>
> >> If that flag in that case is not set (as was before commit 49c468f)
> my reader
> >> works fine again.
> >>
> >> Could you include that fix or does it break other readers?
> >>
> >> Regards,
> >> Alexander Elbs
> >>
> >> ---
> >> drivers/mmc/host/sdhci.c |    3 +--
> >> 1 files changed, 1 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> >> index 6d8eea3..8872e92 100644
> >> --- a/drivers/mmc/host/sdhci.c
> >> +++ b/drivers/mmc/host/sdhci.c
> >> @@ -1364,8 +1364,7 @@ static void sdhci_do_set_ios(struct sdhci_host
> *host,
> >> struct mmc_ios *ios)
> >>                if ((ios->timing == MMC_TIMING_UHS_SDR50) ||
> >>                    (ios->timing == MMC_TIMING_UHS_SDR104) ||
> >>                    (ios->timing == MMC_TIMING_UHS_DDR50) ||
> >> -                   (ios->timing == MMC_TIMING_UHS_SDR25) ||
> >> -                   (ios->timing == MMC_TIMING_UHS_SDR12))
> >> +                   (ios->timing == MMC_TIMING_UHS_SDR25))
> >>                        ctrl |= SDHCI_CTRL_HISPD;
> >>
> >>                ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
> >
> > Thanks for the report -- adding Arindam and Philip to CC for
> comments.
> >
> > - Chris.
> > --
> > Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> > One Laptop Per Child
>