Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
Colin Cross [Sat, 12 Feb 2011 21:21:32 +0000 (13:21 -0800)]
This reverts commit f0b0e4bec1e89014f3dcef4da8bcf95428cc771c.

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.

Signed-off-by: Colin Cross <ccross@android.com>

drivers/mmc/core/mmc.c
include/linux/mmc/mmc.h

index 405e59c..6952f77 100644 (file)
@@ -278,13 +278,8 @@ 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) {
-                       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;
+               if (card->ext_csd.sectors > (2u * 1024 * 1024 * 1024) / 512)
                        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) {
index 9e082f7..5a794cb 100644 (file)
@@ -293,7 +293,6 @@ 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