From patchwork Wed Apr 3 14:08:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amar X-Patchwork-Id: 15871 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 6BC3623E21 for ; Wed, 3 Apr 2013 13:53:59 +0000 (UTC) Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by fiordland.canonical.com (Postfix) with ESMTP id 2AE5CA1874D for ; Wed, 3 Apr 2013 13:53:59 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id t12sf2418737lbi.7 for ; Wed, 03 Apr 2013 06:53:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :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 :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-google-group-id:list-post:list-help :list-archive:list-unsubscribe; bh=2MiglQ91jdMRUhRA4faF/1kkN3oI+KnWkdpK7dgkVRs=; b=dlK/87VwEG3t9Im1hE6o/Fz4vRDhPVo2Xkw8ePzdUSJEJDCUZb3oBothX6pcAcGIwr wD53J/u88t6uftSYPi06qrqPkdorFBL9JcRJoWUtu2wA2DxF0SOIWn0rK7N26FqihHrO MLA99dbo3GiM/JSqVRdUVLlcn3YlMliftPRIGB/FwB45+5vbMgnxbcVup56pSG8t4QyL tCLYkRvCBGl8CHPFG7kv2lm8tyk9bDCWnneCgCuOvEUi4S6gIgMHS4WbLFuKezP+JL1g l2neArc4JFxBCqqqif+/KVa6UodwXSlZUjPYPNR3wYyeyhiADaEKEc5fcZseBou+kmKe 9fBA== X-Received: by 10.180.104.98 with SMTP id gd2mr4362305wib.0.1364997238814; Wed, 03 Apr 2013 06:53:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.87.167 with SMTP id az7ls1348612wib.31.canary; Wed, 03 Apr 2013 06:53:58 -0700 (PDT) X-Received: by 10.194.60.195 with SMTP id j3mr3010853wjr.33.1364997238708; Wed, 03 Apr 2013 06:53:58 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id gg11si6714733wic.87.2013.04.03.06.53.58 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Apr 2013 06:53:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id c13so1663581vea.25 for ; Wed, 03 Apr 2013 06:53:57 -0700 (PDT) X-Received: by 10.58.223.134 with SMTP id qu6mr1251023vec.35.1364997237440; Wed, 03 Apr 2013 06:53:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp171313ved; Wed, 3 Apr 2013 06:53:56 -0700 (PDT) X-Received: by 10.67.10.133 with SMTP id ea5mr1103000pad.135.1364997235874; Wed, 03 Apr 2013 06:53:55 -0700 (PDT) Received: from mailout1.samsung.com (mailout1.samsung.com. [203.254.224.24]) by mx.google.com with ESMTP id oy4si6827727pac.244.2013.04.03.06.53.55; Wed, 03 Apr 2013 06:53:55 -0700 (PDT) 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; Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKO00H91MKTNW40@mailout1.samsung.com>; Wed, 03 Apr 2013 22:53:17 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id B1.1B.02019.D443C515; Wed, 03 Apr 2013 22:53:17 +0900 (KST) X-AuditID: cbfee690-b7f656d0000007e3-eb-515c344d5be5 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 84.1F.17838.D443C515; Wed, 03 Apr 2013 22:53:17 +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 <0MKO00KW6MDEHT20@mmp2.samsung.com>; Wed, 03 Apr 2013 22:53:17 +0900 (KST) From: Amar To: u-boot@lists.denx.de, mk7.kang@samsung.com Cc: patches@linaro.org, sjg@chromium.org, chander.kashyap@linaro.org, afleming@gmail.com, jh80.chung@samsung.com, u-boot-review@google.com Subject: [PATCH V8 7/9] MMC: APIs to support resize of EMMC boot partition Date: Wed, 03 Apr 2013 10:08:31 -0400 Message-id: <1364998113-13428-8-git-send-email-amarendra.xt@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1364998113-13428-1-git-send-email-amarendra.xt@samsung.com> References: <1364998113-13428-1-git-send-email-amarendra.xt@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpkkeLIzCtJLcpLzFFi42JZI2JSretrEhNocHe3gcWN6z/ZLB6uv8li ceNXG6tFx5EWRosph7+wWHzbso3RYvnrjewWb/d2sjtweMxuuMjisXPWXXaPBZtKPe5c28Pm cfbODkaPvi2rGAPYorhsUlJzMstSi/TtErgydr/czlzwz7zi8fT/7A2Mh3S6GDk5JARMJNqu TmGCsMUkLtxbz9bFyMUhJLCUUeLig35GmKK/M+cwQySmM0qcf/oeqqqXSeLZwousXYwcHGwC qhK/FtuDNIgI6EnMm/QOrIZZoIdRYu/Sq2ArhAW8JJpenWEDsVmA6j9cfQcW5xXwkDi84yU7 xDY5iQ97HoHZnAKeEu/n7QCrEQKquXP0ISvIUAmBdewSl/beY4EYJCDxbfIhFpAjJARkJTYd YIaYIylxcMUNlgmMwgsYGVYxiqYWJBcUJ6UXmegVJ+YWl+al6yXn525iBAb/6X/PJuxgvHfA +hBjMtC4icxSosn5wOjJK4k3NDYzsjA1MTU2Mrc0I01YSZxXvcU6UEggPbEkNTs1tSC1KL6o NCe1+BAjEwenVAOjkflCbf0tKX4fm7YnN6U7aDGp7ridsWea1IQ34WH1L+ZWRMku+1zklFqa ELziiGrjhdtz9J+eurR74QLH7O2OdoXKb2J3P450e/bjbHjfv9snn3x9+GfLI50lex7F2r6c F/GSOUVcq91S1Wjxy1anLbMPl3yds/glc13D4cJzYi8WmCXpZksLKrEUZyQaajEXFScCAML1 qHaUAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHIsWRmVeSWpSXmKPExsVy+t9jQV1fk5hAg96jahY3rv9ks3i4/iaL xY1fbawWHUdaGC2mHP7CYvFtyzZGi+WvN7JbvN3bye7A4TG74SKLx85Zd9k9Fmwq9bhzbQ+b x9k7Oxg9+rasYgxgi2pgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21 VXLxCdB1y8wBukhJoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmLH75Xbm gn/mFY+n/2dvYDyk08XIySEhYCLxd+YcZghbTOLCvfVsXYxcHEIC0xklzj99D+X0Mkk8W3iR tYuRg4NNQFXi12J7kAYRAT2JeZPegdUwC/QwSuxdepUJJCEs4CXR9OoMG4jNAlT/4eo7sDiv gIfE4R0v2SG2yUl82PMIzOYU8JR4P28HWI0QUM2dow9ZJzDyLmBkWMUomlqQXFCclJ5rqFec mFtcmpeul5yfu4kRHFvPpHYwrmywOMQowMGoxMN74ktUoBBrYllxZe4hRgkOZiURXs7j0YFC vCmJlVWpRfnxRaU5qcWHGJOBrprILCWanA+M+7ySeENjE3NTY1NLEwsTM0vShJXEeQ+0WgcK CaQnlqRmp6YWpBbBbGHi4JRqYIybL87xhTlplyRnpVy1dZ5Kn6XM84j7L7ddqyv7dPLSjg9T D9o2blufa9kUvGBm6s39z284vfV8dKvxY0Tf9BUnV51onWp5fGv64U+zJu5sXLgsqELaIJ0v KS4pJnHizeR/eoU/v9/TZlh6rW2Nyqok3T+zQ60/Sk7a0v3z6v9zJ49sbO1zKVyvxFKckWio xVxUnAgARjI6P/ECAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQlf1uqIaqIs/uTbGMwjb+g1+GsQdQ+hcdf7s7w/Tj/vEbzOlOW1hMw28vkLLfRPt4OoNz89 X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds APIs to access(open / close) and to resize boot partiton of EMMC. Signed-off-by: Amar --- 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. Changes since V6: 1)Added spaces around << operator, in response to review comments. Changes since V7: 1)In the file drivers/mmc/mmc.c, 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. drivers/mmc/mmc.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mmc.h | 26 +++++++++++ 2 files changed, 160 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d732581..a6a04e6 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1352,3 +1352,137 @@ int mmc_initialize(bd_t *bis) return 0; } + +#ifdef CONFIG_SUPPORT_EMMC_BOOT +/* + * 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 fail:Error1 = %d\n", + part_num, err); + } else { + debug("mmc boot partition#%d close fail: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 fail:Error2 = %d\n", + part_num, err); + return err; + } + } + return 0; +} +#endif diff --git a/include/mmc.h b/include/mmc.h index de6d497..ab93576 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; @@ -277,6 +298,11 @@ int mmc_switch_part(int dev_num, unsigned int part_num); int mmc_getcd(struct mmc *mmc); int mmc_getwp(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)