From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752728AbaIKGlb (ORCPT ); Thu, 11 Sep 2014 02:41:31 -0400 Received: from mail.neotion.com ([5.39.84.84]:33504 "EHLO mail.neotion.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbaIKGl3 (ORCPT ); Thu, 11 Sep 2014 02:41:29 -0400 Message-ID: <5411435C.3080905@neotion.com> Date: Thu, 11 Sep 2014 08:38:20 +0200 From: =?UTF-8?B?R3LDqWdvcnkgU291dGFkw6k=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Ulf Hansson CC: Chris Ball , Seungwon Jeon , Jaehoon Chung , linux-mmc , "linux-kernel@vger.kernel.org" Subject: [PATCH v4 0001/0003] mmc: Move code that manages user area and gp partitions into functions References: <53C7E45E.2060102@neotion.com> <53EB2DC3.2080002@neotion.com> <53ECB95F.2030207@neotion.com> <53F1FBA3.6060108@neotion.com> In-Reply-To: <53F1FBA3.6060108@neotion.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move code that manages user area and general purpose partitions into functions. Signed-off-by: Grégory Soutadé --- drivers/mmc/core/mmc.c | 162 ++++++++++++++++++++++++++---------------------- 1 file changed, 89 insertions(+), 73 deletions(-) >>From commit 480cadc2b7e0fa2bbab20141efb547dfe0c3707c in master linux tree. Changelog v3: Move code BEFORE fixing bugs. 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 1eda8dd..77b4cf3 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -298,6 +298,93 @@ 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 = 0, hc_wp_grp_sz = 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; + } +} + +static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd) +{ + unsigned int part_size; + u8 hc_erase_grp_sz = 0, hc_wp_grp_sz = 0; + int idx; + + /* + * 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; + } + + 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); + } + } +} + /* * Decode extended CSD. */ @@ -305,7 +392,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); @@ -402,80 +488,10 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) ext_csd[EXT_CSD_TRIM_MULT]; card->ext_csd.raw_partition_support = ext_csd[EXT_CSD_PARTITION_SUPPORT]; if (card->ext_csd.rev >= 4) { - /* - * 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]; + mmc_manage_enhanced_area(card, ext_csd); - 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_gp_partitions(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; - } - - 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 > Replace ext_csd "enhanced_area_en" attribute by "partition_setting_completed". > It was used whether or not enhanced user area is defined and without checks of > EXT_CSD_PARTITION_SETTING_COMPLETED bit. > > Signed-off-by: Grégory Soutadé > --- > drivers/mmc/core/mmc.c | 8 +++++++- > include/linux/mmc/card.h | 2 +- > include/linux/mmc/mmc.h | 2 ++ > 3 files changed, 10 insertions(+), 2 deletions(-) > >>>From commit 33caee39925b887a99a2400dc5c980097c3573f9 in master linux tree. > > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c > index 793c6f7..ef25d91 100644 > --- a/drivers/mmc/core/mmc.c > +++ b/drivers/mmc/core/mmc.c > @@ -403,6 +403,12 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) > ext_csd[EXT_CSD_TRIM_MULT]; > card->ext_csd.raw_partition_support = ext_csd[EXT_CSD_PARTITION_SUPPORT]; > if (card->ext_csd.rev >= 4) { > + if (ext_csd[EXT_CSD_PARTITION_SETTING_COMPLETED] & > + EXT_CSD_PART_SETTING_COMPLETED) { > + card->ext_csd.partition_setting_completed = 1; > + } 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 > @@ -1309,7 +1315,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, > * If enhanced_area_en is TRUE, host needs to enable ERASE_GRP_DEF > * bit. This bit will be lost every time after a reset or power off. > */ > - if (card->ext_csd.enhanced_area_en || > + if (card->ext_csd.partition_setting_completed || > (card->ext_csd.rev >= 3 && (host->caps2 & MMC_CAP2_HC_ERASE_SZ))) { > err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, > EXT_CSD_ERASE_GROUP_DEF, 1, > diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h > index d424b9d..38175be 100644 > --- a/include/linux/mmc/card.h > +++ b/include/linux/mmc/card.h > @@ -74,7 +74,7 @@ struct mmc_ext_csd { > unsigned int sec_trim_mult; /* Secure trim multiplier */ > unsigned int sec_erase_mult; /* Secure erase multiplier */ > unsigned int trim_timeout; /* In milliseconds */ > - bool enhanced_area_en; /* enable bit */ > + bool partition_setting_completed; /* enable bit */ > unsigned long long enhanced_area_offset; /* Units: Byte */ > unsigned int enhanced_area_size; /* Units: KB */ > unsigned int cache_size; /* Units: KB */ > diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h > index 64ec963..78753bc 100644 > --- a/include/linux/mmc/mmc.h > +++ b/include/linux/mmc/mmc.h > @@ -281,6 +281,7 @@ struct _mmc_csd { > #define EXT_CSD_EXP_EVENTS_CTRL 56 /* R/W, 2 bytes */ > #define EXT_CSD_DATA_SECTOR_SIZE 61 /* R */ > #define EXT_CSD_GP_SIZE_MULT 143 /* R/W */ > +#define EXT_CSD_PARTITION_SETTING_COMPLETED 155 /* R/W */ > #define EXT_CSD_PARTITION_ATTRIBUTE 156 /* R/W */ > #define EXT_CSD_PARTITION_SUPPORT 160 /* RO */ > #define EXT_CSD_HPI_MGMT 161 /* R/W */ > @@ -349,6 +350,7 @@ struct _mmc_csd { > #define EXT_CSD_PART_CONFIG_ACC_RPMB (0x3) > #define EXT_CSD_PART_CONFIG_ACC_GP0 (0x4) > > +#define EXT_CSD_PART_SETTING_COMPLETED (0x1) > #define EXT_CSD_PART_SUPPORT_PART_EN (0x1) > > #define EXT_CSD_CMD_SET_NORMAL (1<<0) > -- > 1.7.9.5 > > Le 15/08/2014 10:17, Ulf Hansson a écrit : >> On 14 August 2014 15:27, Grégory Soutadé wrote: >>> Le 14/08/2014 13:46, Ulf Hansson a écrit : >>>> On 13 August 2014 11:20, Grégory Soutadé wrote: >>>>> Le 13/08/2014 10:36, Ulf Hansson a écrit : >>>>>> On 17 July 2014 16:57, Grégory Soutadé wrote: >>>>>>> Create MMC general purpose partitions only if >>>>>>> EXT_CSD_PARTITION_SETTING_COMPLETED bit is set. >>>>>>> Some tools may set general purpose partition size(s) but fail or stop >>>>>>> without finalize. >>>>>>> Another case is to set invalid partition size(s). >>>>>>> >>>>>>> Signed-off-by: Grégory Soutadé >>>>>>> --- >>>>>>> drivers/mmc/core/mmc.c | 15 +++++++++++---- >>>>>>> include/linux/mmc/mmc.h | 2 ++ >>>>>>> 2 files changed, 13 insertions(+), 4 deletions(-) >>>>>>> >>>>>>> From commit b6603fe574af289dbe9eb9fb4c540bca04f5a053 in master linux tree. >>>>>>> >>>>>>> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c >>>>>>> index 793c6f7..b9fe211 100644 >>>>>>> --- a/drivers/mmc/core/mmc.c >>>>>>> +++ b/drivers/mmc/core/mmc.c >>>>>>> @@ -471,10 +471,17 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) >>>>>>> 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); >>>>>>> + if (ext_csd[EXT_CSD_PARTITION_SETTING_COMPLETED] & >>>>>>> + EXT_CSD_PART_SETTING_COMPLETED) { >>>>>> >>>>>> Some minor comments here. >>>>>> >>>>>> I think you could move this if statement up and into the previous "if" >>>>>> where we check for "ext_csd[EXT_CSD_PARTITION_SUPPORT] & >>>>>> EXT_CSD_PART_SUPPORT_PART_EN". >>>>>> >>>>>> Additionally, please run checkpatch. >>>>>> >>>>>> Kind regards >>>>>> Uffe >>>>> >>>>> Hello, >>>>> >>>>> I didn't put the if statement above to warn user in case of bad partitioning. >>>>> I don't want the kernel to silently ignore this error. >>>> >>>> Fair enough. >>>> >>>> Still I am wondering whether hc_erase_grp_sz, hc_wp_grp_sz and >>>> enhanced_area_en should be updated if >>>> EXT_CSD_PARTITION_SETTING_COMPLETED isn't set. That's the case in >>>> your patch. >>> >>> I was focused on partitions and I didn't pay attention on enhanced area. >>> >>> JEDEC says that partitioning implies : >>> * Configure general purpose partitions attributes and sizes >>> * Configure enhanced user area offset, attributes and size >>> >>> and finally set EXT_CSD_PARTITION_SETTING_COMPLETED. >>> >>> Thus these two parts must checks for setting completed before >>> computing values. >>> >>> Plus, "enhanced_area_en" attribute is set whether or not there is an >>> enhanced area defined. I looked at the code, and the only usage of it >>> is to set EXT_CSD_ERASE_GROUP_DEF and compute erase size again. >>> I suggest using "partition_setting_completed" identifier which is common >>> to the two functions and requires EXT_CSD_ERASE_GROUP_DEF to be set. >>> >>> If you're ok with that, I'll submit another patch. >> >> Seems reasonable. Please send a v2. >> >> Kind regards >> Uffe >> >>> >>> >>> Best regards >>> Grégory Soutadé >>> >>>> >>>>> >>>>> checkpatch has been run before sending this patch, I know there are two lines >>>>> with two extra characters, but names used here are quite long. I hope it will >>>>> not block upstream inclusion. >>>> >>>> The mmc_read_ext_csd() is not one of the nicest piece of code, but for >>>> sure we should not move on making it worse. If you need to move code >>>> into separate function to prevent checkpatch warnings, please do so. >>>> >>>> Kind regards >>>> Uffe >>>> >>> >>