From patchwork Wed May 17 17:20:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 100006 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp333716qge; Wed, 17 May 2017 10:20:57 -0700 (PDT) X-Received: by 10.80.183.100 with SMTP id g91mr3923925ede.86.1495041657494; Wed, 17 May 2017 10:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495041657; cv=none; d=google.com; s=arc-20160816; b=C1UpVhDrZXzXKG7VNPIYg+xhHVfyLPz98uaIXiKYjgLnmJjDIHlSNfpF+q1MvTYFTR fz1KoqQSslqE8/oGsenLvHN0D3DWnUuLT4cLXC4I7b4VnWT2Ad3OR1oMLgOvDuto6eoA Vso/GM0m+e5zGxC4h74UdRoSZvkKNsLRJKR4v2Ah9jcnDWA44AzSlQzT6AAZSR/kGi4P n1DGUnzpGjsDKQz/aSm5w7Y8SQLLJyL+LFyG8EsA88UDe892GUIWJH1R1VZe9fgiSoB7 D8ogWjotcbEi50aK9IWe0cWFt2zL3aAGQpb7iqj4b3hg7kTdnY1aaB1l/rvvGWEhPQQ+ nOLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=ehKA+WagtzCBwUho0j9Tmd4YrtXbHU6vpG8kUpz+sYo=; b=tBE6WzuPNS6vrSHOaGZxmq0qmtObLECcsgmno/hBMc+QL3FTfHeWVDjzadlenTmfqX q5ew2ra9uUYdf7Dqpm4KoI0YNnxw8aVOBgLIg8nj+WFyFinmZ54k4mRNpxuvaepYou3h mHe2xQXwGnw9q5s9Xcvw1OKLV+it7pPZLHm8YnYdU89ueVfb1sdsEI2zaTR0J9bAyx+V CF6MH2Qvj/bxtS4A33rZqFElsy2ibXk7B3emUq5RCr2B0UKA+ikM//k77tbyCocZL4P8 sJnSt3dfh3v/WXtE0xCinoV2aGxOXvrDeZXrzzCTpkb7PRhXmfwTC3ht14toxmbUxcXS TbDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id d12si3134328edb.59.2017.05.17.10.20.57; Wed, 17 May 2017 10:20:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 00136C21DB5; Wed, 17 May 2017 17:20:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C7823C21C6F; Wed, 17 May 2017 17:20:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A9456C21C6F; Wed, 17 May 2017 17:20:51 +0000 (UTC) Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by lists.denx.de (Postfix) with ESMTPS id 39943C21C4A for ; Wed, 17 May 2017 17:20:50 +0000 (UTC) Received: by mail-wr0-f172.google.com with SMTP id w50so16026701wrc.0 for ; Wed, 17 May 2017 10:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=O/ZGS8XRC/TrPgGsN8O0YZdot1NLJPEH+QYRrH/QmjM=; b=XMejTtA8+ewurC0t0BfG9KawjPyNwahjMsAvPRxbs0OdmXZiGyY1HvxkRJRAJHl7Lc OVTgWWowIDPuxYrlrNUIfcXuod9qiED/TleiUt8cH3Vg2IpniWF2BygINWLUOMWZAYW8 yxN6KP0NN+TsMoD8fbrRo1/gteLJvc/XWhTvw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=O/ZGS8XRC/TrPgGsN8O0YZdot1NLJPEH+QYRrH/QmjM=; b=j5Fncj6TQV+HtKRWG+QzCKgZxuEtRMwhuWfenv4ueFcZupLQLCvK89fsgnkXOMvU0K jgbLKpPDm1Sp0Orvij8vcePMgQ2ujMA0t9+0Jc6YR4wuuFxMNxDmpwjgm2lezuX2rQPY tROwrze0lNdRflo9uaI35PXS30mC78oiXGtwntm8TXwp3u+p62YiYSg2uv33+97kq8tG IixYG8+9cQ1RNVMdrtnAG1yHn4+LXEBxU5GY16NjJ2eTRH6YF2AbCvDl22ZpQY5xuJcO Qf+LT1iMJO2NXWUPLaZpTjx0NLwZZZDGQJk6IqLOJYIQwDzL6YgndbD4SARDfICX1v32 rC1w== X-Gm-Message-State: AODbwcDP2PNufY0e1j4HJdN6rvyvccKK3+a4E0jHETNMomnfkYUJOjhY 1CYESk3vi2kOwr3g X-Received: by 10.46.88.15 with SMTP id m15mr1143619ljb.116.1495041649815; Wed, 17 May 2017 10:20:49 -0700 (PDT) Received: from localhost ([195.238.92.132]) by smtp.gmail.com with ESMTPSA id b71sm480752lfg.32.2017.05.17.10.20.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 May 2017 10:20:48 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Wed, 17 May 2017 20:20:47 +0300 Message-Id: <20170517172047.19371-1-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.11.0 Cc: Praneeth Bajjuri , Tom Rini Subject: [U-Boot] [PATCH v2] fastboot: Add support for flashing zImage X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch adds support for flashing zImage to the Android boot partition on eMMC. Usage: $ fastboot flash zImage It's based on [1]. [1] http://omapzoom.org/?p=repo/u-boot.git;a=commit;h=3393b908c1e848bba3706612cbe50aa8970720b3 Signed-off-by: Sam Protsenko --- Changes in v2: - use blk_dread()/blk_dwrite() instead of callbacks from struct blk_desc - fix SPL build warning on DRA7 (check for CONFIG_ANDROID_BOOT_IMAGE) common/fb_mmc.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ include/android_image.h | 2 + include/linux/compat.h | 3 + 3 files changed, 173 insertions(+) diff --git a/common/fb_mmc.c b/common/fb_mmc.c index 866982e41c..d26966fd66 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include #include #include #include @@ -11,6 +12,7 @@ #include #include #include +#include #include #include @@ -27,6 +29,8 @@ #define CONFIG_FASTBOOT_MBR_NAME "mbr" #endif +#define BOOT_PARTITION_NAME "boot" + struct fb_mmc_sparse { struct blk_desc *dev_desc; }; @@ -99,6 +103,163 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info, fastboot_okay(""); } +#ifdef CONFIG_ANDROID_BOOT_IMAGE +/** + * Read Android boot image header from boot partition. + * + * @param[in] dev_desc MMC device descriptor + * @param[in] info Boot partition info + * @param[out] hdr Where to store read boot image header + * + * @return Boot image header sectors count or 0 on error + */ +static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, + disk_partition_t *info, + struct andr_img_hdr *hdr) +{ + ulong sector_size; /* boot partition sector size */ + lbaint_t hdr_sectors; /* boot image header sectors count */ + int res; + + /* Calculate boot image sectors count */ + sector_size = info->blksz; + hdr_sectors = DIV_ROUND_UP(sizeof(struct andr_img_hdr), sector_size); + if (hdr_sectors == 0) { + error("invalid number of boot sectors: 0"); + fastboot_fail("invalid number of boot sectors: 0"); + return 0; + } + + /* Read the boot image header */ + res = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr); + if (res == 0) { + error("cannot read header from boot partition"); + fastboot_fail("cannot read header from boot partition"); + return 0; + } + + /* Check boot header magic string */ + res = android_image_check_header(hdr); + if (res != 0) { + error("bad boot image magic"); + fastboot_fail("boot partition not initialized"); + return 0; + } + + return hdr_sectors; +} + +/** + * Write downloaded zImage to boot partition and repack it properly. + * + * @param dev_desc MMC device descriptor + * @param download_buffer Address to fastboot buffer with zImage in it + * @param download_bytes Size of fastboot buffer, in bytes + * + * @return 0 on success or -1 on error + */ +static int fb_mmc_update_zimage(struct blk_desc *dev_desc, + void *download_buffer, + unsigned int download_bytes) +{ + u32 hdr_addr; /* boot image header address */ + struct andr_img_hdr *hdr; /* boot image header */ + lbaint_t hdr_sectors; /* boot image header sectors */ + u8 *ramdisk_buffer; + u32 ramdisk_sector_start; + u32 ramdisk_sectors; + u32 kernel_sector_start; + u32 kernel_sectors; + u32 sectors_per_page; + disk_partition_t info; + int res; + + puts("Flashing zImage\n"); + + /* Get boot partition info */ + res = part_get_info_by_name(dev_desc, BOOT_PARTITION_NAME, &info); + if (res < 0) { + error("cannot find boot partition"); + fastboot_fail("cannot find boot partition"); + return -1; + } + + /* Put boot image header in fastboot buffer after downloaded zImage */ + hdr_addr = (u32)download_buffer + PAGE_ALIGN(download_bytes); + hdr = (struct andr_img_hdr *)hdr_addr; + + /* Read boot image header */ + hdr_sectors = fb_mmc_get_boot_header(dev_desc, &info, hdr); + if (hdr_sectors == 0) { + error("unable to read boot image header"); + fastboot_fail("unable to read boot image header"); + return -1; + } + + /* Check if boot image has second stage in it (we don't support it) */ + if (hdr->second_size > 0) { + error("moving second stage is not supported yet"); + fastboot_fail("moving second stage is not supported yet"); + return -1; + } + + /* Extract ramdisk location */ + sectors_per_page = hdr->page_size / info.blksz; + ramdisk_sector_start = info.start + sectors_per_page; + ramdisk_sector_start += DIV_ROUND_UP(hdr->kernel_size, hdr->page_size) * + sectors_per_page; + ramdisk_sectors = DIV_ROUND_UP(hdr->ramdisk_size, hdr->page_size) * + sectors_per_page; + + /* Read ramdisk and put it in fastboot buffer after boot image header */ + ramdisk_buffer = (u8 *)hdr + (hdr_sectors * info.blksz); + res = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors, + ramdisk_buffer); + if (res == 0) { + error("cannot read ramdisk from boot partition"); + fastboot_fail("cannot read ramdisk from boot partition"); + return -1; + } + + /* Write new kernel size to boot image header */ + hdr->kernel_size = download_bytes; + res = blk_dwrite(dev_desc, info.start, hdr_sectors, (void *)hdr); + if (res == 0) { + error("cannot writeback boot image header"); + fastboot_fail("cannot write back boot image header"); + return -1; + } + + /* Write the new downloaded kernel */ + kernel_sector_start = info.start + sectors_per_page; + kernel_sectors = DIV_ROUND_UP(hdr->kernel_size, hdr->page_size) * + sectors_per_page; + res = blk_dwrite(dev_desc, kernel_sector_start, kernel_sectors, + download_buffer); + if (res == 0) { + error("cannot write new kernel"); + fastboot_fail("cannot write new kernel"); + return -1; + } + + /* Write the saved ramdisk back */ + ramdisk_sector_start = info.start + sectors_per_page; + ramdisk_sector_start += DIV_ROUND_UP(hdr->kernel_size, hdr->page_size) * + sectors_per_page; + res = blk_dwrite(dev_desc, ramdisk_sector_start, ramdisk_sectors, + ramdisk_buffer); + if (res == 0) { + error("cannot write back original ramdisk"); + fastboot_fail("cannot write back original ramdisk"); + return -1; + } + + puts("........ zImage was updated in boot partition\n"); + fastboot_okay(""); + return 0; +} +#endif + void fb_mmc_flash_write(const char *cmd, void *download_buffer, unsigned int download_bytes) { @@ -153,6 +314,13 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer, } #endif +#ifdef CONFIG_ANDROID_BOOT_IMAGE + if (strcmp(cmd, "zImage") == 0 || strcmp(cmd, "zimage") == 0) { + fb_mmc_update_zimage(dev_desc, download_buffer, download_bytes); + return; + } +#endif + if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) { error("cannot find partition: '%s'\n", cmd); fastboot_fail("cannot find partition"); diff --git a/include/android_image.h b/include/android_image.h index dfd4d9d72c..c058b1d388 100644 --- a/include/android_image.h +++ b/include/android_image.h @@ -12,6 +12,8 @@ #ifndef _ANDROID_IMAGE_H_ #define _ANDROID_IMAGE_H_ +#include + typedef struct andr_img_hdr andr_img_hdr; #define ANDR_BOOT_MAGIC "ANDROID!" diff --git a/include/linux/compat.h b/include/linux/compat.h index a43e4d6698..b0ff6b91f0 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -111,6 +111,9 @@ static inline void kmem_cache_destroy(struct kmem_cache *cachep) #define PAGE_SIZE 4096 +/* to align the pointer to the (next) page boundary */ +#define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) + /* drivers/char/random.c */ #define get_random_bytes(...)