From patchwork Fri Jul 28 08:04:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Chen X-Patchwork-Id: 108874 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp89946qge; Fri, 28 Jul 2017 01:04:56 -0700 (PDT) X-Received: by 10.80.147.197 with SMTP id o63mr6119276eda.194.1501229096090; Fri, 28 Jul 2017 01:04:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501229096; cv=none; d=google.com; s=arc-20160816; b=zAbh5Lg5OwlQoLpiSX+cGvVmBsY29RXTCdF3FG98fohRS0PUuph1WkRGRm/f6LQlcN 0FTRJKThcuGS8BC7iqlyijfEx0MQezgFTxwqB9YdxWm1HkHLS9IcyVYOj6OVj+fAc6T2 AwM3qLkoH1tbqAEjxwCHwNAG68/SxekGIXX7zzDObr6t5NjHh7meFH3/+DFldjs8V9xI j5uBop3djDanwAs3UFPna/u34bpwU1bEAPCfrFEg1T8Dtoi1/5CNlrAH8DdPdgn3pz4Y e9aTeEfsz24qp1fzo5lDwf4zj1ZP0KkNASrRnhc+f/Td2jBme3l+wJf/HY1IsxpobYS1 eKwA== 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=+7+RRr8lZur/c8y3iobDQ0rjTWzexxgIdxiK1j5hgNc=; b=KCQMs2L6/rMl6C1bMFnOQ8+0wexvKJ8KEaIshBjhXLBJ/TMfy3dW4B5KpUfduD5y1H RCZ4sI7q6EWePYLyks/KYAzhNJHYNuZgN/CFOEqGPmLHMuDyX9FZTJU8jOFqYRcB9kTD ZoYmZHiaGMLYF3yARBF5Lf8x5LMqw7ZS+kn+zM6jS8SiV3hUim2WIZsFWYxex0mQeVE0 n2Cslcnz3OrmgjtxGzRSI/CGB2a8v6ywEVqiigWp3UoLkfzVb2LaU9QUUGY+UR+8E/HD xNkxeX9KeUmMu8R2Ro3mzcEIsGtwK/OBOZv7QEX9tOWZxBJIo8YwcemukRCfQH5RQR+d Ehjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=Pq72qIk6; 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 33si13100192edp.229.2017.07.28.01.04.55; Fri, 28 Jul 2017 01:04:56 -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 header.b=Pq72qIk6; 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 A7036C21E9F; Fri, 28 Jul 2017 08:04:52 +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 5496EC21DAA; Fri, 28 Jul 2017 08:04:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B60FCC21DAA; Fri, 28 Jul 2017 08:04:47 +0000 (UTC) Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by lists.denx.de (Postfix) with ESMTPS id 1998FC21C3E for ; Fri, 28 Jul 2017 08:04:46 +0000 (UTC) Received: by mail-pf0-f177.google.com with SMTP id z129so53676914pfb.3 for ; Fri, 28 Jul 2017 01:04:46 -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=m/e6aSreuSs6T8gTVrEwrakiNRkdBXet3fhBjdeMv2c=; b=Pq72qIk6gXhCANk4LyTYdUi/8J9RtWXP+uvJ0JbcyaBiJWYMF+DHQnYa/7BnEtZBaS RVmzTT5oT90wHjyW8HLTXZ+BFE5UkG+dv1V4sxWT84u9Mx8bxXmrDtLczD89fyQl3u6b AP43rdJ/u/wLvuA+dMTnTkgMhHYbAB5SZXcoo= 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=m/e6aSreuSs6T8gTVrEwrakiNRkdBXet3fhBjdeMv2c=; b=DOFXSmHZTzhlslsvGqd69c31WbhBo8HmyC2BGZrCcFch9oiLmnZcisHJjNWcaF3VML bBrpmR2fdELBcy7gYIiUxJwNm7otUB7kK+v8a8KqkVahz90D0BkyY2vtFLvouMIkB7IY dtKNE5XGvHEySNuEGYhzQmULUdwuGBjknYXuC3bnHe2fl3nzvXNGRMTrti6vSFALjL1d 0HUuuiu52GUnhPCSwBj03jpbCMMl7w6ize1FrOCXwNQQPehnKmUVIECE56xuz5uccQGv fo9mIyCc+k9O0Flh78lTJK8RZW9nFphm4/tSeB19fN4fr9qkHB4oQx0l2S3nQ4wJVudT 71Tw== X-Gm-Message-State: AIVw112Pm9lvhHJrsIy7Vn9YgL3fgB9Qs5ebnRrOn/eigyk64NQrGU5Y DkM188DhBqZHvVIBpCTxDQ== X-Received: by 10.98.33.9 with SMTP id h9mr6592998pfh.185.1501229084036; Fri, 28 Jul 2017 01:04:44 -0700 (PDT) Received: from localhost.localdomain (c27-253-115-177.carlnfd2.nsw.optusnet.com.au. [27.253.115.177]) by smtp.gmail.com with ESMTPSA id z74sm42226322pfd.112.2017.07.28.01.04.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Jul 2017 01:04:43 -0700 (PDT) From: Bin Chen To: u-boot@lists.denx.de Date: Fri, 28 Jul 2017 18:04:11 +1000 Message-Id: <1501229051-31491-1-git-send-email-bin.chen@linaro.org> X-Mailer: git-send-email 1.9.1 Cc: trini@konsulko.com, daniel.thompson@linaro.org, rob.herring@linaro.org, john.stultz@linaro.org, elder@linaro.org Subject: [U-Boot] [RFC] move booti_setup to arch/arm/lig/image.c 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" Follow bootz's pattern by moving the booti_setup to arch/arm/lib. This allows to use that function in other path, e.g booting an android image contains Image format. Note that kernel relocation is move out of booti_setup and it is the caller's responsibility to do it and allows them do it differently. say, cmd/booti.c just do a manually, while in the bootm path, we can use bootm_load_os(with some changes). Signed-off-by: Bin Chen Reviewed-by: Tom Rini --- arch/arm/lib/Makefile | 2 +- arch/arm/lib/image.c | 76 ++++++++++++++++++++++++++++++++++++++++++ cmd/booti.c | 92 ++++++++------------------------------------------- include/image.h | 10 ++++++ 4 files changed, 100 insertions(+), 80 deletions(-) create mode 100644 arch/arm/lib/image.c diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 6e96cfb..8122788 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -26,7 +26,7 @@ endif obj-$(CONFIG_CPU_V7M) += cmd_boot.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o -obj-$(CONFIG_CMD_BOOTI) += bootm.o +obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c new file mode 100644 index 0000000..460f8eb --- /dev/null +++ b/arch/arm/lib/image.c @@ -0,0 +1,76 @@ +/* + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241 + +/* See Documentation/arm64/booting.txt in the Linux kernel */ +struct Image_header { + uint32_t code0; /* Executable code */ + uint32_t code1; /* Executable code */ + uint64_t text_offset; /* Image load offset, LE */ + uint64_t image_size; /* Effective Image size, LE */ + uint64_t flags; /* Kernel flags, LE */ + uint64_t res2; /* reserved */ + uint64_t res3; /* reserved */ + uint64_t res4; /* reserved */ + uint32_t magic; /* Magic number */ + uint32_t res5; +}; + +int booti_setup(ulong image, ulong *relocated_addr, ulong *size) +{ + struct Image_header *ih; + uint64_t dst; + uint64_t image_size, text_offset; + + *relocated_addr = image; + + ih = (struct Image_header *)map_sysmem(image, 0); + + if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) { + puts("Bad Linux ARM64 Image magic!\n"); + return 1; + } + + /* + * Prior to Linux commit a2c1d73b94ed, the text_offset field + * is of unknown endianness. In these cases, the image_size + * field is zero, and we can assume a fixed value of 0x80000. + */ + if (ih->image_size == 0) { + puts("Image lacks image_size field, assuming 16MiB\n"); + image_size = 16 << 20; + text_offset = 0x80000; + } else { + image_size = le64_to_cpu(ih->image_size); + text_offset = le64_to_cpu(ih->text_offset); + } + + *size = image_size; + + /* + * If bit 3 of the flags field is set, the 2MB aligned base of the + * kernel image can be anywhere in physical memory, so respect + * images->ep. Otherwise, relocate the image to the base of RAM + * since memory below it is not accessible via the linear mapping. + */ + if (le64_to_cpu(ih->flags) & BIT(3)) + dst = image - text_offset; + else + dst = gd->bd->bi_dram[0].start; + + *relocated_addr = ALIGN(dst, SZ_2M) + text_offset; + + unmap_sysmem(ih); + + return 0; +} diff --git a/cmd/booti.c b/cmd/booti.c index da6fb01..91e61da 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -16,77 +16,6 @@ DECLARE_GLOBAL_DATA_PTR; -/* See Documentation/arm64/booting.txt in the Linux kernel */ -struct Image_header { - uint32_t code0; /* Executable code */ - uint32_t code1; /* Executable code */ - uint64_t text_offset; /* Image load offset, LE */ - uint64_t image_size; /* Effective Image size, LE */ - uint64_t flags; /* Kernel flags, LE */ - uint64_t res2; /* reserved */ - uint64_t res3; /* reserved */ - uint64_t res4; /* reserved */ - uint32_t magic; /* Magic number */ - uint32_t res5; -}; - -#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241 - -static int booti_setup(bootm_headers_t *images) -{ - struct Image_header *ih; - uint64_t dst; - uint64_t image_size, text_offset; - - ih = (struct Image_header *)map_sysmem(images->ep, 0); - - if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) { - puts("Bad Linux ARM64 Image magic!\n"); - return 1; - } - - /* - * Prior to Linux commit a2c1d73b94ed, the text_offset field - * is of unknown endianness. In these cases, the image_size - * field is zero, and we can assume a fixed value of 0x80000. - */ - if (ih->image_size == 0) { - puts("Image lacks image_size field, assuming 16MiB\n"); - image_size = 16 << 20; - text_offset = 0x80000; - } else { - image_size = le64_to_cpu(ih->image_size); - text_offset = le64_to_cpu(ih->text_offset); - } - - /* - * If bit 3 of the flags field is set, the 2MB aligned base of the - * kernel image can be anywhere in physical memory, so respect - * images->ep. Otherwise, relocate the image to the base of RAM - * since memory below it is not accessible via the linear mapping. - */ - if (le64_to_cpu(ih->flags) & BIT(3)) - dst = images->ep - text_offset; - else - dst = gd->bd->bi_dram[0].start; - - dst = ALIGN(dst, SZ_2M) + text_offset; - - unmap_sysmem(ih); - - if (images->ep != dst) { - void *src; - - debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst); - - src = (void *)images->ep; - images->ep = dst; - memmove((void *)dst, src, image_size); - } - - return 0; -} - /* * Image booting support */ @@ -94,31 +23,36 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images) { int ret; - struct Image_header *ih; + ulong ld; + ulong relocated_addr; + ulong image_size; ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, images, 1); /* Setup Linux kernel Image entry point */ if (!argc) { - images->ep = load_addr; + ld = load_addr; debug("* kernel: default image load address = 0x%08lx\n", load_addr); } else { - images->ep = simple_strtoul(argv[0], NULL, 16); + ld = simple_strtoul(argv[0], NULL, 16); debug("* kernel: cmdline image address = 0x%08lx\n", images->ep); } - ret = booti_setup(images); + ret = booti_setup(ld, &relocated_addr, &image_size); if (ret != 0) return 1; - ih = (struct Image_header *)map_sysmem(images->ep, 0); - - lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size)); + /* Handle BOOTM_STATE_LOADOS */ + if (relocated_addr != ld) { + debug("Moving Image from 0x%lx to 0x%lx\n", ld, relocated_addr); + memmove((void *)relocated_addr, (void *)ld, image_size); + } - unmap_sysmem(ih); + images->ep = relocated_addr; + lmb_reserve(&images->lmb, images->ep, le32_to_cpu(image_size)); /* * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not diff --git a/include/image.h b/include/image.h index 8264c52..ade948e 100644 --- a/include/image.h +++ b/include/image.h @@ -848,6 +848,16 @@ int image_setup_linux(bootm_headers_t *images); */ int bootz_setup(ulong image, ulong *start, ulong *end); +/** + * Return the correct start address and size of a Linux aarch64 Image, + * also kernel relocation inside, if needed. + * + * @image: Address of image + * @start: Returns start address of image + * @size : Returns size image + * @return 0 if OK, 1 if the image was not recognised + */ +int booti_setup(ulong image, ulong *relocated_addr, ulong *size); /*******************************************************************/ /* New uImage format specific code (prefixed with fit_) */