From patchwork Sat Apr 27 06:13:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amar X-Patchwork-Id: 240088 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 497C32C0085 for ; Sat, 27 Apr 2013 16:11:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7C4344A162; Sat, 27 Apr 2013 08:10:54 +0200 (CEST) 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 G48kdVhojTW9; Sat, 27 Apr 2013 08:10:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F08D64A179; Sat, 27 Apr 2013 08:09:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6DF7C4A13E for ; Sat, 27 Apr 2013 08:09:51 +0200 (CEST) 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 BYJLBrqt9QAI for ; Sat, 27 Apr 2013 08:09:49 +0200 (CEST) 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 mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id 5F84F4A134 for ; Sat, 27 Apr 2013 08:09:23 +0200 (CEST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MLW009Q2H3LIQA0@mailout3.samsung.com> for u-boot@lists.denx.de; Sat, 27 Apr 2013 15:09:21 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 43.66.19350.19B6B715; Sat, 27 Apr 2013 15:09:21 +0900 (KST) X-AuditID: cbfee691-b7fe56d000004b96-ae-517b6b91d069 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 23.7D.01422.19B6B715; Sat, 27 Apr 2013 15:09:21 +0900 (KST) Received: from amarendra-desktop.sisodomain.com ([107.108.73.18]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MLW00DPDH2TOT50@mmp2.samsung.com>; Sat, 27 Apr 2013 15:09:21 +0900 (KST) From: amar_g To: u-boot@lists.denx.de, jh80.chung@samsung.com Date: Sat, 27 Apr 2013 11:43:00 +0530 Message-id: <1367043180-6756-10-git-send-email-amarendra.xt@samsung.com> X-Mailer: git-send-email 1.7.3.rc2 In-reply-to: <1367043180-6756-1-git-send-email-amarendra.xt@samsung.com> References: <1367043180-6756-1-git-send-email-amarendra.xt@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42JZI2JSpzsxuzrQoKdXxOLG9Z9sFl8WdLJb PFx/k8Vix537zBY3frWxWnQcaWG0mHL4C4vFty3bGC3e7u1kd+D0mN1wkcVj3qwTLB47Z91l 97hzbQ+bx9k7Oxg9+rasYgxgi+KySUnNySxLLdK3S+DKaPpwjblgj3bFnfZzTA2Mi5W6GDk5 JARMJG60HmGHsMUkLtxbz9bFyMUhJLCUUeLX1/UsMEX971exQiSmM0p8OgZTNYFJYt6qR8wg VWwC6hJPPq1lBbFFBAwkpj/ZDtbBLDCfUWLxt0dgO4QFMiROrJ4OVsQioCrR/awTzOYV8JB4 MGU/I8Q6JYnzG1+DxTmB4v9ufAZbICTgLrFv2lSwoRICm9gl7q/5wwYxSEDi2+RDQLdyACVk JTYdYIaYIylxcMUNlgmMwgsYGVYxiqYWJBcUJ6UXmeoVJ+YWl+al6yXn525iBMbC6X/PJu5g vH/A+hBjMtC4icxSosn5wFjKK4k3NDYzsjA1MTU2Mrc0I01YSZxXvcU6UEggPbEkNTs1tSC1 KL6oNCe1+BAjEwenVAPjRKMlufYClTatOjVe746cV+J3jlwl4blLar3guQmGgrm3JxnozLsm 2cTVfvgvy/fCqpnBx79OlliS9Hb5/nk/Vn98mlYa8WRRuMf6i29Ud6y/KKqx+9luputRQse/ rD2pfmbLnIpVSefmZzzqW30l7dvuqGVb0m7tjAm7llLTUuBdqZQuPt8kV4mlOCPRUIu5qDgR ABoqbfmbAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRmVeSWpSXmKPExsVy+t9jQd2J2dWBBo/2c1ncuP6TzeLLgk52 i4frb7JY7Lhzn9nixq82VouOIy2MFlMOf2Gx+LZlG6PF272d7A6cHrMbLrJ4zJt1gsVj56y7 7B53ru1h8zh7ZwejR9+WVYwBbFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbm Sgp5ibmptkouPgG6bpk5QHcpKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLrMTJAAwlr GDOaPlxjLtijXXGn/RxTA+NipS5GTg4JAROJ/verWCFsMYkL99azdTFycQgJTGeU+HQMxpnA JDFv1SNmkCo2AXWJJ5/WgnWICBhITH+ynRWkiFlgPqPE4m+P2EESwgIZEidWTwcrYhFQleh+ 1glm8wp4SDyYsp8RYp2SxPmNr8HinEDxfzc+gy0QEnCX2DdtKusERt4FjAyrGEVTC5ILipPS c430ihNzi0vz0vWS83M3MYIj7Zn0DsZVDRaHGAU4GJV4eDUWVQUKsSaWFVfmHmKU4GBWEuFV TK0OFOJNSaysSi3Kjy8qzUktPsSYDHTVRGYp0eR8YBLIK4k3NDYxNzU2tTSxMDGzJE1YSZz3 YKt1oJBAemJJanZqakFqEcwWJg5OqQbGmc1vtRPn7Ap75rVjBhv/lhXXNlvcN3ilybG/3f1H 06QVjrxpBV47IrsVw7i6Q64eLNOpcVSY+XbTotsfKoQMZy624hF7+kXu/fy5h1mN37MbfBJM M9Gqmp38aX/bvuZW62vTZ9mfeXvPdcKNb3WJXbH5Uz1tKu0OvDn4bOrDru7okHmhUywOKrEU ZyQaajEXFScCAFo7I/T4AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: patches@linaro.org, afleming@gmail.com, hs@denx.de Subject: [U-Boot] [PATCH V9 9/9] COMMON: MMC: Command to support EMMC booting and to resize 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 From: Amar This patch adds commands to access(open/close) and resize boot partitions on EMMC. Signed-off-by: Amar --- Changes since V1: 1)Combined the common piece of code between 'open' and 'close' operations. Changes since V2: 1)Updation of commit message and resubmition of proper patch set. Changes since V3: No change. Changes since V4: 1)Added a new funtion boot_part_access() to combine the common parts of 'mmc open' and 'mmc close' functionalities. 2)Used the generic function "mmc_boot_part_access()" instead of two functions "mmc_boot_open()" and "mmc_boot_close()". By doing so user can specify which boot partition to be accessed (opened / closed). Changes since V5: 1)Updated minor nits in response to review comments. Changes since V6: No change. Changes since V7: 1)The piece of code involved in open/close and resize of EMMC boot partition has been made conditional and is enabled only if the macro CONFIG_SUPPORT_EMMC_BOOT is defined. Changes since V8: 1)Updated the below in response to review comments a)Changed the type of input parameters from u32 to u8 for the function boot_part_access(). b)Updated the function call to use a constant value 1, like boot_part_access(mmc, 1, part_num, access). --- common/cmd_mmc.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 9f3d6c5..3a12c38 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -147,6 +147,36 @@ U_BOOT_CMD( "- display info of the current MMC device" ); +#ifdef CONFIG_SUPPORT_EMMC_BOOT +static int boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access) +{ + int err; + err = mmc_boot_part_access(mmc, ack, part_num, access); + + if ((err == 0) && (access != 0)) { + printf("\t\t\t!!!Notice!!!\n"); + + printf("!You must close EMMC boot Partition"); + printf("after all images are written\n"); + + printf("!EMMC boot partition has continuity"); + printf("at image writing time.\n"); + + printf("!So, do not close the boot partition"); + printf("before all images are written.\n"); + return 0; + } else if ((err == 0) && (access == 0)) + return 0; + else if ((err != 0) && (access != 0)) { + printf("EMMC boot partition-%d OPEN Failed.\n", part_num); + return 1; + } else { + printf("EMMC boot partition-%d CLOSE Failed.\n", part_num); + return 1; + } +} +#endif + static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { enum mmc_state state; @@ -258,8 +288,74 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) curr_device, mmc->part_num); return 0; - } +#ifdef CONFIG_SUPPORT_EMMC_BOOT + } else if ((strcmp(argv[1], "open") == 0) || + (strcmp(argv[1], "close") == 0)) { + int dev; + struct mmc *mmc; + u8 part_num, access = 0; + + if (argc == 4) { + dev = simple_strtoul(argv[2], NULL, 10); + part_num = simple_strtoul(argv[3], NULL, 10); + } else { + return CMD_RET_USAGE; + } + + mmc = find_mmc_device(dev); + if (!mmc) { + printf("no mmc device at slot %x\n", dev); + return 1; + } + if (IS_SD(mmc)) { + printf("SD device cannot be opened/closed\n"); + return 1; + } + + if ((part_num <= 0) || (part_num > MMC_NUM_BOOT_PARTITION)) { + printf("Invalid boot partition number:\n"); + printf("Boot partition number cannot be <= 0\n"); + printf("EMMC44 supports only 2 boot partitions\n"); + return 1; + } + + if (strcmp(argv[1], "open") == 0) + access = part_num; /* enable R/W access to boot part*/ + else + access = 0; /* No access to boot partition */ + + /* acknowledge to be sent during boot operation */ + return boot_part_access(mmc, 1, part_num, access); + + } else if (strcmp(argv[1], "bootpart") == 0) { + int dev; + dev = simple_strtoul(argv[2], NULL, 10); + + u32 bootsize = simple_strtoul(argv[3], NULL, 10); + u32 rpmbsize = simple_strtoul(argv[4], NULL, 10); + struct mmc *mmc = find_mmc_device(dev); + if (!mmc) { + printf("no mmc device at slot %x\n", dev); + return 1; + } + + if (IS_SD(mmc)) { + printf("It is not a EMMC device\n"); + return 1; + } + + if (0 == mmc_boot_partition_size_change(mmc, + bootsize, rpmbsize)) { + printf("EMMC boot partition Size %d MB\n", bootsize); + printf("EMMC RPMB partition Size %d MB\n", rpmbsize); + return 0; + } else { + printf("EMMC boot partition Size change Failed.\n"); + return 1; + } +#endif /* CONFIG_SUPPORT_EMMC_BOOT */ + } state = MMC_INVALID; if (argc == 5 && strcmp(argv[1], "read") == 0) state = MMC_READ; @@ -334,5 +430,14 @@ U_BOOT_CMD( "mmc rescan\n" "mmc part - lists available partition on current mmc device\n" "mmc dev [dev] [part] - show or set current mmc device [partition]\n" - "mmc list - lists available devices"); + "mmc list - lists available devices\n" +#ifdef CONFIG_SUPPORT_EMMC_BOOT + "mmc open \n" + " - Enable boot_part for booting and enable R/W access of boot_part\n" + "mmc close \n" + " - Enable boot_part for booting and disable access to boot_part\n" + "mmc bootpart \n" + " - change sizes of boot and RPMB partions of specified device\n" #endif + ); +#endif /* !CONFIG_GENERIC_MMC */