From patchwork Thu May 22 09:46:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30584 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0CA4620671 for ; Thu, 22 May 2014 09:48:32 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id if11sf2103618vcb.2 for ; Thu, 22 May 2014 02:48:31 -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=HwPXag0OnDGcG5zxnqdknnjrmundnLcaC7eDVtzMxq8=; b=hFzhvVBU84enRtj/hpvFsXs16KWZ1iM3SQ1P+PydAZCmUyNnSVrhSQjNuPYHujtCyg +X5PnTOrzcKjP+x1nI4DaNbNxVmeylx/cGJwavVmrXfaifhAXzKzSe68OyZst9ZP7cpe 0UOfUvS71jaJfeuIE6rHJsRImcO7Iu9aK3nABDyMCTrRCvbC7xlIBP0zi/HY6MNQl1x0 Ddc51kGF4tJ725xmwvVFx7KBBmE9xbjawdv2pXiV8bBm+mVByX/mQF00gO5qUfMylvVH 0Yeym8g0K7lIdKeg2hCaFXkmBO8cZ6xU1p1/j9dGxhwNeQ+KJHAtMS0kH4f3Fvg5UpyR cWRg== X-Gm-Message-State: ALoCoQl0LRr3flD0MiEQcQ6+fWxYlcnKhCy9Hz+9gPD3LKx2r5dcQR7tOZWbenZxUcAfM2GTGiw5 X-Received: by 10.236.89.114 with SMTP id b78mr22200251yhf.13.1400752111873; Thu, 22 May 2014 02:48:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.44 with SMTP id a41ls1188330qge.72.gmail; Thu, 22 May 2014 02:48:31 -0700 (PDT) X-Received: by 10.220.95.204 with SMTP id e12mr572047vcn.37.1400752111784; Thu, 22 May 2014 02:48:31 -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 ym12si2825956vdc.19.2014.05.22.02.48.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 02:48:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so4107393vcb.1 for ; Thu, 22 May 2014 02:48:31 -0700 (PDT) X-Received: by 10.220.253.132 with SMTP id na4mr181917vcb.39.1400752111677; Thu, 22 May 2014 02:48:31 -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 ib8csp183727vcb; Thu, 22 May 2014 02:48:31 -0700 (PDT) X-Received: by 10.52.255.98 with SMTP id ap2mr12609940vdd.3.1400752111260; Thu, 22 May 2014 02:48:31 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n9si4532744vcx.91.2014.05.22.02.48.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 22 May 2014 02:48:31 -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 1WnPah-0005FB-9v; Thu, 22 May 2014 09:47:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnPag-0005Eh-7g for xen-devel@lists.xen.org; Thu, 22 May 2014 09:47:10 +0000 Received: from [85.158.137.68:6716] by server-6.bemta-3.messagelabs.com id AA/53-00470-D97CD735; Thu, 22 May 2014 09:47:09 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1400752026!5465608!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30630 invoked from network); 22 May 2014 09:47:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 22 May 2014 09:47:08 -0000 X-IronPort-AV: E=Sophos;i="4.98,886,1392163200"; d="scan'208";a="134487230" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 22 May 2014 09:46:50 +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.181.6; Thu, 22 May 2014 05:46:49 -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 1WnPaK-0000mC-4c; Thu, 22 May 2014 10:46:49 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Thu, 22 May 2014 10:46:48 +0100 From: Ian Campbell To: , , , Date: Thu, 22 May 2014 10:46:39 +0100 Message-ID: <1400752004-9731-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400751582.11409.46.camel@kazak.uk.xensource.com> References: <1400751582.11409.46.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v5 4/9] 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) 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 Acked-by: Ian Jackson --- 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 6630f36..d5090fb 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -364,20 +364,20 @@ 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_MAGIC_SIZE 0x01000000ULL +#define GUEST_RAM_BASE 0x40000000ULL /* 3GB of RAM @ 1GB */ +#define GUEST_RAM_SIZE 0xc0000000ULL + /* Interrupts */ #define GUEST_TIMER_VIRT_PPI 27 #define GUEST_TIMER_PHYS_S_PPI 29