From patchwork Thu Apr 4 12:58:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15924 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-ea0-f200.google.com (mail-ea0-f200.google.com [209.85.215.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2971B27796 for ; Thu, 4 Apr 2013 12:58:58 +0000 (UTC) Received: by mail-ea0-f200.google.com with SMTP id a15sf3791480eae.11 for ; Thu, 04 Apr 2013 05:58:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=ZmCsCDVF60WY4vf8F0Yjaye1j+H13gocTIYrQKJ4DJY=; b=mNFgf7sVN/vUJmjbMZRIkCsv51hR6evREyCwTUFk+R867rfbonr1aiIxQHuiujKDPy /NkolYCozo56LitJE//K68tkjkOQiP2TCG95d8v/h/spVeI3Tc0ALbq1SrtQyIOHTCdb nrEYkxFOUh/yfsFLZD47/hfyiiGdMFag7VS1zA3R/yP/Siw7xazef/7Ekwe7vvYd5KXK XFOnPFhHsp5l6F8mLBf8nu2TCkvp7Cax9kFVHN6ulcCJUJW+p3GUjuHcMCUF7+N7MD04 rK/nXncdtAOKeiNrxP/6hNSBbvplKoY5LgKJircIJM3kQ1xB/AHBhoM6YIIgV3+GyS+6 pErA== X-Received: by 10.180.96.225 with SMTP id dv1mr1984247wib.6.1365080332145; Thu, 04 Apr 2013 05:58:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.181.13.242 with SMTP id fb18ls961840wid.22.gmail; Thu, 04 Apr 2013 05:58:52 -0700 (PDT) X-Received: by 10.194.157.42 with SMTP id wj10mr9567185wjb.12.1365080332065; Thu, 04 Apr 2013 05:58:52 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id d9si4252142wie.117.2013.04.04.05.58.51 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 05:58:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id cz11so2637867veb.10 for ; Thu, 04 Apr 2013 05:58:51 -0700 (PDT) X-Received: by 10.220.214.6 with SMTP id gy6mr4561156vcb.8.1365080330993; Thu, 04 Apr 2013 05:58:50 -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.58.85.136 with SMTP id h8csp214681vez; Thu, 4 Apr 2013 05:58:50 -0700 (PDT) X-Received: by 10.112.144.6 with SMTP id si6mr3413155lbb.85.1365080318413; Thu, 04 Apr 2013 05:58:38 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id tb3si3586375lbb.181.2013.04.04.05.58.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 05:58:38 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UNjkP-0005RQ-U0; Thu, 04 Apr 2013 13:58:33 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Arnd Bergmann , "Michael S. Tsirkin" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Will Deacon , Paul Brook , Aurelien Jarno Subject: [PATCH v3 09/11] arm/realview: Fix mapping of PCI regions Date: Thu, 4 Apr 2013 13:58:31 +0100 Message-Id: <1365080313-20875-10-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1365080313-20875-1-git-send-email-peter.maydell@linaro.org> References: <1365080313-20875-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQnTNTOIJnoMgq3o02irDs48SnO5n9lKZ3RzQQVOuSmHhpJ6gd+TUNsG7m3bcLdy6Oi+VtxU X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 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 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: , Fix the mapping of the PCI regions for the realview board, which were all incorrect. (This was never noticed because the Linux kernel doesn't actually include a PCI driver for the realview boards.) Signed-off-by: Peter Maydell Acked-by: Paul Brook --- hw/arm/realview.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index ba61d18..23c968b 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -218,9 +218,9 @@ static void realview_init(QEMUMachineInitArgs *args, busdev = SYS_BUS_DEVICE(dev); qdev_init_nofail(dev); sysbus_mmio_map(busdev, 0, 0x10019000); /* PCI controller registers */ - sysbus_mmio_map(busdev, 1, 0x61000000); /* PCI self-config */ - sysbus_mmio_map(busdev, 2, 0x62000000); /* PCI config */ - sysbus_mmio_map(busdev, 3, 0x63000000); /* PCI I/O */ + sysbus_mmio_map(busdev, 1, 0x60000000); /* PCI self-config */ + sysbus_mmio_map(busdev, 2, 0x61000000); /* PCI config */ + sysbus_mmio_map(busdev, 3, 0x62000000); /* PCI I/O */ sysbus_connect_irq(busdev, 0, pic[48]); sysbus_connect_irq(busdev, 1, pic[49]); sysbus_connect_irq(busdev, 2, pic[50]); @@ -304,12 +304,12 @@ static void realview_init(QEMUMachineInitArgs *args, /* 0x58000000 PISMO. */ /* 0x5c000000 PISMO. */ /* 0x60000000 PCI. */ - /* 0x61000000 PCI Self Config. */ - /* 0x62000000 PCI Config. */ - /* 0x63000000 PCI IO. */ - /* 0x64000000 PCI mem 0. */ - /* 0x68000000 PCI mem 1. */ - /* 0x6c000000 PCI mem 2. */ + /* 0x60000000 PCI Self Config. */ + /* 0x61000000 PCI Config. */ + /* 0x62000000 PCI IO. */ + /* 0x63000000 PCI mem 0. */ + /* 0x64000000 PCI mem 1. */ + /* 0x68000000 PCI mem 2. */ /* ??? Hack to map an additional page of ram for the secondary CPU startup code. I guess this works on real hardware because the