On 18 August 2014 12:50, Grégory Soutadé <gsoutade@xxxxxxxxxxx> wrote:
> Checks EXT_CSD_PARTITION_SETTING_COMPLETED bit before
> computing enhanced user area and adding mmc partitions
> (as described in JEDEC standard).
>
> Signed-off-by: Grégory Soutadé <gsoutade@xxxxxxxxxxx>
Hi Grégory,
First, could you rename patches so they actually describe what they
actually do. Currently both of them have the same header.
Second, I really appreciate if there could be some version history of
the patches since it helps review process.
Could you please resend them?
Kind regards
Uffe
> ---
> drivers/mmc/core/mmc.c | 167 +++++++++++++++++++++++++++---------------------
> 1 file changed, 95 insertions(+), 72 deletions(-)
>
> Changelog v2:
> Move code for user area and general purpose partitions
> into functions.
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index ef25d91..3158470 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -298,6 +298,99 @@ static void mmc_select_card_type(struct mmc_card *card)
> card->mmc_avail_type = avail_type;
> }
>
> +static void mmc_manage_enhanced_area(struct mmc_card *card, u8 *ext_csd)
> +{
> + u8 hc_erase_grp_sz, hc_wp_grp_sz;
> +
> + /*
> + * Enhanced area feature support -- check whether the eMMC
> + * card has the Enhanced area enabled. If so, export enhanced
> + * area offset and size to user by adding sysfs interface.
> + */
> + if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) &&
> + (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) {
> + if (card->ext_csd.partition_setting_completed) {
> + hc_erase_grp_sz =
> + ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
> + hc_wp_grp_sz =
> + ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
> + /*
> + * calculate the enhanced data area offset, in bytes
> + */
> + card->ext_csd.enhanced_area_offset =
> + (ext_csd[139] << 24) + (ext_csd[138] << 16) +
> + (ext_csd[137] << 8) + ext_csd[136];
> + if (mmc_card_blockaddr(card))
> + card->ext_csd.enhanced_area_offset <<= 9;
> + /*
> + * calculate the enhanced data area size, in kilobytes
> + */
> + card->ext_csd.enhanced_area_size =
> + (ext_csd[142] << 16) + (ext_csd[141] << 8) +
> + ext_csd[140];
> + card->ext_csd.enhanced_area_size *=
> + (size_t)(hc_erase_grp_sz * hc_wp_grp_sz);
> + card->ext_csd.enhanced_area_size <<= 9;
> + } else {
> + pr_warn("%s: defines enhanced area without partition setting complete\n",
> + mmc_hostname(card->host));
> + }
> + } else {
> + /*
> + * If the enhanced area is not enabled, disable these
> + * device attributes.
> + */
> + card->ext_csd.enhanced_area_offset = -EINVAL;
> + card->ext_csd.enhanced_area_size = -EINVAL;
> + }
> +}
> +
> +static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd)
> +{
> + int idx;
> + u8 hc_erase_grp_sz, hc_wp_grp_sz;
> + unsigned int part_size;
> +
> + /*
> + * General purpose partition feature support --
> + * If ext_csd has the size of general purpose partitions,
> + * set size, part_cfg, partition name in mmc_part.
> + */
> + if (ext_csd[EXT_CSD_PARTITION_SUPPORT] &
> + EXT_CSD_PART_SUPPORT_PART_EN) {
> + hc_erase_grp_sz =
> + ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
> + hc_wp_grp_sz =
> + ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
> +
> + for (idx = 0; idx < MMC_NUM_GP_PARTITION; idx++) {
> + if (!ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3] &&
> + !ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 1] &&
> + !ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 2])
> + continue;
> +
> + if (card->ext_csd.partition_setting_completed == 0) {
> + pr_warn("%s: has partition size defined without partition complete\n",
> + mmc_hostname(card->host));
> + break;
> + }
> +
> + part_size =
> + (ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 2]
> + << 16) +
> + (ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 1]
> + << 8) +
> + ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3];
> + part_size *= (size_t)(hc_erase_grp_sz *
> + hc_wp_grp_sz);
> + mmc_part_add(card, part_size << 19,
> + EXT_CSD_PART_CONFIG_ACC_GP0 + idx,
> + "gp%d", idx, false,
> + MMC_BLK_DATA_AREA_GP);
> + }
> + }
> +}
> +
> /*
> * Decode extended CSD.
> */
> @@ -305,7 +398,6 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
> {
> int err = 0, idx;
> unsigned int part_size;
> - u8 hc_erase_grp_sz = 0, hc_wp_grp_sz = 0;
>
> BUG_ON(!card);
>
> @@ -409,80 +501,11 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
> } else {
> card->ext_csd.partition_setting_completed = 0;
> }
> - /*
> - * Enhanced area feature support -- check whether the eMMC
> - * card has the Enhanced area enabled. If so, export enhanced
> - * area offset and size to user by adding sysfs interface.
> - */
> - if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) &&
> - (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) {
> - hc_erase_grp_sz =
> - ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
> - hc_wp_grp_sz =
> - ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
>
> - card->ext_csd.enhanced_area_en = 1;
> - /*
> - * calculate the enhanced data area offset, in bytes
> - */
> - card->ext_csd.enhanced_area_offset =
> - (ext_csd[139] << 24) + (ext_csd[138] << 16) +
> - (ext_csd[137] << 8) + ext_csd[136];
> - if (mmc_card_blockaddr(card))
> - card->ext_csd.enhanced_area_offset <<= 9;
> - /*
> - * calculate the enhanced data area size, in kilobytes
> - */
> - card->ext_csd.enhanced_area_size =
> - (ext_csd[142] << 16) + (ext_csd[141] << 8) +
> - ext_csd[140];
> - card->ext_csd.enhanced_area_size *=
> - (size_t)(hc_erase_grp_sz * hc_wp_grp_sz);
> - card->ext_csd.enhanced_area_size <<= 9;
> - } else {
> - /*
> - * If the enhanced area is not enabled, disable these
> - * device attributes.
> - */
> - card->ext_csd.enhanced_area_offset = -EINVAL;
> - card->ext_csd.enhanced_area_size = -EINVAL;
> - }
> + mmc_manage_enhanced_area(card, ext_csd);
>
> - /*
> - * General purpose partition feature support --
> - * If ext_csd has the size of general purpose partitions,
> - * set size, part_cfg, partition name in mmc_part.
> - */
> - if (ext_csd[EXT_CSD_PARTITION_SUPPORT] &
> - EXT_CSD_PART_SUPPORT_PART_EN) {
> - if (card->ext_csd.enhanced_area_en != 1) {
> - hc_erase_grp_sz =
> - ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
> - hc_wp_grp_sz =
> - ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
> -
> - card->ext_csd.enhanced_area_en = 1;
> - }
> + mmc_manage_gp_partitions(card, ext_csd);
>
> - for (idx = 0; idx < MMC_NUM_GP_PARTITION; idx++) {
> - if (!ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3] &&
> - !ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 1] &&
> - !ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 2])
> - continue;
> - part_size =
> - (ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 2]
> - << 16) +
> - (ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3 + 1]
> - << 8) +
> - ext_csd[EXT_CSD_GP_SIZE_MULT + idx * 3];
> - part_size *= (size_t)(hc_erase_grp_sz *
> - hc_wp_grp_sz);
> - mmc_part_add(card, part_size << 19,
> - EXT_CSD_PART_CONFIG_ACC_GP0 + idx,
> - "gp%d", idx, false,
> - MMC_BLK_DATA_AREA_GP);
> - }
> - }
> card->ext_csd.sec_trim_mult =
> ext_csd[EXT_CSD_SEC_TRIM_MULT];
> card->ext_csd.sec_erase_mult =
> --
> 1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
