Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

mmc: report capacity for the selected partition

Browse source 
Enhance the MMC core to calculate the size of each MMC partition, and
update mmc->capacity whenever a partition is selected. This causes:

mmc dev 0 1 ; mmcinfo

... to report the size of the currently selected partition, rather than
always reporting the size of the user partition.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Stephen Warren 2013-06-11 15:14:01 -06:00 committed by Andy Fleming
parent 06e4ae5f80
commit f866a46d6e
2 changed files with 68 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
drivers/mmc/mmc.c
View file

@ -702,16 +702,49 @@ static int mmc_change_freq(struct mmc *mmc)
return 0; return 0;
} }
static int mmc_set_capacity(struct mmc *mmc, int part_num)
{
switch (part_num) {
case 0:
mmc->capacity = mmc->capacity_user;
break;
case 1:
case 2:
mmc->capacity = mmc->capacity_boot;
break;
case 3:
mmc->capacity = mmc->capacity_rpmb;
break;
case 4:
case 5:
case 6:
case 7:
mmc->capacity = mmc->capacity_gp[part_num - 4];
break;
default:
return -1;
}
mmc->block_dev.lba = lldiv(mmc->capacity, mmc->read_bl_len);
return 0;
}
int mmc_switch_part(int dev_num, unsigned int part_num) int mmc_switch_part(int dev_num, unsigned int part_num)
{ {
struct mmc *mmc = find_mmc_device(dev_num); struct mmc *mmc = find_mmc_device(dev_num);
int ret;
if (!mmc) if (!mmc)
return -1; return -1;
return mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF, ret = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
(mmc->part_config & ~PART_ACCESS_MASK) (mmc->part_config & ~PART_ACCESS_MASK)
| (part_num & PART_ACCESS_MASK)); | (part_num & PART_ACCESS_MASK));
if (ret)
return ret;
return mmc_set_capacity(mmc, part_num);
} }
int mmc_getcd(struct mmc *mmc) int mmc_getcd(struct mmc *mmc)
@ -919,7 +952,7 @@ static void mmc_set_bus_width(struct mmc *mmc, uint width)
static int mmc_startup(struct mmc *mmc) static int mmc_startup(struct mmc *mmc)
{ {
int err; int err, i;
uint mult, freq; uint mult, freq;
u64 cmult, csize, capacity; u64 cmult, csize, capacity;
struct mmc_cmd cmd; struct mmc_cmd cmd;
@ -1037,8 +1070,12 @@ static int mmc_startup(struct mmc *mmc)
cmult = (mmc->csd[2] & 0x00038000) >> 15; cmult = (mmc->csd[2] & 0x00038000) >> 15;
} }
mmc->capacity = (csize + 1) << (cmult + 2); mmc->capacity_user = (csize + 1) << (cmult + 2);
mmc->capacity *= mmc->read_bl_len; mmc->capacity_user *= mmc->read_bl_len;
mmc->capacity_boot = 0;
mmc->capacity_rpmb = 0;
for (i = 0; i < 4; i++)
mmc->capacity_gp[i] = 0;
if (mmc->read_bl_len > MMC_MAX_BLOCK_LEN) if (mmc->read_bl_len > MMC_MAX_BLOCK_LEN)
mmc->read_bl_len = MMC_MAX_BLOCK_LEN; mmc->read_bl_len = MMC_MAX_BLOCK_LEN;
@ -1077,7 +1114,7 @@ static int mmc_startup(struct mmc *mmc)
| ext_csd[EXT_CSD_SEC_CNT + 3] << 24; | ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
capacity *= MMC_MAX_BLOCK_LEN; capacity *= MMC_MAX_BLOCK_LEN;
if ((capacity >> 20) > 2 * 1024) if ((capacity >> 20) > 2 * 1024)
mmc->capacity = capacity; mmc->capacity_user = capacity;
} }
switch (ext_csd[EXT_CSD_REV]) { switch (ext_csd[EXT_CSD_REV]) {
@ -1119,8 +1156,25 @@ static int mmc_startup(struct mmc *mmc)
if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) || if ((ext_csd[EXT_CSD_PARTITIONING_SUPPORT] & PART_SUPPORT) ||
ext_csd[EXT_CSD_BOOT_MULT]) ext_csd[EXT_CSD_BOOT_MULT])
mmc->part_config = ext_csd[EXT_CSD_PART_CONF]; mmc->part_config = ext_csd[EXT_CSD_PART_CONF];
mmc->capacity_boot = ext_csd[EXT_CSD_BOOT_MULT] << 17;
mmc->capacity_rpmb = ext_csd[EXT_CSD_RPMB_MULT] << 17;
for (i = 0; i < 4; i++) {
int idx = EXT_CSD_GP_SIZE_MULT + i * 3;
mmc->capacity_gp[i] = (ext_csd[idx + 2] << 16) +
(ext_csd[idx + 1] << 8) + ext_csd[idx];
mmc->capacity_gp[i] *=
ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
mmc->capacity_gp[i] *= ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
}
} }
err = mmc_set_capacity(mmc, mmc->part_num);
if (err)
return err;
if (IS_SD(mmc)) if (IS_SD(mmc))
err = sd_change_freq(mmc); err = sd_change_freq(mmc);
else else

7
include/mmc.h
View file

@ -158,7 +158,9 @@
/* /*
* EXT_CSD fields * EXT_CSD fields
*/ */
#define EXT_CSD_GP_SIZE_MULT 143 /* R/W */
#define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */ #define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */
#define EXT_CSD_RPMB_MULT 168 /* RO */
#define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */
#define EXT_CSD_PART_CONF 179 /* R/W */ #define EXT_CSD_PART_CONF 179 /* R/W */
#define EXT_CSD_BUS_WIDTH 183 /* R/W */ #define EXT_CSD_BUS_WIDTH 183 /* R/W */
@ -166,6 +168,7 @@
#define EXT_CSD_REV 192 /* RO */ #define EXT_CSD_REV 192 /* RO */
#define EXT_CSD_CARD_TYPE 196 /* RO */ #define EXT_CSD_CARD_TYPE 196 /* RO */
#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ #define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */
#define EXT_CSD_HC_WP_GRP_SIZE 221 /* RO */
#define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ #define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */
#define EXT_CSD_BOOT_MULT 226 /* RO */ #define EXT_CSD_BOOT_MULT 226 /* RO */
@ -263,6 +266,10 @@ struct mmc {
uint write_bl_len; uint write_bl_len;
uint erase_grp_size; uint erase_grp_size;
u64 capacity; u64 capacity;
u64 capacity_user;
u64 capacity_boot;
u64 capacity_rpmb;
u64 capacity_gp[4];
block_dev_desc_t block_dev; block_dev_desc_t block_dev;
int (*send_cmd)(struct mmc *mmc, int (*send_cmd)(struct mmc *mmc,
struct mmc_cmd *cmd, struct mmc_data *data); struct mmc_cmd *cmd, struct mmc_data *data);