From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934132AbaGQPI2 (ORCPT ); Thu, 17 Jul 2014 11:08:28 -0400 Received: from mail.neotion.com ([5.39.84.84]:32943 "EHLO mail.neotion.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933147AbaGQPI1 (ORCPT ); Thu, 17 Jul 2014 11:08:27 -0400 X-Greylist: delayed 502 seconds by postgrey-1.27 at vger.kernel.org; Thu, 17 Jul 2014 11:08:26 EDT Message-ID: <53C7E45E.2060102@neotion.com> Date: Thu, 17 Jul 2014 16:57:34 +0200 From: =?ISO-8859-1?Q?Gr=E9gory_Soutad=E9?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Chris Ball , Ulf Hansson , Seungwon Jeon , Jaehoon Chung , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mmc: check EXT_CSD_PARTITION_SETTING_COMPLETED before creating partitions X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) { + mmc_part_add(card, part_size << 19, + EXT_CSD_PART_CONFIG_ACC_GP0 + idx, + "gp%d", idx, false, + MMC_BLK_DATA_AREA_GP); + } else { + pr_warn("%s: has partition size defined, but setting is not complete\n", + mmc_hostname(card->host)); + break; + } } } card->ext_csd.sec_trim_mult = 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.0.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Gr=E9gory_Soutad=E9?= Subject: [PATCH] mmc: check EXT_CSD_PARTITION_SETTING_COMPLETED before creating partitions Date: Thu, 17 Jul 2014 16:57:34 +0200 Message-ID: <53C7E45E.2060102@neotion.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail.neotion.com ([5.39.84.84]:32943 "EHLO mail.neotion.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933147AbaGQPI1 (ORCPT ); Thu, 17 Jul 2014 11:08:27 -0400 Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Chris Ball , Ulf Hansson , Seungwon Jeon , Jaehoon Chung , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org 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=E9gory Soutad=E9 --- drivers/mmc/core/mmc.c | 15 +++++++++++---- include/linux/mmc/mmc.h | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) =46rom 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 *=3D (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) { + mmc_part_add(card, part_size << 19, + EXT_CSD_PART_CONFIG_ACC_GP0 + idx, + "gp%d", idx, false, + MMC_BLK_DATA_AREA_GP); + } else { + pr_warn("%s: has partition size defined, but setting is not compl= ete\n", + mmc_hostname(card->host)); + break; + } } } card->ext_csd.sec_trim_mult =3D 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) --=20 1.7.0.4