mmc: sdhci: fix the wrong operation when response type is R1b

When response type is R1b, mask value is added the SDHCI_INT_DAT_END. but in while(), didn't check that flag.
So sdhci controller didn't work fine.
CMD6 didn't always complete.

Signed-off-by Jaehoon Chung <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
?drivers/mmc/sdhci.c | ? 33 +++++++++++++++++++++++---------- ?1 files changed, 23 insertions(+), 10 deletions(-)

drivers/mmc/sdhci.c +2 -1

index fc904b5..0dd08b9 100644
@@ -124,10 +124,11 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 ?{
 ? ? ? ?struct sdhci_host *host = (struct sdhci_host *)mmc->priv;
 ? ? ? ?unsigned int stat = 0;
- ? ? ? int ret = 0;
+ ? ? ? int i, ret = 0;
 ? ? ? ?int trans_bytes = 0, is_aligned = 1;
 ? ? ? ?u32 mask, flags, mode;
 ? ? ? ?unsigned int timeout, start_addr = 0;
+ ? ? ? unsigned int retry = 10000;
 

? ? ? ?/* Wait max 10 ms */
? ? ? ?timeout = 10;

drivers/mmc/sdhci.c +0 -0

@@ -206,19 +207,31 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 ? ? ? ?flush_cache(start_addr, trans_bytes);

?#endif
? ? ? ?sdhci_writew(host, SDHCI_MAKE_CMD(cmd->cmdidx, flags), SDHCI_COMMAND);
- ? ? ? do {
+

+ ? ? ? for (i = 0; i < retry; i++) {
? ? ? ? ? ? ? ?stat = sdhci_readl(host, SDHCI_INT_STATUS);
- ? ? ? ? ? ? ? if (stat & SDHCI_INT_ERROR)
+ ? ? ? ? ? ? ? if (stat & (SDHCI_INT_RESPONSE | SDHCI_INT_DATA_END)) {
+ ? ? ? ? ? ? ? ? ? ? ? sdhci_cmd_done(host, cmd);
+ ? ? ? ? ? ? ? ? ? ? ? sdhci_writel(host, mask, SDHCI_INT_STATUS);
+ ? ? ? ? ? ? ? ? ? ? ? if (!data) {
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? sdhci_writel(host, stat, ?SDHCI_INT_STATUS);

+ ? ? ? ? ? ? ? ? ? ? ? }
? ? ? ? ? ? ? ? ? ? ? ?break;
- ? ? ? } while ((stat & mask) != mask);
+ ? ? ? ? ? ? ? }
+ ? ? ? }

- ? ? ? if ((stat & (SDHCI_INT_ERROR | mask)) == mask) {
- ? ? ? ? ? ? ? sdhci_cmd_done(host, cmd);
- ? ? ? ? ? ? ? sdhci_writel(host, mask, SDHCI_INT_STATUS);
- ? ? ? } else
- ? ? ? ? ? ? ? ret = -1;
+ ? ? ? if (i == retry) {
+ ? ? ? ? ? ? ? printf("%s: waiting for status update\n",__func__);
+ ? ? ? ? ? ? ? return TIMEOUT;
+ ? ? ? }
+
+ ? ? ? if (stat & SDHCI_INT_TIMEOUT) {
+ ? ? ? ? ? ? ? return TIMEOUT;
+ ? ? ? } else if (stat & SDHCI_INT_ERROR) {
+ ? ? ? ? ? ? ? return -1;
+ ? ? ? }

- ? ? ? if (!ret && data)
+ ? ? ? if (data)
? ? ? ? ? ? ? ?ret = sdhci_transfer_data(host, data, start_addr);

? ? ? ?stat = sdhci_readl(host, SDHCI_INT_STATUS);

Hi Jaehoon,

Quoted 4 lines · Jaehoon Chung

When response type is R1b, mask value is added the SDHCI_INT_DAT_END. but in while(), didn't check that flag.
So sdhci controller didn't work fine.
CMD6 didn't always complete.

Could you elaborate it more in details?

        do {
                stat = sdhci_readl(host, SDHCI_INT_STATUS);
                if (stat & SDHCI_INT_ERROR)
                        break;
        } while ((stat & mask) != mask);

Here in the while condition, if the status read out don't contain all mask, then the looping would continue.
Do you mean you just need a retry max time set here?

Quoted 34 lines

Signed-off-by Jaehoon Chung <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 drivers/mmc/sdhci.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

drivers/mmc/sdhci.c +4 -2

index fc904b5..0dd08b9 100644
@@ -124,10 +124,11 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 {
       struct sdhci_host *host = (struct sdhci_host *)mmc->priv;
       unsigned int stat = 0;
-       int ret = 0;
+       int i, ret = 0;
       int trans_bytes = 0, is_aligned = 1;
       u32 mask, flags, mode;
       unsigned int timeout, start_addr = 0;
+       unsigned int retry = 10000;
 
       /* Wait max 10 ms */
       timeout = 10;

@@ -206,19 +207,31 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
       flush_cache(start_addr, trans_bytes);
 #endif
       sdhci_writew(host, SDHCI_MAKE_CMD(cmd->cmdidx, flags), SDHCI_COMMAND);
-       do {
+
+       for (i = 0; i < retry; i++) {
               stat = sdhci_readl(host, SDHCI_INT_STATUS);

drivers/mmc/sdhci.c int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, · line 217

Quoted 6 lines

drivers/mmc/sdhci.c +5 -1

-               if (stat & SDHCI_INT_ERROR)
+               if (stat & (SDHCI_INT_RESPONSE | SDHCI_INT_DATA_END)) {
+                       sdhci_cmd_done(host, cmd);
+                       sdhci_writel(host, mask, SDHCI_INT_STATUS);
+                       if (!data) {
+                               sdhci_writel(host, stat,  SDHCI_INT_STATUS);

Why do two write?

Hi Lei.

First, thanks for implemented the generic sdhci controller.

Quoted 9 lines

Hi Jaehoon,

Quoted 4 lines · Jaehoon Chung

When response type is R1b, mask value is added the SDHCI_INT_DAT_END. but in while(), didn't check that flag.
So sdhci controller didn't work fine.
CMD6 didn't always complete.

Quoted 9 lines

Could you elaborate it more in details?
? ? ? ? do {
? ? ? ? ? ? ? ? stat = sdhci_readl(host, SDHCI_INT_STATUS);
? ? ? ? ? ? ? ? if (stat & SDHCI_INT_ERROR)
? ? ? ? ? ? ? ? ? ? ? ? break;
? ? ? ? } while ((stat & mask) != mask);
Here in the while condition, if the status read out don't contain all mask, then the looping would continue.
Do you mean you just need a retry max time set here?

I found that didn't initialize the eMMC card.
Because when send CMD6, running infinite loop in there. CMD6's mask is set to SDHCI_INT_RESPONSE and SDHCI_INT_DATA_END. (Because response type is R1B).
Then mask value maybe is 0x3...
stat = sdhci_readl(host, SDHCI_INT_STATUS);
stat is 0x1.(cmd is done response).
but in while(), stat & mask is 0x1, and mask is 0x3. ...doing while().
If just add the timeout, then always produced the timeout error.

How did you test? Is initialize the eMMC card?
(I tested with eMMC4.41 (exynos4).)

Quoted 35 lines

Quoted 35 lines

Signed-off-by Jaehoon Chung <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
?drivers/mmc/sdhci.c | ? 33 +++++++++++++++++++++++---------- ?1 files changed, 23 insertions(+), 10 deletions(-)

drivers/mmc/sdhci.c +2 -1

index fc904b5..0dd08b9 100644
@@ -124,10 +124,11 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 ?{
 ? ? ? ?struct sdhci_host *host = (struct sdhci_host *)mmc->priv;
 ? ? ? ?unsigned int stat = 0;
- ? ? ? int ret = 0;
+ ? ? ? int i, ret = 0;
 ? ? ? ?int trans_bytes = 0, is_aligned = 1;
 ? ? ? ?u32 mask, flags, mode;
 ? ? ? ?unsigned int timeout, start_addr = 0;
+ ? ? ? unsigned int retry = 10000;
 

? ? ? ?/* Wait max 10 ms */
? ? ? ?timeout = 10;

drivers/mmc/sdhci.c +0 -0

@@ -206,19 +207,31 @@ int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 ? ? ? ?flush_cache(start_addr, trans_bytes);

?#endif
? ? ? ?sdhci_writew(host, SDHCI_MAKE_CMD(cmd->cmdidx, flags), SDHCI_COMMAND);
- ? ? ? do {
+
+ ? ? ? for (i = 0; i < retry; i++) {
? ? ? ? ? ? ? ?stat = sdhci_readl(host, SDHCI_INT_STATUS);

Quoted 8 lines

Quoted 6 lines

- ? ? ? ? ? ? ? if (stat & SDHCI_INT_ERROR)
+ ? ? ? ? ? ? ? if (stat & (SDHCI_INT_RESPONSE | SDHCI_INT_DATA_END)) {
+ ? ? ? ? ? ? ? ? ? ? ? sdhci_cmd_done(host, cmd);
+ ? ? ? ? ? ? ? ? ? ? ? sdhci_writel(host, mask, SDHCI_INT_STATUS);
+ ? ? ? ? ? ? ? ? ? ? ? if (!data) {
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? sdhci_writel(host, stat, ?SDHCI_INT_STATUS);

Why do two write?

We can remove the sdhci_writel(host, mask SDHCI_INT_STATUS). It's my mistake..i will fix that.

Best Regards,
Jaehoon Chung

Hi Jaehoon,

Quoted 3 lines · Jaehoon Chung

Hi Lei.

First, thanks for implemented the generic sdhci controller.

It is my pleasure to share this common code, and I'm glad that it is used for other platforms now. :)

Quoted 21 lines · Lei Wen

Quoted 10 lines

Hi Jaehoon,

Quoted 4 lines · Jaehoon Chung

When response type is R1b, mask value is added the SDHCI_INT_DAT_END. but in while(), didn't check that flag.
So sdhci controller didn't work fine.
CMD6 didn't always complete.

Could you elaborate it more in details?

Quoted 8 lines

        do {
                stat = sdhci_readl(host, SDHCI_INT_STATUS);
                if (stat & SDHCI_INT_ERROR)
                        break;
        } while ((stat & mask) != mask);

Here in the while condition, if the status read out don't contain all mask, then the looping would continue.
Do you mean you just need a retry max time set here?

Quoted 10 lines

I found that didn't initialize the eMMC card.
Because when send CMD6, running infinite loop in there. CMD6's mask is set to SDHCI_INT_RESPONSE and SDHCI_INT_DATA_END. (Because response type is R1B).
Then mask value maybe is 0x3...
stat = sdhci_readl(host, SDHCI_INT_STATUS);
stat is 0x1.(cmd is done response).
but in while(), stat & mask is 0x1, and mask is 0x3. ...doing while().
If just add the timeout, then always produced the timeout error.

I see your problems. Your silicon only provide SDHCI_INT_RESPONSE for r1b, while the standard
sdhci spec require both the flag is set when the r1b command is finished. So my point is you could add a quirk condition check in the previously endless loop checking.
If the quirk is true, and timeout count is met, then you could jump out of original looping.
And for later checking, this timeout could be regarded as no error, since the controller would never
return the SDHCI_INT_DATA_END in your case.

Quoted 4 lines

How did you test? Is initialize the eMMC card?
(I tested with eMMC4.41 (exynos4).)

I test on many Marvell platforms, with sd, mmc, emmc, they all works fine.

Quoted 1 line

Quoted 42 lines · Lei Wen

Hi Jaehoon,

Quoted 3 lines · Jaehoon Chung

Hi Lei.

First, thanks for implemented the generic sdhci controller.

It is my pleasure to share this common code, and I'm glad that it is used for other platforms now. :)

Quoted 21 lines · Lei Wen

Quoted 9 lines

Hi Jaehoon,

Quoted 4 lines · Jaehoon Chung

When response type is R1b, mask value is added the SDHCI_INT_DAT_END. but in while(), didn't check that flag.
So sdhci controller didn't work fine.
CMD6 didn't always complete.

Quoted 9 lines

Could you elaborate it more in details?
? ? ? ? do {
? ? ? ? ? ? ? ? stat = sdhci_readl(host, SDHCI_INT_STATUS);
? ? ? ? ? ? ? ? if (stat & SDHCI_INT_ERROR)
? ? ? ? ? ? ? ? ? ? ? ? break;
? ? ? ? } while ((stat & mask) != mask);
Here in the while condition, if the status read out don't contain all mask, then the looping would continue.
Do you mean you just need a retry max time set here?

Quoted 10 lines

I found that didn't initialize the eMMC card.
Because when send CMD6, running infinite loop in there. CMD6's mask is set to SDHCI_INT_RESPONSE and SDHCI_INT_DATA_END. (Because response type is R1B).
Then mask value maybe is 0x3...
stat = sdhci_readl(host, SDHCI_INT_STATUS);
stat is 0x1.(cmd is done response).
but in while(), stat & mask is 0x1, and mask is 0x3. ...doing while().
If just add the timeout, then always produced the timeout error.

Quoted 10 lines

I see your problems. Your silicon only provide SDHCI_INT_RESPONSE for r1b, while the standard
sdhci spec require both the flag is set when the r1b command is finished. So my point is you could add a quirk condition check in the previously endless loop checking.
If the quirk is true, and timeout count is met, then you could jump out of original looping.
And for later checking, this timeout could be regarded as no error, since the controller would never
return the SDHCI_INT_DATA_END in your case.

Anyway it's need that use the timeout value. right?

And in our case, It's means that use the quirks?

I didn't find that the sdhci spec require the flag is set when the r1b command is finished. where is specified?

I just understand that the transfer complete bit should be set to 1, when send the command with busy flag or read/write with data. Is this means?

If you want to use the quirks, i will test with applied your opinion.

Best Regards,
Jaehoon Chung

Hi Jaehoon,

Quoted 56 lines · Jaehoon Chung

Quoted 42 lines · Lei Wen

Hi Jaehoon,

Quoted 3 lines · Jaehoon Chung

Hi Lei.

First, thanks for implemented the generic sdhci controller.

It is my pleasure to share this common code, and I'm glad that it is used for other platforms now. :)

Quoted 21 lines · Lei Wen

Quoted 9 lines

Hi Jaehoon,

Quoted 4 lines · Jaehoon Chung

When response type is R1b, mask value is added the SDHCI_INT_DAT_END. but in while(), didn't check that flag.
So sdhci controller didn't work fine.
CMD6 didn't always complete.

Quoted 9 lines

Could you elaborate it more in details?
? ? ? ? do {
? ? ? ? ? ? ? ? stat = sdhci_readl(host, SDHCI_INT_STATUS);
? ? ? ? ? ? ? ? if (stat & SDHCI_INT_ERROR)
? ? ? ? ? ? ? ? ? ? ? ? break;
? ? ? ? } while ((stat & mask) != mask);
Here in the while condition, if the status read out don't contain all mask, then the looping would continue.
Do you mean you just need a retry max time set here?

Quoted 10 lines

I found that didn't initialize the eMMC card.
Because when send CMD6, running infinite loop in there. CMD6's mask is set to SDHCI_INT_RESPONSE and SDHCI_INT_DATA_END. (Because response type is R1B).
Then mask value maybe is 0x3...
stat = sdhci_readl(host, SDHCI_INT_STATUS);
stat is 0x1.(cmd is done response).
but in while(), stat & mask is 0x1, and mask is 0x3. ...doing while().
If just add the timeout, then always produced the timeout error.

Quoted 10 lines

I see your problems. Your silicon only provide SDHCI_INT_RESPONSE for r1b, while the standard
sdhci spec require both the flag is set when the r1b command is finished. So my point is you could add a quirk condition check in the previously endless loop checking.
If the quirk is true, and timeout count is met, then you could jump out of original looping.
And for later checking, this timeout could be regarded as no error, since the controller would never
return the SDHCI_INT_DATA_END in your case.

Quoted 1 line

Anyway it's need that use the timeout value. right?

Yes, for the timeout patch here, I am ok with that.

Quoted 1 line

And in our case, It's means that use the quirks?

Using quirks, or set a timeout value large enough? Maybe latter is more generic. :)

Quoted 2 lines

I didn't find that the sdhci spec require the flag is set when the r1b command is finished. where is specified?

The spec I mention is
https://www.sdcard.org/developers/overview/host_controller/simple_spec/Simplified_SD_Host_Controller_Spec.pdf
You could look at page 64, the bit description for "Transfer Complete":
(3) In the case of a command with busy
This bit is set when busy is de-asserted. Refer to DAT Line Active and Command Inhibit (DAT) in the Present State register

Quoted 3 lines

I just understand that the transfer complete bit should be set to 1, when send the command with busy flag or read/write with data. Is this means?

Yes, that is what I means, if you send a command with r1b flag, then you should expect both
transfer complete and command complete bit is set, only command complete bit set doesn't mean
your command is safely treated, and you could do the next step further.

Quoted 2 lines

If you want to use the quirks, i will test with applied your opinion.

I think you only need to add timeout into this while looping, and not touching other code.
? ? ? ?do {
? ? ? ? ? ? ? ?stat = sdhci_readl(host, SDHCI_INT_STATUS); ? ? ? ? ? ? ? ?if (stat & SDHCI_INT_ERROR)
? ? ? ? ? ? ? ? ? ? ? ?break;
? ? ? ?} while ((stat & mask) != mask);

Quoted 3 lines

Best Regards,
Jaehoon Chung

Thanks,
Lei
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Hi Lei.

I will try to ?test with ?your opinion.
Just wondering..If apply with my patch, is it something problem?

Anyway i will test and share the result. then resend the patch.

I want to use the generic sdhci code.

Best Regards,
Jaehoon Chung