From patchwork Mon Mar 17 14:05:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26374 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2F742202FA for ; Mon, 17 Mar 2014 14:08:10 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf13370512qcq.0 for ; Mon, 17 Mar 2014 07:08:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=HtTmzSCTb0h7/+ekXQ3JICScHQGPubluyWWracXhem4=; b=R8rJE6sjiqkL+O85GigiCV9vRzs6V88wiZggJyCkxsLPMDH7ZHKeTM2bSExu2ftEvJ Bi2EXl+uCqZiNkrjR3QfogbnsofKXyQUWN2cjpRU69LzIRI9FDAYjF8e0hdptQSeQFZH xd1NwkLxhe084h8RG1Yq4kTc9WhWHacmo61a9U23ilXe8Z8b2RTxYP3OahMJTwmJVIzz Dl67G1U8nwFrrf8KaGeU5kO0EPkXGQa/xrBVCxsnpgDv9uhN7HNjhR2uf8hPX5hmuNLw 0cMfcIWQ0PJszsmt3etSs9k5Y2zXtBevumrN4Ob7wEWqlLsi5C1lp09fiFOjaV8pnB/B kLJA== X-Gm-Message-State: ALoCoQm8G9lzzLvF4zK25chujoPQNDwnqzScBtR2TQUttUXjpgIhBAzvu198Yzx2E8Oc0WPAQGjN X-Received: by 10.52.146.45 with SMTP id sz13mr8141880vdb.6.1395065290010; Mon, 17 Mar 2014 07:08:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.225 with SMTP id r88ls1676061qgr.2.gmail; Mon, 17 Mar 2014 07:08:09 -0700 (PDT) X-Received: by 10.220.95.139 with SMTP id d11mr7130401vcn.21.1395065289829; Mon, 17 Mar 2014 07:08:09 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id h11si2819477veh.158.2014.03.17.07.08.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:08:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so5662346vcb.22 for ; Mon, 17 Mar 2014 07:08:09 -0700 (PDT) X-Received: by 10.52.189.33 with SMTP id gf1mr5952000vdc.26.1395065289743; Mon, 17 Mar 2014 07:08:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp130085vck; Mon, 17 Mar 2014 07:08:09 -0700 (PDT) X-Received: by 10.140.34.9 with SMTP id k9mr12808583qgk.15.1395065289261; Mon, 17 Mar 2014 07:08:09 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id a59si8601878qge.139.2014.03.17.07.08.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:08:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPYBF-0002BH-J6; Mon, 17 Mar 2014 14:06:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPYBE-0002B3-59 for xen-devel@lists.xenproject.org; Mon, 17 Mar 2014 14:06:16 +0000 Received: from [85.158.139.211:13324] by server-4.bemta-5.messagelabs.com id DA/A3-30750-75107235; Mon, 17 Mar 2014 14:06:15 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-4.tower-206.messagelabs.com!1395065174!1505453!1 X-Originating-IP: [74.125.83.42] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13518 invoked from network); 17 Mar 2014 14:06:14 -0000 Received: from mail-ee0-f42.google.com (HELO mail-ee0-f42.google.com) (74.125.83.42) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 17 Mar 2014 14:06:14 -0000 Received: by mail-ee0-f42.google.com with SMTP id d17so4210395eek.29 for ; Mon, 17 Mar 2014 07:06:14 -0700 (PDT) X-Received: by 10.14.199.137 with SMTP id x9mr1081746een.108.1395065174075; Mon, 17 Mar 2014 07:06:14 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id x3sm39716538eep.17.2014.03.17.07.06.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 07:06:12 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 17 Mar 2014 14:05:51 +0000 Message-Id: <1395065165-15915-2-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> References: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2 01/15] xen/arm: kernel: Don't hardcode flash address X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Xen is loaded either by U-boot or the bootwrapper. Both of them correctly set xen multiboot module for the kernel in the device tree. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v2: - Fix typo in commit title --- xen/arch/arm/kernel.c | 29 ++++++++++------------------- xen/arch/arm/kernel.h | 1 - 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 1e3107d..492ce6d 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -16,10 +16,6 @@ #include "kernel.h" -/* Store kernel in first 8M of flash */ -#define KERNEL_FLASH_ADDRESS 0x00000000UL -#define KERNEL_FLASH_SIZE 0x00800000UL - #define ZIMAGE32_MAGIC_OFFSET 0x24 #define ZIMAGE32_START_OFFSET 0x28 #define ZIMAGE32_END_OFFSET 0x2c @@ -124,7 +120,6 @@ static void kernel_zimage_load(struct kernel_info *info) { paddr_t load_addr = info->zimage.load_addr; paddr_t paddr = info->zimage.kernel_addr; - paddr_t attr = info->load_attr; paddr_t len = info->zimage.len; unsigned long offs; @@ -150,7 +145,7 @@ static void kernel_zimage_load(struct kernel_info *info) dst = map_domain_page(ma>>PAGE_SHIFT); - copy_from_paddr(dst + s, paddr + offs, l, attr); + copy_from_paddr(dst + s, paddr + offs, l, BUFFERABLE); unmap_domain_page(dst); offs += l; @@ -316,7 +311,7 @@ static int kernel_try_elf_prepare(struct kernel_info *info, if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel"); - copy_from_paddr(info->kernel_img, addr, size, info->load_attr); + copy_from_paddr(info->kernel_img, addr, size, BUFFERABLE); if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) goto err; @@ -367,21 +362,17 @@ int kernel_prepare(struct kernel_info *info) paddr_t start, size; - if ( early_info.modules.nr_mods < MOD_KERNEL ) - { - printk("No boot modules found, trying flash\n"); - start = KERNEL_FLASH_ADDRESS; - size = KERNEL_FLASH_SIZE; - info->load_attr = DEV_SHARED; - } - else + start = early_info.modules.module[MOD_KERNEL].start; + size = early_info.modules.module[MOD_KERNEL].size; + + if ( !size ) { - printk("Loading kernel from boot module %d\n", MOD_KERNEL); - start = early_info.modules.module[MOD_KERNEL].start; - size = early_info.modules.module[MOD_KERNEL].size; - info->load_attr = BUFFERABLE; + printk(XENLOG_ERR "Missing kernel boot module?\n"); + return -ENOENT; } + printk("Loading kernel from boot module %d\n", MOD_KERNEL); + #ifdef CONFIG_ARM_64 rc = kernel_try_zimage64_prepare(info, start, size); if (rc < 0) diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index b48c2c9..ad2956b 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -40,7 +40,6 @@ struct kernel_info { }; void (*load)(struct kernel_info *info); - int load_attr; }; int kernel_prepare(struct kernel_info *info);