From patchwork Tue Apr 8 14:19:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 27984 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 787A22066E for ; Tue, 8 Apr 2014 14:21:15 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id w8sf2652280qac.4 for ; Tue, 08 Apr 2014 07:21:15 -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=hb2RXUY0laXX0HxgJ//i21P0OdlE5SlFQufRiISk548=; b=l5DZaTn8qUczm1jON7CN4H39/LDwsSbRDlz8FYcCi3iyDZhZvk8qnKAcx5kBRPSGvz d02lPKiVSdb8LFFR9OCrxx1AcmozKTwWdoXHRtWKke2MFNPCS/IizmTkxklnA710h7QC u3nlC+1kGHNA97Np1+cvkDYrj2nR1Llq+Yj3I7MvB8bpJG/K98nuzG+4STIkaJZ5nHeP uj+I17tgSvnvBRjb3Pq8wktL4ePQ3D5N4XI+noZ6DTiOOaQyizz5I9VDnUOmMsOhH3Az 1OD+fntNRo7ZdR8L+7yPCZslF+/S3GoqhFj/x7whI2dnZo7myi4MHO8zcaUS+zpOytSc g3Cw== X-Gm-Message-State: ALoCoQkq53blAt9XLjicBs5wnaSBDTCX0xlrQ5mAaYlZG85yRIh6WKwgSx4RPQEFefqGdGiWOXWs X-Received: by 10.58.245.132 with SMTP id xo4mr1537568vec.11.1396966875183; Tue, 08 Apr 2014 07:21:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.103 with SMTP id k94ls225059qgd.93.gmail; Tue, 08 Apr 2014 07:21:15 -0700 (PDT) X-Received: by 10.58.88.8 with SMTP id bc8mr52546veb.39.1396966875028; Tue, 08 Apr 2014 07:21:15 -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 vd8si420930vdc.70.2014.04.08.07.21.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 07:21:15 -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 oz11so810930veb.6 for ; Tue, 08 Apr 2014 07:21:14 -0700 (PDT) X-Received: by 10.220.98.143 with SMTP id q15mr56623vcn.38.1396966874955; Tue, 08 Apr 2014 07:21:14 -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.12.8 with SMTP id v8csp249732vcv; Tue, 8 Apr 2014 07:21:14 -0700 (PDT) X-Received: by 10.220.95.204 with SMTP id e12mr55603vcn.37.1396966874326; Tue, 08 Apr 2014 07:21:14 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id dx8si420111ved.90.2014.04.08.07.21.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Apr 2014 07:21:14 -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 1WXWs5-000527-It; Tue, 08 Apr 2014 14:19:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXWs3-0004z8-Tx for xen-devel@lists.xen.org; Tue, 08 Apr 2014 14:19:28 +0000 Received: from [85.158.139.211:51999] by server-7.bemta-5.messagelabs.com id 73/1C-20531-F6504435; Tue, 08 Apr 2014 14:19:27 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1396966762!4412070!3 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.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8399 invoked from network); 8 Apr 2014 14:19:26 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Apr 2014 14:19:26 -0000 X-IronPort-AV: E=Sophos;i="4.97,818,1389744000"; d="scan'208";a="117888864" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 08 Apr 2014 14:19:23 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 8 Apr 2014 10:19:21 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=marilith-n13.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WXWrx-0005Fw-9p; Tue, 08 Apr 2014 14:19:21 +0000 From: Ian Campbell To: Date: Tue, 8 Apr 2014 15:19:19 +0100 Message-ID: <1396966760-7752-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396966739.22845.233.camel@kazak.uk.xensource.com> References: <1396966739.22845.233.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH 3/4] xen: 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: 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: 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 --- 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 b860da5..5840453 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 at 2GB*/ -#define GUEST_RAM_END 0xafffffffULL - -#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_END 0xffffffffULL /* Interrupts */ #define GUEST_TIMER_VIRT_PPI 27