diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-14 16:41:01 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-14 16:41:01 +0530 |
| commit | c4015fe57a590f21a9729fff9a3da23e23412f68 (patch) | |
| tree | 7997ba4a3104d7f6d0530f03bf62d3dc31930ce4 | |
| parent | 08f0a2e4211ab0d75862d939440f3fde0a082266 (diff) | |
Revert "Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices""
This reverts commit 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4.
| -rw-r--r-- | drivers/mmc/core/mmc.c | 7 | ||||
| -rw-r--r-- | include/linux/mmc/mmc.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 6909a54c39be..f5b2aaf2371f 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -253,8 +253,13 @@ static int mmc_read_ext_csd(struct mmc_card *card) ext_csd[EXT_CSD_SEC_CNT + 3] << 24; /* Cards with density > 2GiB are sector addressed */ - if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) + if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512) { + unsigned boot_sectors; + boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI]; + boot_sectors *= SZ_256K / 512; + card->ext_csd.sectors -= boot_sectors; mmc_card_set_blockaddr(card); + } } switch (ext_csd[EXT_CSD_CARD_TYPE] & EXT_CSD_CARD_TYPE_MASK) { diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index dd11ae51fb68..5b35987e691b 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -262,6 +262,7 @@ struct _mmc_csd { #define EXT_CSD_S_A_TIMEOUT 217 /* RO */ #define EXT_CSD_ERASE_TIMEOUT_MULT 223 /* RO */ #define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ +#define EXT_CSD_BOOT_SIZE_MULTI 226 #define EXT_CSD_SEC_TRIM_MULT 229 /* RO */ #define EXT_CSD_SEC_ERASE_MULT 230 /* RO */ #define EXT_CSD_SEC_FEATURE_SUPPORT 231 /* RO */ |