From patchwork Thu May 1 14:55:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 29502 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 144D220675 for ; Thu, 1 May 2014 15:13:12 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id a41sf3011190yho.1 for ; Thu, 01 May 2014 08:13:12 -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:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=8YNjOWKsnNcO69rqkbuXnnaqZSzk6Zo95mtmXq2306w=; b=l0nyrIbEDwsyhbOPbn3ymOJywt5yCTOvfuyxBO3GDkE2beJoQZgKOXn1nM6p9rP8Um mXJyxeYL+2uua8yJcKItGPdzDPItsvHnMl6mwkEi1h08VyIkVsOEmta2NRUc5FhacB0/ 2wtudhvlb3Jr4LSHj0LaRjzbW6YaIFvY+Et9CHNBGs6y8F3YfcqsV3YDfbEimnzmqBXl GHp96+7Wtn1lJ0YcL7PWcjpVzQ87jcmGAY1cwvld0iIfSqBtPqct+A+TodIe+7i5l6U/ 0k8j9aDG7egK+Ta9NgRgIWB0mn414tjeYa9f4zUM5QZ6EdKNGnIg7dbw3c+Mf+T1bSLh gqgQ== X-Gm-Message-State: ALoCoQmTRwHkhKyPUEWP5bH4AsCJEcxKZOQXN8zLvy11i9SGV7f33l6cBZ2JK93uJovVG1vITy3H X-Received: by 10.58.228.201 with SMTP id sk9mr5955468vec.35.1398957192762; Thu, 01 May 2014 08:13:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.203 with SMTP id m69ls1201804qga.84.gmail; Thu, 01 May 2014 08:13:12 -0700 (PDT) X-Received: by 10.58.243.39 with SMTP id wv7mr394706vec.51.1398957192502; Thu, 01 May 2014 08:13:12 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id ck5si6097267vdd.91.2014.05.01.08.13.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 May 2014 08:13:12 -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.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so3969249veb.37 for ; Thu, 01 May 2014 08:13:12 -0700 (PDT) X-Received: by 10.58.96.36 with SMTP id dp4mr9232271veb.21.1398957192433; Thu, 01 May 2014 08:13:12 -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 ib8csp31418vcb; Thu, 1 May 2014 08:13:12 -0700 (PDT) X-Received: by 10.140.107.118 with SMTP id g109mr13556195qgf.100.1398957191945; Thu, 01 May 2014 08:13:11 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x7si12747796qaj.140.2014.05.01.08.13.11 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 01 May 2014 08:13:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:40142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfsff-0005Zv-Dp for patch@linaro.org; Thu, 01 May 2014 11:13:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfscD-0001ug-NO for qemu-devel@nongnu.org; Thu, 01 May 2014 11:09:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfscB-0000Sk-5e for qemu-devel@nongnu.org; Thu, 01 May 2014 11:09:37 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47976) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfscA-0000Ry-Sx for qemu-devel@nongnu.org; Thu, 01 May 2014 11:09:35 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WfsOB-0001wZ-KL; Thu, 01 May 2014 15:55:07 +0100 From: Peter Maydell To: Anthony Liguori Date: Thu, 1 May 2014 15:55:06 +0100 Message-Id: <1398956107-7411-10-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398956107-7411-1-git-send-email-peter.maydell@linaro.org> References: <1398956107-7411-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 09/10] hw/arm/virt: Put GIC register banks on 64K boundaries X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 Message-id: 1398362083-17737-3-git-send-email-peter.maydell@linaro.org --- 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 */