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: 14821 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9842823FC2 for ; Fri, 15 Feb 2013 06:14:12 +0000 (UTC) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by fiordland.canonical.com (Postfix) with ESMTP id 3BF1AA18048 for ; Fri, 15 Feb 2013 06:14:12 +0000 (UTC) Received: by mail-ve0-f179.google.com with SMTP id da11so2738269veb.24 for ; Thu, 14 Feb 2013 22:14:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-auditid:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-brightmail-tracker:x-brightmail-tracker :dlp-filter:x-mtr:x-cfilter-loop:x-gm-message-state; bh=VRJgHbMbKXv4r75H48jgS9DcoR6Cbe3xJxHvpjjTLXs=; b=AMlRa2zDeOB0NfBxJ+HEdeo9MzYb/kgh9re5vphyaaDCrHarr3+i6xT/2DfLRasJWN BeWH2jiXuggssh3g697ccTC70teJ8QiP5XTs7oAMaV4CovcL/SFn5e61PHUUYB0i7DbZ xZtmgmgg+uK13pb2MFKmlY3DSbS/RyGyfJGtzsaNt51NZWmYpHohcpNwmpArXeCPRE1e vWV5LfcdIcRYpcTcueilSJFqZYQrSMANly7CMnf5cVVxk2GRkeIm4ERS4SnF8UOE81jm fMAFQA2ApFWFkBnApKUyiL3oOTocDcPGDTPb3gQqamyoBafhZ94hDGZdj566K3L+S6Hj f5HQ== X-Received: by 10.52.33.167 with SMTP id s7mr1492327vdi.52.1360908851738; Thu, 14 Feb 2013 22:14:11 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp305013vcb; Thu, 14 Feb 2013 22:14:11 -0800 (PST) X-Received: by 10.68.0.41 with SMTP id 9mr3258476pbb.132.1360908850533; Thu, 14 Feb 2013 22:14:10 -0800 (PST) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by mx.google.com with ESMTP id u5si11219821pav.192.2013.02.14.22.14.09; Thu, 14 Feb 2013 22:14:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of amarendra.xt@samsung.com designates 203.254.224.24 as permitted sender) client-ip=203.254.224.24; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of amarendra.xt@samsung.com designates 203.254.224.24 as permitted sender) smtp.mail=amarendra.xt@samsung.com Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MI800J4GZZ1VHN0@mailout1.samsung.com>; Fri, 15 Feb 2013 15:14:09 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 8B.BB.16905.132DD115; Fri, 15 Feb 2013 15:14:09 +0900 (KST) X-AuditID: cbfee68d-b7f4f6d000004209-71-511dd2315a1e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 31.9A.03918.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>; Fri, 15 Feb 2013 15:14:08 +0900 (KST) From: Amar To: u-boot@lists.denx.de Cc: patches@linaro.org, sjg@chromium.org, mk7.kang@samsung.com, chander.kashyap@linaro.org, afleming@gmail.com, jh80.chung@samsung.com Subject: [PATCH V6 07/10] MMC: APIs to support resize of EMMC boot partition 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+NgFjrNLMWRmVeSWpSXmKPExsWyRsSkWtfwkmygwbFHnBYP199ksZhy+AuL A5PHnWt72AIYo7hsUlJzMstSi/TtErgyVn46w1rQY1qx9MxWpgbGtVpdjJwcEgImEkdbTzNC 2GISF+6tZ+ti5OIQEljKKLHjzTR2mKJ3D58wQiSmM0qsuT4Tyullkrj54DdTFyMHB5uAqsSv xfYgDSICEhK/+q+C1TALdABNmrgZbIWwgI/E0uM7mUFsFqD6K4tXg23gFXCXmPGlmwlim5zE hz2PwOKcAh4S5ya/BqsXAqrZ+akDbKiEwG02iR0P26EGCUh8m3yIBeQICQFZiU0HmCHmSEoc XHGDZQKj8AJGhlWMoqkFyQXFSelFhnrFibnFpXnpesn5uZsYgQF5+t+z3h2Mtw9YH2JMBho3 kVlKNDkfGNB5JfGGxibmpsamZkaWlpampAkrifPKXZIJFBJITyxJzU5NLUgtii8qzUktPsTI xMEp1cDIf7pbdTX/1mIZ/tA8hwu5Gk/SMw1KDvnIi3ofrn2sMWX9lpy2g5Urim+43e5YYLWG X0qbL3cl584eIz8jXvFTpTsaNu7d02H3+NLzK+x/4oSsZss/8JP7G3/23+P5k1oZOd809Lke ziue9yip/cdWm7VmN+/Y/zUIEbn7wO2FQKWmlsSMMCslluKMREMt5qLiRABd9yU1XgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBIsWRmVeSWpSXmKPExsVy+t9jQV2DS7KBBl+/Wlg8XH+TxWLK4S8s Dkwed67tYQtgjGpgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLx CdB1y8wBmq2kUJaYUwoUCkgsLlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxhzFj56QxrQY9p xdIzW5kaGNdqdTFyckgImEi8e/iEEcIWk7hwbz1bFyMXh5DAdEaJNddnMkI4vUwSNx/8Zupi 5OBgE1CV+LXYHqRBREBC4lf/VbAaZoEORokdEzeDTRIW8JFYenwnM4jNAlR/ZfFqdhCbV8Bd YsaXbiaIbXISH/Y8AotzCnhInJv8GqxeCKhm56cOxgmMvAsYGVYxiqYWJBcUJ6XnGuoVJ+YW l+al6yXn525iBIf7M6kdjCsbLA4xCnAwKvHwCkjIBgqxJpYVV+YeYpTgYFYS4V0TAhTiTUms rEotyo8vKs1JLT7EmAx01URmKdHkfGAs5pXEGxqbmJsam1qaWJiYWZImrCTOy3jqSYCQQHpi SWp2ampBahHMFiYOTqkGxvDHl9cYZzktcnukl6Q26aCvWFN+64IbX+vPsWTVGFVtWSfdy6t8 s2HPpiXzHKPYI+7MbVucf3nnP4dIaW02k4gzHvLTk61/LJiksju8macg5GWaz/kQpqfNQZUr FqkYycQsTeaR7djvrD7Z+s3E345/Nr0ui5hieUEj5c4+43uHmB59FpnxS4mlOCPRUIu5qDgR AFXHQyK7AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQnjwiFdV/chVQI4DG9UIHf1hlr43MHXZTtVPzHG8vBiiJJQCoIM+Y4pEffWAfv0w3zQaq2q 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)