From patchwork Fri Feb 15 06:34:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amar X-Patchwork-Id: 220652 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B862E2C0089 for ; Fri, 15 Feb 2013 17:15:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B85E4A1C7; Fri, 15 Feb 2013 07:15:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w0hjBbAZB-vG; Fri, 15 Feb 2013 07:15:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3CB164A1CF; Fri, 15 Feb 2013 07:14:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E0114A1B5 for ; Fri, 15 Feb 2013 07:14:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wGir02YeZ3EY for ; Fri, 15 Feb 2013 07:14:29 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id E50104A0A9 for ; Fri, 15 Feb 2013 07:14:11 +0100 (CET) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MI800C0YZZ235K0@mailout1.samsung.com> for u-boot@lists.denx.de; Fri, 15 Feb 2013 15:14:10 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id F8.58.06692.132DD115; Fri, 15 Feb 2013 15:14:09 +0900 (KST) X-AuditID: cbfee691-b7f556d000001a24-9f-511dd231c11c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id CD.53.03880.032DD115; Fri, 15 Feb 2013 15:14:08 +0900 (KST) Received: from chrome-ubuntu.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MI8005Z0ZYZ7R20@mmp2.samsung.com> for u-boot@lists.denx.de; Fri, 15 Feb 2013 15:14:08 +0900 (KST) From: Amar To: u-boot@lists.denx.de Date: Fri, 15 Feb 2013 01:34:48 -0500 Message-id: <1360910091-6285-8-git-send-email-amarendra.xt@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1360910091-6285-1-git-send-email-amarendra.xt@samsung.com> References: <1360910091-6285-1-git-send-email-amarendra.xt@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKLMWRmVeSWpSXmKPExsWyRsSkStfwkmygwfbjHBZv93ayOzB6nL2z gzGAMYrLJiU1J7MstUjfLoErY+WnM6wFPaYVS89sZWpgXKvVxcjJISFgIvF2zyRWCFtM4sK9 9WxdjFwcQgJLGSUamp6zwBTNPnibGcQWEpjOKPF1qQFE0TImiZ/XtgJ1cHCwCahK/FpsD1Ij IiAh8av/KiNIDbNAB6PEjombGUESwgI+EkuP7wQbxAJUf2XxanYQm1fAXWLGl24miGVyEh/2 PAKLcwp4SJyb/BpqsbvEzk8dYEMlBK6zSUx4f5kFYpCAxLfJh1hAjpAQkJXYdIAZYo6kxMEV N1gmMAovYGRYxSiaWpBcUJyUXmSqV5yYW1yal66XnJ+7iREYhKf/PZu4g/H+AetDjMlA4yYy S4km5wODOK8k3tDYxNzU2NTMyNLS0pQ0YSVxXvlLMoFCAumJJanZqakFqUXxRaU5qcWHGJk4 OKUaGGfufbl/f4FVy/m2NV94Gct1o0V4rW8v7/tfF3xoxgPr9yFcDs13Pxbfzz0kcCkrWLde 88P643dU1bp97Pd97L0b12YZz21/ukat48X05DsvH25ay7ZEant8NG+epL+bhPOFE9kHbY8x 6F+O8Pm69KZ1m6TFou6XPs3cPYsfB007MiOR58mCSUosxRmJhlrMRcWJAIyGrjRYAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jQV2DS7KBBu9nWFm83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoyVn86wFvSYViw9s5Wp gXGtVhcjJ4eEgInE7IO3mSFsMYkL99azgdhCAtMZJb4uNehi5AKylzFJ/Ly2FSjBwcEmoCrx a7E9SI2IgITEr/6rjCA1zAIdjBI7Jm5mBEkIC/hILD2+E2woC1D9lcWr2UFsXgF3iRlfupkg lslJfNjzCCzOKeAhcW7ya2aIxe4SOz91ME5g5F3AyLCKUTS1ILmgOCk910ivODG3uDQvXS85 P3cTIzjEn0nvYFzVYHGIUYCDUYmHV0BCNlCINbGsuDL3EKMEB7OSCO+aEKAQb0piZVVqUX58 UWlOavEhxmSgqyYyS4km5wPjL68k3tDYxNzU2NTSxMLEzJI0YSVxXsZTTwKEBNITS1KzU1ML UotgtjBxcEoBg/n9y5TC6y4hhxcoPPe7dPf2Qc2NN8U2H577NPLuKpcnP578Ps0aOfmWW39d f+eB45W3u4zreox2bLhmKnni8VX2MuHramdZ13oZaojmVF+f+O3QUx27jR0Vad5vuZT+dSpb PNB1MErivblM3PAQ65Ut8j+8cx/WVAqoTJhptv3CHV+9vVO+bVZiKc5INNRiLipOBADA5bWZ tQIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: patches@linaro.org, jh80.chung@samsung.com, afleming@gmail.com Subject: [U-Boot] [PATCH V6 07/10] MMC: APIs to support resize of EMMC boot partition X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch adds APIs to access(open / close) and to resize boot partiton of EMMC. Signed-off-by: Amar Acked-by: Simon Glass --- Changes since V1: New patch. Changes since V2: 1)Updation of commit message and resubmition of proper patch set. Changes since V3: No change. Changes since V4: 1)Replaced the functions mmc_boot_open() & mmc_boot_close() with a single function mmc_boot_part_access(). Changes since V5: 1)Updated in response to review comments. drivers/mmc/mmc.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mmc.h | 26 +++++++++++ 2 files changed, 158 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 72e8ce6..d3e4bf7 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1327,3 +1327,135 @@ int mmc_initialize(bd_t *bis) return 0; } + +/* + * This function changes the size of boot partition and the size of rpmb + * partition present on EMMC devices. + * + * Input Parameters: + * struct *mmc: pointer for the mmc device strcuture + * bootsize: size of boot partition + * rpmbsize: size of rpmb partition + * + * Returns 0 on success. + */ + +int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, + unsigned long rpmbsize) +{ + int err; + struct mmc_cmd cmd; + + /* Only use this command for raw EMMC moviNAND. Enter backdoor mode */ + cmd.cmdidx = MMC_CMD_RES_MAN; + cmd.resp_type = MMC_RSP_R1b; + cmd.cmdarg = MMC_CMD62_ARG1; + + err = mmc_send_cmd(mmc, &cmd, NULL); + if (err) { + debug("mmc_boot_partition_size_change: Error1 = %d\n", err); + return err; + } + + /* Boot partition changing mode */ + cmd.cmdidx = MMC_CMD_RES_MAN; + cmd.resp_type = MMC_RSP_R1b; + cmd.cmdarg = MMC_CMD62_ARG2; + + err = mmc_send_cmd(mmc, &cmd, NULL); + if (err) { + debug("mmc_boot_partition_size_change: Error2 = %d\n", err); + return err; + } + /* boot partition size is multiple of 128KB */ + bootsize = (bootsize * 1024) / 128; + + /* Arg: boot partition size */ + cmd.cmdidx = MMC_CMD_RES_MAN; + cmd.resp_type = MMC_RSP_R1b; + cmd.cmdarg = bootsize; + + err = mmc_send_cmd(mmc, &cmd, NULL); + if (err) { + debug("mmc_boot_partition_size_change: Error3 = %d\n", err); + return err; + } + /* RPMB partition size is multiple of 128KB */ + rpmbsize = (rpmbsize * 1024) / 128; + /* Arg: RPMB partition size */ + cmd.cmdidx = MMC_CMD_RES_MAN; + cmd.resp_type = MMC_RSP_R1b; + cmd.cmdarg = rpmbsize; + + err = mmc_send_cmd(mmc, &cmd, NULL); + if (err) { + debug("mmc_boot_partition_size_change: Error4 = %d\n", err); + return err; + } + return 0; +} + +/* + * This function shall form and send the commands to open / close the + * boot partition specified by user. + * + * Input Parameters: + * ack: 0x0 - No boot acknowledge sent (default) + * 0x1 - Boot acknowledge sent during boot operation + * part_num: User selects boot data that will be sent to master + * 0x0 - Device not boot enabled (default) + * 0x1 - Boot partition 1 enabled for boot + * 0x2 - Boot partition 2 enabled for boot + * access: User selects partitions to access + * 0x0 : No access to boot partition (default) + * 0x1 : R/W boot partition 1 + * 0x2 : R/W boot partition 2 + * 0x3 : R/W Replay Protected Memory Block (RPMB) + * + * Returns 0 on success. + */ +int mmc_boot_part_access(struct mmc *mmc, u32 ack, u32 part_num, u32 access) +{ + int err; + struct mmc_cmd cmd; + + /* Boot ack enable, boot partition enable , boot partition access */ + cmd.cmdidx = MMC_CMD_SWITCH; + cmd.resp_type = MMC_RSP_R1b; + + cmd.cmdarg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) | + (EXT_CSD_PART_CONF << 16) | + ((EXT_CSD_BOOT_ACK(ack) | + EXT_CSD_BOOT_PART_NUM(part_num) | + EXT_CSD_PARTITION_ACCESS(access)) << 8); + + err = mmc_send_cmd(mmc, &cmd, NULL); + if (err) { + if (access) { + debug("mmc boot partition#%d open failure:" + "Error1 = %d\n", part_num, err); + } else { + debug("mmc boot partition#%d close failure:" + "Error = %d\n", part_num, err); + } + return err; + } + + if (access) { + /* 4bit transfer mode at booting time. */ + cmd.cmdidx = MMC_CMD_SWITCH; + cmd.resp_type = MMC_RSP_R1b; + + cmd.cmdarg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) | + (EXT_CSD_BOOT_BUS_WIDTH << 16) | + ((1<<0) << 8); + + err = mmc_send_cmd(mmc, &cmd, NULL); + if (err) { + debug("mmc boot partition#%d open failure:" + "Error2 = %d\n", part_num, err); + return err; + } + } + return 0; +} diff --git a/include/mmc.h b/include/mmc.h index a13e2bd..cbbe02d 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -86,6 +86,11 @@ #define MMC_CMD_APP_CMD 55 #define MMC_CMD_SPI_READ_OCR 58 #define MMC_CMD_SPI_CRC_ON_OFF 59 +#define MMC_CMD_RES_MAN 62 + +#define MMC_CMD62_ARG1 0xefac62ec +#define MMC_CMD62_ARG2 0xcbaea7 + #define SD_CMD_SEND_RELATIVE_ADDR 3 #define SD_CMD_SWITCH_FUNC 6 @@ -153,6 +158,7 @@ */ #define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */ #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ +#define EXT_CSD_BOOT_BUS_WIDTH 177 #define EXT_CSD_PART_CONF 179 /* R/W */ #define EXT_CSD_BUS_WIDTH 183 /* R/W */ #define EXT_CSD_HS_TIMING 185 /* R/W */ @@ -177,6 +183,16 @@ #define EXT_CSD_BUS_WIDTH_4 1 /* Card is in 4 bit mode */ #define EXT_CSD_BUS_WIDTH_8 2 /* Card is in 8 bit mode */ +#define EXT_CSD_BOOT_ACK_ENABLE (1<<6) +#define EXT_CSD_BOOT_PARTITION_ENABLE (1<<3) +#define EXT_CSD_PARTITION_ACCESS_ENABLE (1<<0) +#define EXT_CSD_PARTITION_ACCESS_DISABLE (0<<0) + +#define EXT_CSD_BOOT_ACK(x) (x<<6) +#define EXT_CSD_BOOT_PART_NUM(x) (x<<3) +#define EXT_CSD_PARTITION_ACCESS(x) (x<<0) + + #define R1_ILLEGAL_COMMAND (1 << 22) #define R1_APP_CMD (1 << 5) @@ -201,6 +217,11 @@ #define PART_ACCESS_MASK (0x7) #define PART_SUPPORT (0x1) +/* The number of MMC physical partitions. These consist of: + * boot partitions (2), general purpose partitions (4) in MMC v4.4. + */ +#define MMC_NUM_BOOT_PARTITION 2 + struct mmc_cid { unsigned long psn; unsigned short oid; @@ -275,6 +296,11 @@ int board_mmc_getcd(struct mmc *mmc); int mmc_switch_part(int dev_num, unsigned int part_num); int mmc_getcd(struct mmc *mmc); void spl_mmc_load(void) __noreturn; +/* Function to change the size of boot partition and rpmb partitions */ +int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, + unsigned long rpmbsize); +/* Function to send commands to open/close the specified boot partition */ +int mmc_boot_part_access(struct mmc *mmc, u32 ack, u32 part_num, u32 access); #ifdef CONFIG_GENERIC_MMC #define mmc_host_is_spi(mmc) ((mmc)->host_caps & MMC_MODE_SPI)