This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 955a3838f7 mmcsd: refine emmc capacity calculate
955a3838f7 is described below
commit 955a3838f717325db5a668fc68e17e7202841e08
Author: wanggang26 <[email protected]>
AuthorDate: Thu Oct 19 10:33:28 2023 +0800
mmcsd: refine emmc capacity calculate
Signed-off-by: wanggang26 <[email protected]>
---
drivers/mmcsd/mmcsd_csd.h | 4 ++++
drivers/mmcsd/mmcsd_sdio.c | 24 +++++++++++++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/drivers/mmcsd/mmcsd_csd.h b/drivers/mmcsd/mmcsd_csd.h
index 3659997ef9..423c6b9834 100644
--- a/drivers/mmcsd/mmcsd_csd.h
+++ b/drivers/mmcsd/mmcsd_csd.h
@@ -116,6 +116,8 @@
#define MMCSD_CSD_VDDWCURRMAX(csd) ((csd[4] >> 2) & 7)
+#define MMCSD_CSD_CSIZE_THRESHOLD 0xfff
+
/* C_SIZE_MULT 47-49 Device size multiplier */
#define MMCSD_CSD_CSIZEMULT(csd) (((csd[4] & 3) << 1) | (csd[5] >> 15))
@@ -290,6 +292,8 @@
#define MMCSD_CSD_VDDWCURRMAX(csd) ((csd[9] >> 2) & 7)
#define SD20_CSD_VDDWCURRMAX(csd) (6)
+#define MMCSD_CSD_CSIZE_THRESHOLD 0xfff
+
/* C_SIZE_MULT 47-49 Device size multiplier */
#define MMCSD_CSD_CSIZEMULT(csd) (((csd[9] & 3) << 1) | (csd[10] >> 7))
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 56ae717bae..ffd81b495b 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -54,6 +54,7 @@
#include "mmcsd.h"
#include "mmcsd_sdio.h"
+#include "mmcsd_csd.h"
/****************************************************************************
* Pre-processor Definitions
@@ -641,22 +642,35 @@ static void mmcsd_decode_csd(FAR struct mmcsd_state_s
*priv, uint32_t csd[4])
* C_SIZE: 73:64 from Word 2 and 63:62 from Word 3
*/
- /* If the card is MMC and it has Block addressing
- * then the correct number of blocks should already be
- * read from extended CSD register.
+ /* If the card is MMC and it has Block addressing, then C_SIZE
+ * parameter is used to compute the device capacity for devices up
+ * to 2 GB of density only, while SEC_COUNT is used to calculate
+ * densities greater than 2 GB. When the device density is greater
+ * than 2GB, 0xFFF should be set to C_SIZE bitfield (See 7.3.12)
*/
-#ifdef CONFIG_DEBUG_FS_INFO
uint16_t csize = ((csd[1] & 0x03ff) << 2) |
((csd[2] >> 30) & 3);
uint8_t csizemult = (csd[2] >> 15) & 7;
-#endif
priv->blockshift = readbllen;
priv->blocksize = (1 << readbllen);
+ /* For emmc densities up to 2 GB */
+
+ if (csize != MMCSD_CSD_CSIZE_THRESHOLD)
+ {
+ priv->part.nblocks = ((uint32_t)csize + 1) *
+ (1 << (csizemult + 2));
+ }
+
if (priv->blocksize > 512)
{
+ if (csize != MMCSD_CSD_CSIZE_THRESHOLD)
+ {
+ priv->part.nblocks <<= (priv->blockshift - 9);
+ }
+
priv->blocksize = 512;
priv->blockshift = 9;
}
