Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 22:20:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mmcsd: refine emmc capacity calculate

Browse Source 
Signed-off-by: wanggang26 <wanggang26@xiaomi.com>
This commit is contained in:
wanggang26
2023-10-19 10:33:28 +08:00
committed by Xiang Xiao
parent 4c19e75ff5
commit 955a3838f7
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mmcsd/mmcsd_csd.h
+4
View File
@@ -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))
drivers/mmcsd/mmcsd_sdio.c
+19 -5
View File
@@ -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;
}