From patchwork Thu Apr 24 17:54:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 29012 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A2B67203AC for ; Thu, 24 Apr 2014 17:54:52 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id lg15sf9982867vcb.7 for ; Thu, 24 Apr 2014 10:54:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=MRkSfRJN+NVZhbrRD+CiB0ruIqgZP/pLJzlet+yyLV4=; b=a2wTzO0gfdU/OKBltOrQMMBoVTstEorOe1h8DVtEwNBsGScwTnwyw92wpC4ByGUz89 gEcin8gsBNvqW2eq7HgJXtnM5K2/y4zQ6E2l+2pHRzWvzqCgb/sfbpssi0a5j5SQYegp AQEwg9wrLRGWdtin7o//v+gwTUhZTYY3ZRaQT9BEFJupQUVTWwRF0s19bmk1UY9V7XlS OJrUeUjFBeC/xwDQgX2xaF/uTSTqpCH0Ehrc8tRWQVtd2Is7H5jYqLaEOsyRrszj1lop KQGwFhQBIsKQ+yVnADMMJQ4BCe2+u5GJux2vSjoq0QaGgphzpfR5VVpLWIFRZArshMfX dTLA== X-Gm-Message-State: ALoCoQn8kALajlKBZ1+ai1h0YDcyacq6xvra1QWbfyqkg6FRyj7gfCbV247bAfn92EcdTgoBY+b4 X-Received: by 10.236.45.41 with SMTP id o29mr1685805yhb.13.1398362091837; Thu, 24 Apr 2014 10:54:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.78 with SMTP id z72ls666670qge.37.gmail; Thu, 24 Apr 2014 10:54:51 -0700 (PDT) X-Received: by 10.52.164.237 with SMTP id yt13mr1826757vdb.18.1398362091732; Thu, 24 Apr 2014 10:54:51 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id u5si1098197vdo.130.2014.04.24.10.54.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 10:54:51 -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.177; Received: by mail-vc0-f177.google.com with SMTP id if17so3365012vcb.8 for ; Thu, 24 Apr 2014 10:54:51 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr2138638vch.22.1398362091657; Thu, 24 Apr 2014 10:54:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp35130vcb; Thu, 24 Apr 2014 10:54:51 -0700 (PDT) X-Received: by 10.112.202.3 with SMTP id ke3mr114128lbc.68.1398362090546; Thu, 24 Apr 2014 10:54:50 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id q7si3480024lbw.197.2014.04.24.10.54.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Apr 2014 10:54:50 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WdNr9-0004ch-I2; Thu, 24 Apr 2014 18:54:43 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Alexander Graf , kvmarm@lists.cs.columbia.edu, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Christoffer Dall , Peter Crosthwaite , Rob Herring Subject: [PATCH 2/3] hw/arm/virt: Put GIC register banks on 64K boundaries Date: Thu, 24 Apr 2014 18:54:42 +0100 Message-Id: <1398362083-17737-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398362083-17737-1-git-send-email-peter.maydell@linaro.org> References: <1398362083-17737-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , For an AArch64 CPU which supports 64K pages, having the GIC register banks at 4K offsets is potentially awkward. Move them out to being at 64K offsets. (This is harmless for AArch32 CPUs and for AArch64 CPUs with 4K pages, so it is simpler to use the same offsets everywhere than to try to use 64K offsets only for AArch64 host CPUs.) Signed-off-by: Peter Maydell --- hw/arm/virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ecff256..9c4d337 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -96,10 +96,10 @@ typedef struct VirtBoardInfo { static const MemMapEntry a15memmap[] = { /* Space up to 0x8000000 is reserved for a boot ROM */ [VIRT_FLASH] = { 0, 0x8000000 }, - [VIRT_CPUPERIPHS] = { 0x8000000, 0x8000 }, + [VIRT_CPUPERIPHS] = { 0x8000000, 0x20000 }, /* GIC distributor and CPU interfaces sit inside the CPU peripheral space */ - [VIRT_GIC_DIST] = { 0x8001000, 0x1000 }, - [VIRT_GIC_CPU] = { 0x8002000, 0x1000 }, + [VIRT_GIC_DIST] = { 0x8000000, 0x10000 }, + [VIRT_GIC_CPU] = { 0x8010000, 0x10000 }, [VIRT_UART] = { 0x9000000, 0x1000 }, [VIRT_MMIO] = { 0xa000000, 0x200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */