mmc: subtract boot sectors from disk size for eMMC 4.3+ devices

the csd sector count reported by eMMC 4.3+ cards includes the boot
partition size; subtract this from the size reported to the disk
since the boot partition is inaccessible

Change-Id: I601b83aa0159b7aa446409ea8c945b256dd0b5b1
Signed-off-by: Gary King <gking@nvidia.com>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index aa7d1d7..4e49b34 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -278,8 +278,13 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
                        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;
+                       /* size is in 256K chunks, i.e. 512 sectors each */
+                       boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI] * 512;
+                       card->ext_csd.sectors -= boot_sectors;
                        mmc_card_set_blockaddr(card);
+               }
        }
        card->ext_csd.raw_card_type = ext_csd[EXT_CSD_CARD_TYPE];
        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 ac26a68..630ea24 100644 (file)
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -283,6 +283,7 @@ struct _mmc_csd {
 #define EXT_CSD_SEC_ERASE_MULT         230     /* RO */
 #define EXT_CSD_SEC_FEATURE_SUPPORT    231     /* RO */
 #define EXT_CSD_TRIM_MULT              232     /* RO */
+#define EXT_CSD_BOOT_SIZE_MULTI                226     /* RO */
 
 /*
  * EXT_CSD field definitions