From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?R3LDqWdvcnkgU291dGFkw6k=?= Subject: [PATCH v2 0001/0002] mmc: check EXT_CSD_PARTITION_SETTING_COMPLETED before creating partitions Date: Mon, 18 Aug 2014 12:49:33 +0200 Message-ID: <53F1DA3D.1030500@neotion.com> References: <53C7E45E.2060102@neotion.com> <53EB2DC3.2080002@neotion.com> <53ECB95F.2030207@neotion.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ewXw5AtER31vhhPCtBRRcXecLXWFESHWc" Return-path: Received: from mail.neotion.com ([5.39.84.84]:52566 "EHLO mail.neotion.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779AbaHRKw3 (ORCPT ); Mon, 18 Aug 2014 06:52:29 -0400 In-Reply-To: <53ECB95F.2030207@neotion.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Ulf Hansson Cc: Chris Ball , Seungwon Jeon , Jaehoon Chung , linux-mmc , "linux-kernel@vger.kernel.org" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ewXw5AtER31vhhPCtBRRcXecLXWFESHWc Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Replace "enhanced_area_en" attribute by "partition_setting_completed". It was used whether or not enhanced user area is defined and without chec= ks of EXT_CSD_PARTITION_SETTING_COMPLETED bit. Signed-off-by: Gr=C3=A9gory Soutad=C3=A9 --- 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 tre= e. 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, u= 8 *ext_csd) ext_csd[EXT_CSD_TRIM_MULT]; card->ext_csd.raw_partition_support =3D ext_csd[EXT_CSD_PARTITION_SUPPO= RT]; if (card->ext_csd.rev >=3D 4) { + if (ext_csd[EXT_CSD_PARTITION_SETTING_COMPLETED] & + EXT_CSD_PART_SETTING_COMPLETED) { + card->ext_csd.partition_setting_completed =3D 1; + } else { + card->ext_csd.partition_setting_completed =3D 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 >=3D 3 && (host->caps2 & MMC_CAP2_HC_ERASE_SZ)))= { err =3D 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) --=20 1.7.9.5 --ewXw5AtER31vhhPCtBRRcXecLXWFESHWc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAlPx2kAACgkQgTLQuHmJE0H+PACeO6f7QcSO5p6Php+cDGzN328v zrcAn1pxHU4Wna5qn4wAHcgxKOgAPl0k =JAGd -----END PGP SIGNATURE----- --ewXw5AtER31vhhPCtBRRcXecLXWFESHWc--