From patchwork Mon Apr 28 13:02:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29235 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D758B202FE for ; Mon, 28 Apr 2014 13:04:13 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id q108sf16506143qgd.11 for ; Mon, 28 Apr 2014 06:04:13 -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=nmGmFc9VbIw58ty3ioGYphv8Vbi1aw7AJ5F6NtuFCJM=; b=CIGPvxa3GAJ5DVzP6J6zMPF7aK23HcPyS5pdj7YZO4tubfhGllNnenC0bgpHyxIXXf jrS6DqWwVWIOab8nTkRDc7aM0yd/FdtjguEkiqzzsq4ToOzqglLa2jqlWRAlI7M4MBKQ 3a7XrnAr9cdIdLDtMe/LvhIBRmKYWbDC6669+7fvWpj0KN8zCrU3h9V9IejDY8in00Fc Ec9GPepVV8f9n3j0E76x3dafUkMwm8osv5ImmcbayElM8lX3J+RUTQ/CZjgWZmOTZ6gE OXsBq7+zSzcIYXL5dgVStc4iKY6qCbkl3g38iDuCWbBqdUCwEmV14e3+ckvRH6Af4MY4 YHhA== X-Gm-Message-State: ALoCoQkZOfDzuZouKeFd+qeVdG0gN/PFbsgEThh3gkXrOlTHskI2MM7LYCViZe3yhmJCDOjm5YjA X-Received: by 10.224.95.9 with SMTP id b9mr12638852qan.2.1398690253624; Mon, 28 Apr 2014 06:04:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.203 with SMTP id h69ls2591929qgh.56.gmail; Mon, 28 Apr 2014 06:04:13 -0700 (PDT) X-Received: by 10.52.128.84 with SMTP id nm20mr2256vdb.63.1398690253449; Mon, 28 Apr 2014 06:04:13 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id af10si3596734vec.185.2014.04.28.06.04.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 06:04:13 -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.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so7835998veb.39 for ; Mon, 28 Apr 2014 06:04:13 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr22843830vec.6.1398690253367; Mon, 28 Apr 2014 06:04:13 -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 ib8csp115719vcb; Mon, 28 Apr 2014 06:04:12 -0700 (PDT) X-Received: by 10.58.107.65 with SMTP id ha1mr24011934veb.1.1398690252747; Mon, 28 Apr 2014 06:04:12 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id z15si3601581vcj.36.2014.04.28.06.04.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 06:04:12 -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 1WelCa-0001m2-SS; Mon, 28 Apr 2014 13:02:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WelCZ-0001ld-1G for xen-devel@lists.xen.org; Mon, 28 Apr 2014 13:02:31 +0000 Received: from [85.158.139.211:38906] by server-17.bemta-5.messagelabs.com id 28/8D-09046-6615E535; Mon, 28 Apr 2014 13:02:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1398690147!1021950!1 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 27997 invoked from network); 28 Apr 2014 13:02:29 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2014 13:02:29 -0000 X-IronPort-AV: E=Sophos;i="4.97,944,1389744000"; d="scan'208";a="125356520" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 28 Apr 2014 13:02:17 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 28 Apr 2014 09:02:17 -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 1WelCJ-0001Vb-OJ; Mon, 28 Apr 2014 14:02:16 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Mon, 28 Apr 2014 14:02:15 +0100 From: Ian Campbell To: Date: Mon, 28 Apr 2014 14:02:08 +0100 Message-ID: <1398690132-5651-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398690109.29700.82.camel@kazak.uk.xensource.com> References: <1398690109.29700.82.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 v3 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 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