From patchwork Tue Dec 18 12:41:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 207125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 48E8D2C0089 for ; Wed, 19 Dec 2012 01:03:36 +1100 (EST) Received: from localhost ([::1]:58603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwWc-0001Xx-Jz for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 07:43:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwVN-0008N8-HJ for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkwVM-0008V6-4U for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:41 -0500 Received: from mail-bk0-f51.google.com ([209.85.214.51]:39179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkwVL-0008Ux-S7 for qemu-devel@nongnu.org; Tue, 18 Dec 2012 07:42:40 -0500 Received: by mail-bk0-f51.google.com with SMTP id ik5so287210bkc.24 for ; Tue, 18 Dec 2012 04:42:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=WEO447sL/uzYJJ8VITyLrtcN0JAjcj15G1dgJt8Tbjg=; b=Z5eV6yBeS8saZEZWju5LaBlgRwB4f7PnUCNUmsnjS2i3ZNhFfAR3FYp8KhsIl3Eqbz 4SKWmLtwM1n7CCR2X15r/nMaRJNUiaaeRKuhA3nZBbHdrKNfYy8jFhWB5hQmqDtxhs2k e+8nXmQIS5CIPo22bW1Dm0UVvVF1/5NmWyAtPgID3suCwYOvsFvdBPp6M/E5mFkF0OQS 7HVxOJa7ptpsvKd2KxeL+ex4Dp6rhquMsEzWdjghW/uwGHegAn++SkjOnWVi+ea9dcZq A6FplRmy2Gkqu37f7jUgcBxjBknn0/6+hqv0iz0PeAw2v9R6S8dHgkcSOHE7ldwPEre8 4UJA== X-Received: by 10.204.133.219 with SMTP id g27mr668296bkt.65.1355834558858; Tue, 18 Dec 2012 04:42:38 -0800 (PST) Received: from dhcp-192-168-178-175.ri.profitbricks.localdomain ([62.217.45.26]) by mx.google.com with ESMTPS id f24sm1169954bkv.7.2012.12.18.04.42.36 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 04:42:37 -0800 (PST) From: Vasilis Liaskovitis To: qemu-devel@nongnu.org, seabios@seabios.org Date: Tue, 18 Dec 2012 13:41:45 +0100 Message-Id: <1355834518-17989-18-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1355834518-17989-1-git-send-email-vasilis.liaskovitis@profitbricks.com> References: <1355834518-17989-1-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Gm-Message-State: ALoCoQnmJaZkQ2It/KN50IR7DgrfdZ7g5DOJTcLpKe/h806sxZ/Z/HJWFn7Z+8wnkzxx7OHh+/1F X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.214.51 Cc: Vasilis Liaskovitis , pingfank@linux.vnet.ibm.com, gleb@redhat.com, stefanha@gmail.com, jbaron@redhat.com, blauwirbel@gmail.com, kevin@koconnor.net, kraxel@redhat.com, anthony@codemonkey.ws Subject: [Qemu-devel] [RFC PATCH v4 17/30] [SeaBIOS] 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 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 --- src/paravirt.c | 6 ++++++ src/paravirt.h | 2 ++ src/pciinit.c | 9 +++++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/paravirt.c b/src/paravirt.c index 4b5c441..f7517b9 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -347,3 +347,9 @@ void qemu_cfg_romfile_setup(void) dprintf(3, "Found fw_cfg file: %s (size=%d)\n", file->name, file->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 a284c41..b53ff88 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -35,6 +35,7 @@ static inline int kvm_para_available(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) @@ -65,5 +66,6 @@ struct e820_reservation { u32 qemu_cfg_e820_entries(void); void* qemu_cfg_e820_load_next(void *addr); void qemu_cfg_romfile_setup(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 a406bbd..4103d2d 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -734,6 +734,7 @@ static void pci_bios_map_devices(struct pci_bus *busses) void pci_setup(void) { + u64 pv_pcimem_start, pv_pcimem64_start; if (CONFIG_COREBOOT || usingXen()) { // PCI setup already done by coreboot or Xen - just do probe. pci_probe_devices(); @@ -769,5 +770,13 @@ 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); }