From patchwork Wed Jun 26 09:15:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 254676 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2F93F2C0092 for ; Wed, 26 Jun 2013 19:37:20 +1000 (EST) Received: from localhost ([::1]:43882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrlsU-0003FY-Eb for incoming@patchwork.ozlabs.org; Wed, 26 Jun 2013 05:19:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urlpg-00076s-09 for qemu-devel@nongnu.org; Wed, 26 Jun 2013 05:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Urlpc-0003Rt-5h for qemu-devel@nongnu.org; Wed, 26 Jun 2013 05:16:07 -0400 Received: from [222.73.24.84] (port=55881 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urlpb-0003Py-Jm for qemu-devel@nongnu.org; Wed, 26 Jun 2013 05:16:04 -0400 X-IronPort-AV: E=Sophos;i="4.87,943,1363104000"; d="scan'208";a="7688781" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 26 Jun 2013 17:13:06 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r5Q9FxSg020491; Wed, 26 Jun 2013 17:15:59 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com ([10.167.233.156]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013062617144370-2496230 ; Wed, 26 Jun 2013 17:14:43 +0800 From: Hu Tao To: qemu-devel@nongnu.org, seabios@seabios.org Date: Wed, 26 Jun 2013 17:15:05 +0800 Message-Id: <1813216d1e7ce7f7c88aa321a64861a1a65bf895.1372237449.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/26 17:14:43, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/26 17:14:44, Serialize complete at 2013/06/26 17:14:44 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Vasilis Liaskovitis Subject: [Qemu-devel] [PATCH v5 7/7] pci: Use paravirt interface for pcimem_start and pcimem64_start 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Vasilis Liaskovitis Initialize the 32-bit and 64-bit pci starting offsets from values passed in by the qemu paravirt interface QEMU_CFG_PCI_WINDOW. Qemu calculates the starting offsets based on initial memory and hotplug-able dimms. It's possible to avoid the new paravirt interface, and calculate pci ranges from srat entries. But the code changes are ugly, see: http://lists.gnu.org/archive/html/qemu-devel/2012-09/msg03548.html Signed-off-by: Vasilis Liaskovitis --- src/paravirt.c | 7 +++++++ src/paravirt.h | 1 + src/pciinit.c | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/src/paravirt.c b/src/paravirt.c index 5925c63..9c1e511 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -134,6 +134,7 @@ qemu_platform_setup(void) #define QEMU_CFG_BOOT_MENU 0x0e #define QEMU_CFG_MAX_CPUS 0x0f #define QEMU_CFG_FILE_DIR 0x19 +#define QEMU_CFG_PCI_WINDOW 0x1a #define QEMU_CFG_ARCH_LOCAL 0x8000 #define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) #define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1) @@ -339,3 +340,9 @@ void qemu_cfg_init(void) , 0, be32_to_cpu(qfile.size)); } } + +void qemu_cfg_get_pci_offsets(u64 *pcimem_start, u64 *pcimem64_start) +{ + qemu_cfg_read_entry(pcimem_start, QEMU_CFG_PCI_WINDOW, sizeof(u64)); + qemu_cfg_read((u8*)(pcimem64_start), sizeof(u64)); +} diff --git a/src/paravirt.h b/src/paravirt.h index fce5af9..2c37d0d 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -27,5 +27,6 @@ static inline int runningOnKVM(void) { void qemu_preinit(void); void qemu_platform_setup(void); void qemu_cfg_init(void); +void qemu_cfg_get_pci_offsets(u64 *pcimem_start, u64 *pcimem64_start); #endif diff --git a/src/pciinit.c b/src/pciinit.c index 8370b96..7e63c5e 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -805,6 +805,7 @@ static void pci_bios_map_devices(struct pci_bus *busses) void pci_setup(void) { + u64 pv_pcimem_start, pv_pcimem64_start; if (!CONFIG_QEMU) return; @@ -837,6 +838,14 @@ pci_setup(void) pci_bios_init_devices(); + /* if qemu gives us other pci window values, it means there are hotplug-able + * dimms. Adjust accordingly */ + qemu_cfg_get_pci_offsets(&pv_pcimem_start, &pv_pcimem64_start); + if (pv_pcimem_start > pcimem_start) + pcimem_start = pv_pcimem_start; + if (pv_pcimem64_start > pcimem64_start) + pcimem64_start = pv_pcimem64_start; + free(busses); pci_enable_default_vga();