From patchwork Fri Apr 25 11:22:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29054 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1DD0A2055D for ; Fri, 25 Apr 2014 11:24:06 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id pa12sf14058363veb.4 for ; Fri, 25 Apr 2014 04:24:06 -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:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=V3VDT6s2jjIh8SFfM2PdQ4DK+0eS1cR8CVrU6W2EBOI=; b=UIwZNMOd2YBbkg0QDs4FdZlmunRu5sOAJ/uJDuSqmGqi+yjZxHf7IJdtOw2jQuf+k+ z7T1s7FxwZ9GZ8vlS1Jr+Qt0yAvfsQXYlsKFirCJTcBmc/Z3hjFQj8NmNkXtr323QT96 LMKHSW2iKagrm2NMlC+LwHybTACs2Y3UL0g5eqrJAu2jgm3rIf+qj1mQXbFR4qcSMnhN Dm1lb1mKZqZRMuVCzqX+wIwcrYnz2ouwmZV+HlXJ3TkGnBXOohviQhknpukC+s6ItQc9 oFJBuf99Lwm918K+HgghoZ7BffbWI7odAm1pJ8IQQsn80evl/zr7CQfAbDMxl3pGeagX EhZw== X-Gm-Message-State: ALoCoQkzwB4riAVkW8oHts5+hiSXc9t5cK3wVCMp4ofHUYIDOfSmS9H2paF7E0Sy/XBo5yLjJX8P X-Received: by 10.236.45.41 with SMTP id o29mr3796407yhb.13.1398425046402; Fri, 25 Apr 2014 04:24:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.8 with SMTP id j8ls1550221qge.45.gmail; Fri, 25 Apr 2014 04:24:06 -0700 (PDT) X-Received: by 10.52.6.162 with SMTP id c2mr5319310vda.6.1398425046284; Fri, 25 Apr 2014 04:24:06 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id sq9si1625514vdc.53.2014.04.25.04.24.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Apr 2014 04:24:06 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hr9so4661295vcb.29 for ; Fri, 25 Apr 2014 04:24:06 -0700 (PDT) X-Received: by 10.220.147.16 with SMTP id j16mr6389638vcv.14.1398425046192; Fri, 25 Apr 2014 04:24:06 -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.221.72 with SMTP id ib8csp89776vcb; Fri, 25 Apr 2014 04:24:05 -0700 (PDT) X-Received: by 10.52.138.112 with SMTP id qp16mr68644vdb.40.1398425045335; Fri, 25 Apr 2014 04:24:05 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id z4si1629121vcp.24.2014.04.25.04.24.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 25 Apr 2014 04:24:05 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1WdeDX-0004Nt-6I; Fri, 25 Apr 2014 11:22:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WdeDV-0004My-Tq for xen-devel@lists.xen.org; Fri, 25 Apr 2014 11:22:54 +0000 Received: from [85.158.143.35:10221] by server-1.bemta-4.messagelabs.com id 40/4B-09853-D854A535; Fri, 25 Apr 2014 11:22:53 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1398424969!1000953!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31902 invoked from network); 25 Apr 2014 11:22:52 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 25 Apr 2014 11:22:52 -0000 X-IronPort-AV: E=Sophos;i="4.97,926,1389744000"; d="scan'208";a="123461118" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 25 Apr 2014 11:22:52 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.123.3; Fri, 25 Apr 2014 07:22:51 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=localhost.localdomain) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1WdeDS-000761-DJ; Fri, 25 Apr 2014 12:22:51 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Fri, 25 Apr 2014 12:22:50 +0100 From: Ian Campbell To: Date: Fri, 25 Apr 2014 12:22:43 +0100 Message-ID: <1398424967-9306-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398424945.18537.424.camel@kazak.uk.xensource.com> References: <1398424945.18537.424.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: ian.jackson@eu.citrix.com, julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v2 4/8] tools: arm: rearrange guest physical address space to increase max RAM 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: , 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: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: By switching things around we can manage to expose up to 3GB of RAM to guests. I deliberately didn't place the RAM at address 0 to avoid coming to rely on this, so the various peripherals, MMIO and magic pages etc all live in the lower 1GB leaving the upper 3GB available for RAM. It would likely have been possible to reduce the space used by the peripherals etc and allow for 3.5 or 3.75GB but I decided to keep things simple and will handle >3GB memory in a subsequent patch. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/include/public/arch-arm.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index a94d16b..4149d6f 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -364,18 +364,18 @@ typedef uint64_t xen_callback_t; */ /* Physical Address Space */ -#define GUEST_GICD_BASE 0x2c001000ULL -#define GUEST_GICD_SIZE 0x1000ULL -#define GUEST_GICC_BASE 0x2c002000ULL -#define GUEST_GICC_SIZE 0x100ULL +#define GUEST_GICD_BASE 0x03001000ULL +#define GUEST_GICD_SIZE 0x00001000ULL +#define GUEST_GICC_BASE 0x03002000ULL +#define GUEST_GICC_SIZE 0x00000100ULL -#define GUEST_RAM_BASE 0x80000000ULL /* 768M @ 2GB */ -#define GUEST_RAM_SIZE 0x30000000ULL - -#define GUEST_GNTTAB_BASE 0xb0000000ULL +#define GUEST_GNTTAB_BASE 0x38000000ULL #define GUEST_GNTTAB_SIZE 0x00020000ULL -#define GUEST_MAGIC_BASE 0xc0000000ULL +#define GUEST_MAGIC_BASE 0x39000000ULL + +#define GUEST_RAM_BASE 0x40000000ULL /* 3GB of RAM @ 1GB */ +#define GUEST_RAM_SIZE 0xc0000000ULL /* Interrupts */ #define GUEST_TIMER_VIRT_PPI 27