Skip to contentSkip to conversation

mmc: fix capacity calculation with high capacity mmc

PATCH New Lei Wen 6 participants 9 messages Sep 6, 2010 – Sep 24, 2010 MMC, SD and SDIO

lore
Share & tools
lore

Lei Wen

author
#0 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

According spec, high capacity mmc should be calculated by sector number multiply by sector size.

---
 drivers/mmc/mmc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/mmc/mmc.c +5 -0
index ea398a5..bb97171 100644
@@ -441,6 +441,11 @@ int mmc_change_freq(struct mmc *mmc)
 	if (!ext_csd[185])
 		return 0;
 
+	if (!IS_SD(mmc) && mmc->high_capacity) {
+		mmc->capacity = ext_csd[212] | (ext_csd[213] << 8)
+			| (ext_csd[214] << 16) | (ext_csd[215] << 24);
+		mmc->capacity *= mmc->read_bl_len;
+	}
 	/* High Speed is set, there are two types: 52MHz and 26MHz */
 	if (cardtype & MMC_HS_52MHZ)
 		mmc->card_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Dear Lei Wen,

Quoted 14 lines

According spec, high capacity mmc should be calculated by sector number multiply by sector size.

---
 drivers/mmc/mmc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/mmc/mmc.c +0 -0
index ea398a5..bb97171 100644
@@ -441,6 +441,11 @@ int mmc_change_freq(struct mmc *mmc)
 	if (!ext_csd[185])

drivers/mmc/mmc.c int mmc_change_freq(struct mmc *mmc) · line 451

Quoted 10 lines
drivers/mmc/mmc.c +5 -0
 		return 0;
 
+	if (!IS_SD(mmc) && mmc->high_capacity) {
+		mmc->capacity = ext_csd[212] | (ext_csd[213] << 8)
+			| (ext_csd[214] << 16) | (ext_csd[215] << 24);
+		mmc->capacity *= mmc->read_bl_len;
+	}
 	/* High Speed is set, there are two types: 52MHz and 26MHz */
 	if (cardtype & MMC_HS_52MHZ)
 		mmc->card_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;

Sorry to kick in again...

a) this calculation is already done in line 717, and certainly does not belong in a function called "mmc_change_freq".

b) the current Top-Of-Tree code already calculates the capacity correctly:

32GB SDHC Card:

Device: mci
Manufacturer ID: 3
OEM: 5344
Name: SD32G
Tran Speed: 25000000
Rd Block Len: 512
SD version 2.0
High Capacity: Yes
Capacity: 31914983424
Bus Width: 4-bit

c) is that now an incremental patch to the one you sent previously?

Best Regards,
Reinhard

#2 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Hi Reinhard ,

Quoted 35 lines · Reinhard Meyer

Dear Lei Wen,

Quoted 21 lines

According spec, high capacity mmc should be calculated by sector number multiply by sector size.

---
?drivers/mmc/mmc.c | ? ?5 +++++
?1 files changed, 5 insertions(+), 0 deletions(-)

drivers/mmc/mmc.c +5 -0
index ea398a5..bb97171 100644
@@ -441,6 +441,11 @@ int mmc_change_freq(struct mmc *mmc)
 ? ? ? if (!ext_csd[185])
 ? ? ? ? ? ? ? return 0;
 
+ ? ? if (!IS_SD(mmc) && mmc->high_capacity) {
+ ? ? ? ? ? ? mmc->capacity = ext_csd[212] | (ext_csd[213] << 8)
+ ? ? ? ? ? ? ? ? ? ? | (ext_csd[214] << 16) | (ext_csd[215] << 24);
+ ? ? ? ? ? ? mmc->capacity *= mmc->read_bl_len;
+ ? ? }
Quoted 3 lines

? ? ? /* High Speed is set, there are two types: 52MHz and 26MHz */ ? ? ? if (cardtype & MMC_HS_52MHZ)
? ? ? ? ? ? ? mmc->card_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;

Sorry to kick in again...

a) this calculation is already done in line 717, and certainly does not belong in a function called "mmc_change_freq".

b) the current Top-Of-Tree code already calculates the capacity correctly:

32GB SDHC Card:

Quoted 10 lines

Device: mci
Manufacturer ID: 3
OEM: 5344
Name: SD32G
Tran Speed: 25000000
Rd Block Len: 512
SD version 2.0
High Capacity: Yes
Capacity: 31914983424
Bus Width: 4-bit

Yes, for sd card, the calculation method is right.
But for mmc with high capacity, the calculation is wrong. You could try a mmc card with high capacity, like emmc card.

Quoted 2 lines

c) is that now an incremental patch to the one you sent previously?

It is a separate one. :-)

Best regards,
Lei

#3 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Hi Wolfgang,

How about merge this patch? :-)

Best regards,
Lei

Quoted 60 lines · Lei Wen

Hi Reinhard ,

Quoted 35 lines · Reinhard Meyer

Dear Lei Wen,

Quoted 21 lines

According spec, high capacity mmc should be calculated by sector number multiply by sector size.

---
?drivers/mmc/mmc.c | ? ?5 +++++
?1 files changed, 5 insertions(+), 0 deletions(-)

drivers/mmc/mmc.c +5 -0
index ea398a5..bb97171 100644
@@ -441,6 +441,11 @@ int mmc_change_freq(struct mmc *mmc)
 ? ? ? if (!ext_csd[185])
 ? ? ? ? ? ? ? return 0;
 
+ ? ? if (!IS_SD(mmc) && mmc->high_capacity) {
+ ? ? ? ? ? ? mmc->capacity = ext_csd[212] | (ext_csd[213] << 8)
+ ? ? ? ? ? ? ? ? ? ? | (ext_csd[214] << 16) | (ext_csd[215] << 24);
+ ? ? ? ? ? ? mmc->capacity *= mmc->read_bl_len;
+ ? ? }
Quoted 3 lines

? ? ? /* High Speed is set, there are two types: 52MHz and 26MHz */ ? ? ? if (cardtype & MMC_HS_52MHZ)
? ? ? ? ? ? ? mmc->card_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;

Sorry to kick in again...

a) this calculation is already done in line 717, and certainly does not belong in a function called "mmc_change_freq".

b) the current Top-Of-Tree code already calculates the capacity correctly:

32GB SDHC Card:

Quoted 10 lines

Device: mci
Manufacturer ID: 3
OEM: 5344
Name: SD32G
Tran Speed: 25000000
Rd Block Len: 512
SD version 2.0
High Capacity: Yes
Capacity: 31914983424
Bus Width: 4-bit

Yes, for sd card, the calculation method is right.
But for mmc with high capacity, the calculation is wrong. You could try a mmc card with high capacity, like emmc card.

Quoted 2 lines

c) is that now an incremental patch to the one you sent previously?

It is a separate one. :-)

Best regards,
Lei

#4 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Dear Lei Wen,

Quoted 2 lines · In message <[email protected]> you…

How about merge this patch? :-)

I will wait for a pull request from the responsible custodian.

Maybe you should have put him on cc: ... (done now).

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Status quo. Latin for "the mess we're in."
#5 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Dear Wolfgang Denk, Lei Wen, Andy Fleming,

Quoted 9 lines

Dear Lei Wen,

Quoted 2 lines · In message<[email protected]> you…

How about merge this patch? :-)

I will wait for a pull request from the responsible custodian.

Maybe you should have put him on cc: ... (done now).

@@ -441,6 +441,11 @@ int mmc_change_freq(struct mmc *mmc)

Quoted 10 lines
Quoted 10 lines

drivers/mmc/mmc.c int mmc_change_freq(struct mmc *mmc) · line 449

Quoted 10 lines
      if (!ext_csd[185])
              return 0;
drivers/mmc/mmc.c +5 -0
+     if (!IS_SD(mmc) && mmc->high_capacity) {
+             mmc->capacity = ext_csd[212] | (ext_csd[213] << 8)
+                     | (ext_csd[214] << 16) | (ext_csd[215] << 24);
+             mmc->capacity *= mmc->read_bl_len;
+     }
      /* High Speed is set, there are two types: 52MHz and 26MHz */

I am still convinced "mmc_change_freq()" is the wrong place to do that calculation. All other card types do it around line 700...

Best Regards,
Reinhard

#6 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Dear Reinhard,

Quoted 24 lines · Reinhard Meyer

Dear Wolfgang Denk, Lei Wen, Andy Fleming,

Quoted 11 lines

Dear Lei Wen,

In message<[email protected]>

Quoted 2 lines · ?you

How about merge this patch? :-)

I will wait for a pull request from the responsible custodian.

Maybe you should have put him on cc: ... ?(done now).

(quoted diff) +0 -0
@@ -441,6 +441,11 @@ int mmc_change_freq(struct mmc *mmc)
 >>> ? ? ? if (!ext_csd[185])
 >>> ? ? ? ? ? ? ? return 0;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

+ ? ? if (!IS_SD(mmc) && mmc->high_capacity) {
+ ? ? ? ? ? ? mmc->capacity = ext_csd[212] | (ext_csd[213] << 8)
+ ? ? ? ? ? ? ? ? ? ? | (ext_csd[214] << 16) | (ext_csd[215] << 24);
+ ? ? ? ? ? ? mmc->capacity *= mmc->read_bl_len;
+ ? ? }
? ? ? /* High Speed is set, there are two types: 52MHz and 26MHz */

Quoted 3 lines

I am still convinced "mmc_change_freq()" is the wrong place to do that calculation. All other card types do it around line 700...

But in other place, how could we get the ext_csd info? If you could let me get this line at the line, as you said 700, I am fine to put this code to there...

Thanks,
Lei

#7 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

In reply to Wolfgang Denk
Quoted 10 lines · Wolfgang Denk

Dear Lei Wen,

Quoted 2 lines · In message <[email protected]> you…

How about merge this patch? :-)

I will wait for a pull request from the responsible custodian.

Maybe you should have put him on cc: ... ?(done now).

I pinged Andy about some mmc patches that he replied "Applied" to back in May but never made it into the repo. I see no emails from him to the u-boot list for sometime.

Andy, are you still around? Freescalers, any info?

Thanks
John

#8 lore raw

PATCH 1/1 mmc: fix capacity calculation with high capacity mmc

Dne ?t 21. z??? 2010 16:45:25 John Rigby napsal(a):

Quoted 4 lines · Wolfgang Denk
Quoted 3 lines

Dear Lei Wen,

In message <[email protected]>

Quoted 11 lines · you
Quoted 5 lines
Quoted 1 line

How about merge this patch? :-)

I will wait for a pull request from the responsible custodian.

Maybe you should have put him on cc: ... (done now).

I pinged Andy about some mmc patches that he replied "Applied" to back in May but never made it into the repo. I see no emails from him to the u-boot list for sometime.

Andy, are you still around? Freescalers, any info?

Andy's around, but he's slow sometimes ... definition of "slow" is relative though :)

Quoted 7 lines

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