From patchwork Tue Jul 29 16:32:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 34487 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3338820DCC for ; Tue, 29 Jul 2014 16:32:54 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf63315191pab.4 for ; Tue, 29 Jul 2014 09:32:53 -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: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=7Ad063M9Ew9M2Xt+GrpzixjlL/OJGtW6lWUTVDVS3xU=; b=LmmRAxcFMhmGSZZwWZ1+/3mII7A4h5S5n/qIZutkSZ1BuLRuUd90tTGRRF7ZXpgMcx JA6a/ptuod8P3U5r42iAswL8bmy6H6NcXl7vCHMJbFMgjTxrIZVb/ZQxGyu9j5z1OOEG vCP9v1hcw69o/He3aflDw1lV5JIgV2t9OLO6vqIKrR1amTOPQx912b1bc4Qt+uJAm4tW jtJqZbNcn+VCNT/S+P656Jh3krvjVtxRXuIpqQA0L6sYAaAKMLWJBwUatoegQ4mL+3dl gP2VAyBiHhRZhlL+BtZvnJqbsdgMDtG1/DKD56qnfqVC93iVpoWVNQxOzmByv8FyJzzU GA5Q== X-Gm-Message-State: ALoCoQnRrtz2ycT4u9f4XhrqT8IAVX5IKEWRJVzYrzQqZcWFvqDdT+C1bFkEs0jW2IXr+K8TRu4R X-Received: by 10.66.227.37 with SMTP id rx5mr1072601pac.25.1406651573377; Tue, 29 Jul 2014 09:32:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.23 with SMTP id 23ls176987qgi.26.gmail; Tue, 29 Jul 2014 09:32:53 -0700 (PDT) X-Received: by 10.221.56.5 with SMTP id wa5mr3001468vcb.25.1406651573262; Tue, 29 Jul 2014 09:32:53 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id pw10si14888070vec.96.2014.07.29.09.32.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Jul 2014 09:32:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so13950105vcb.37 for ; Tue, 29 Jul 2014 09:32:53 -0700 (PDT) X-Received: by 10.221.47.9 with SMTP id uq9mr3063773vcb.48.1406651573178; Tue, 29 Jul 2014 09:32:53 -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.221.37.5 with SMTP id tc5csp257477vcb; Tue, 29 Jul 2014 09:32:52 -0700 (PDT) X-Received: by 10.221.68.135 with SMTP id xy7mr2381912vcb.65.1406651572846; Tue, 29 Jul 2014 09:32:52 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g3si38608553qge.74.2014.07.29.09.32.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 29 Jul 2014 09:32:52 -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]:47024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCAKa-0001hq-Fj for patch@linaro.org; Tue, 29 Jul 2014 12:32:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCAK3-0001Ja-J5 for qemu-devel@nongnu.org; Tue, 29 Jul 2014 12:32:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCAJw-0003OH-3p for qemu-devel@nongnu.org; Tue, 29 Jul 2014 12:32:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCAJv-0003OB-SX for qemu-devel@nongnu.org; Tue, 29 Jul 2014 12:32:12 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6TGW6GC017235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Jul 2014 12:32:06 -0400 Received: from hawk.usersys.redhat.com (dhcp-1-116.brq.redhat.com [10.34.1.116]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6TGW4xu026222; Tue, 29 Jul 2014 12:32:05 -0400 From: Andrew Jones To: qemu-devel@nongnu.org Date: Tue, 29 Jul 2014 18:32:01 +0200 Message-Id: <1406651521-10144-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2] hw/arm/virt: fix pl031 addr typo 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: drjones@redhat.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.178 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 pl031's base address should be 0x9010000, not 0x90010000, otherwise it sits in ram when configuring a guest with greater than 1G. Signed-off-by: Andrew Jones Reviewed-by: Peter Maydell --- v2: - pl031 needs 64K alignment - don't change the formatting, will send another patch, which may get ignored :-) --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 405c61d39c1e9..89532bd786436 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -104,7 +104,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_GIC_DIST] = { 0x8000000, 0x10000 }, [VIRT_GIC_CPU] = { 0x8010000, 0x10000 }, [VIRT_UART] = { 0x9000000, 0x1000 }, - [VIRT_RTC] = { 0x90010000, 0x1000 }, + [VIRT_RTC] = { 0x9010000, 0x1000 }, [VIRT_MMIO] = { 0xa000000, 0x200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ /* 0x10000000 .. 0x40000000 reserved for PCI */