diff options
| author | Colin Cross <ccross@android.com> | 2011-02-12 13:21:32 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:53 -0700 |
| commit | 6bb1acf2eba2dd5200bd935286b3d9f130b71c3b (patch) | |
| tree | 3bfa0eca5b6a0df013c76dd8acd6188ad84526bb | |
| parent | 28e23cf73c26d2bb13451804e328797a55f471e4 (diff) | |
Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
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>
| -rw-r--r-- | drivers/mmc/core/mmc.c | 7 | ||||
| -rw-r--r-- | include/linux/mmc/mmc.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 868f511b3f2..2a7e43bc796 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -274,13 +274,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); - } } 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 630ea24af1d..ac26a685cca 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -283,7 +283,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 |