From patchwork Wed Mar 12 16:15:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26150 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0F1F7203AB for ; Wed, 12 Mar 2014 16:18:16 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id j17sf40565148oag.6 for ; Wed, 12 Mar 2014 09:18:16 -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=3Fd0P6n9iZ1wtA5tyuuErZkDqlx+sMX8NJoj0WUuPBE=; b=KiKIB1aRFN7cn1eLt+HUkD1mCH3h+jDkoCxnhG9/9R/mAW3Z6l0ZH29TUp+Md28zKV 2GIqww6SxDJ72NyT/R0m7EQhbwhJnqsMtdswFPAXc2jr8Oalc1P/azAzL1yETdTV2iGi E9kE1c6j5At0+QzDFh7PSGmhghOeTySXRi9AW2jBv92B9acpwKuoqSKH/CLNs3QcvAea /ySoSxaA6eThiObyTgOW0JxUvpmFDEpJEOJ9eKt1HOAqrN7F/9lhikrkHZij3voFJjAh zuOhDGetT03+STP/PHgvBIXOLTNx0J8Zwo2JnY8o5xXBzOtzDDmfL48umx6HZTJD89BH lA+Q== X-Gm-Message-State: ALoCoQmVt/p4mpMj5z1f8megUYNuvJymNw9kMVSAS9FcA6MOpyqKcmSbhVAjKRbvzA593u6ECYHG X-Received: by 10.182.22.133 with SMTP id d5mr18882625obf.27.1394641096525; Wed, 12 Mar 2014 09:18:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.35 with SMTP id m32ls3002926qgd.81.gmail; Wed, 12 Mar 2014 09:18:16 -0700 (PDT) X-Received: by 10.58.188.78 with SMTP id fy14mr2233353vec.23.1394641096374; Wed, 12 Mar 2014 09:18:16 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id b2si6940388vcy.10.2014.03.12.09.18.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:18:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 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.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so10234028veb.6 for ; Wed, 12 Mar 2014 09:18:16 -0700 (PDT) X-Received: by 10.58.12.169 with SMTP id z9mr30903veb.61.1394641096292; Wed, 12 Mar 2014 09:18:16 -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 i9csp301379vck; Wed, 12 Mar 2014 09:18:15 -0700 (PDT) X-Received: by 10.224.5.136 with SMTP id 8mr57453516qav.42.1394641095883; Wed, 12 Mar 2014 09:18:15 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h109si4648239qge.113.2014.03.12.09.18.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:18:15 -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 1WNlpQ-0007D5-15; Wed, 12 Mar 2014 16:16:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpO-0007CQ-Q0 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2014 16:16:22 +0000 Received: from [193.109.254.147:32995] by server-4.bemta-14.messagelabs.com id 62/03-32066-55880235; Wed, 12 Mar 2014 16:16:21 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1394640980!1237269!1 X-Originating-IP: [209.85.212.169] 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 10782 invoked from network); 12 Mar 2014 16:16:20 -0000 Received: from mail-wi0-f169.google.com (HELO mail-wi0-f169.google.com) (209.85.212.169) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Mar 2014 16:16:20 -0000 Received: by mail-wi0-f169.google.com with SMTP id hm4so2406563wib.2 for ; Wed, 12 Mar 2014 09:16:20 -0700 (PDT) X-Received: by 10.180.37.178 with SMTP id z18mr8457891wij.46.1394640979737; Wed, 12 Mar 2014 09:16:19 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id dk9sm70840335wjb.4.2014.03.12.09.16.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Mar 2014 09:16:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 12 Mar 2014 16:15:56 +0000 Message-Id: <1394640969-25583-2-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> References: <1394640969-25583-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] [RFC 01/14] xen/arm: kernel: Don't harcode 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.128.175 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 --- 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);