From patchwork Thu Jan 17 10:21:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 213198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F6C62C0086 for ; Thu, 17 Jan 2013 21:22:07 +1100 (EST) Received: from localhost ([::1]:57798 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvmbl-0005F7-IU for incoming@patchwork.ozlabs.org; Thu, 17 Jan 2013 05:22:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvmbV-00055L-Tz for qemu-devel@nongnu.org; Thu, 17 Jan 2013 05:21:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvmbU-0005l4-Tq for qemu-devel@nongnu.org; Thu, 17 Jan 2013 05:21:49 -0500 Received: from cantor2.suse.de ([195.135.220.15]:40638 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvmbU-0005ks-Oo; Thu, 17 Jan 2013 05:21:48 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id CA86EA5077; Thu, 17 Jan 2013 11:21:47 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2013 11:21:45 +0100 Message-Id: <1358418105-19301-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: qemu-ppc@nongnu.org, stuart.yoder@freescale.com Subject: [Qemu-devel] [PATCH] PPC: e500: Change in-memory order of load blobs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Today, we load into memory in that order. However, Linux has a bug where it can only handle the dtb if it's within the first 64MB of where starts. So instead, let's change the order to making Linux happy. Signed-off-by: Alexander Graf --- hw/ppc/e500.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 1861695..c7560bd 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -41,6 +41,7 @@ #define UIMAGE_LOAD_BASE 0 #define DTC_LOAD_PAD 0x1800000 #define DTC_PAD_MASK 0xFFFFF +#define DTB_MAX_SIZE (8 * 1024 * 1024) #define INITRD_LOAD_PAD 0x2000000 #define INITRD_PAD_MASK 0xFFFFFF @@ -624,6 +625,10 @@ void ppce500_init(PPCE500Params *params) } cur_base = loadaddr + kernel_size; + + /* Reserve space for dtb */ + dt_base = (cur_base + DTC_LOAD_PAD) & ~DTC_PAD_MASK; + cur_base += DTB_MAX_SIZE; } /* Load initrd. */ @@ -646,13 +651,13 @@ void ppce500_init(PPCE500Params *params) struct boot_info *boot_info; int dt_size; - dt_base = (cur_base + DTC_LOAD_PAD) & ~DTC_PAD_MASK; dt_size = ppce500_load_device_tree(env, params, dt_base, initrd_base, initrd_size); if (dt_size < 0) { fprintf(stderr, "couldn't load device tree\n"); exit(1); } + assert(dt_size < DTB_MAX_SIZE); boot_info = env->load_info; boot_info->entry = entry;