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

This reverts commit 2cdc235bbeb09b2b78cd02a94ab79c265861aea9.

The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.

This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.

Change-Id: Icc9ddb3d294aa2a1caeddfe8fedd2e12aa7691e1

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index f5b2aaf2371f1f3d854212e6d9ac62bf6786ddcf..6909a54c39beac1a8ca277f317f43c4a4ea9d583 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -253,13 +253,8 @@ 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) {
-                       unsigned boot_sectors;
-                       boot_sectors = ext_csd[EXT_CSD_BOOT_SIZE_MULTI];
-                       boot_sectors *= SZ_256K / 512;
-                       card->ext_csd.sectors -= boot_sectors;
+               if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512)
                        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 5b35987e691b792e91583a8f716c5d13877825b6..dd11ae51fb68e8b847300a5fe78ac049c9ef8605 100644 (file)
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -262,7 +262,6 @@ 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 */