From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b32CC-0005iT-IF for qemu-devel@nongnu.org; Wed, 18 May 2016 10:11:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b32C7-0007b9-E0 for qemu-devel@nongnu.org; Wed, 18 May 2016 10:11:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b32C7-0007b4-7O for qemu-devel@nongnu.org; Wed, 18 May 2016 10:11:27 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DFB7DC04B30B for ; Wed, 18 May 2016 14:11:26 +0000 (UTC) Date: Wed, 18 May 2016 17:11:23 +0300 From: "Michael S. Tsirkin" Message-ID: <20160518170958-mutt-send-email-mst@redhat.com> References: <1463340214-8721-1-git-send-email-marcel@redhat.com> <1463340214-8721-3-git-send-email-marcel@redhat.com> <20160518155929.01d7b07f@nial.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160518155929.01d7b07f@nial.brq.redhat.com> Subject: Re: [Qemu-devel] [PATCH V2 2/4] pci: reserve 64 bit MMIO range for PCI hotplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: Marcel Apfelbaum , qemu-devel@nongnu.org, lersek@redhat.com, ehabkost@redhat.com On Wed, May 18, 2016 at 03:59:29PM +0200, Igor Mammedov wrote: > On Sun, 15 May 2016 22:23:32 +0300 > Marcel Apfelbaum wrote: > > > Using the firmware assigned MMIO ranges for 64-bit PCI window > > leads to zero space for hot-plugging PCI devices over 4G. > > > > PC machines can use the whole CPU addressable range after > > the space reserved for memory-hotplug. > > > > Signed-off-by: Marcel Apfelbaum > that patch also has side effect of unconditionally adding > QWordMemory() resource in PCI0._CRS > on all machine types with QEMU generated ACPI tables. > > Have you tested that it won't break boot of legacy OSes > (XP, WS2003, old linux with 32bit kernel)? It's almost sure it break it. Maybe you can check _REV in _CRS to work around this for XP. > > --- > > hw/pci/pci.c | 16 ++++++++++++++-- > > 1 file changed, 14 insertions(+), 2 deletions(-) > > > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > > index bb605ef..44dd949 100644 > > --- a/hw/pci/pci.c > > +++ b/hw/pci/pci.c > > @@ -41,6 +41,7 @@ > > #include "hw/hotplug.h" > > #include "hw/boards.h" > > #include "qemu/cutils.h" > > +#include "hw/i386/pc.h" > > > > //#define DEBUG_PCI > > #ifdef DEBUG_PCI > > @@ -2467,8 +2468,19 @@ static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev, void *opaque) > > > > void pci_bus_get_w64_range(PCIBus *bus, Range *range) > > { > > - range->begin = range->end = 0; > > - pci_for_each_device_under_bus(bus, pci_dev_get_w64, range); > > + Object *machine = qdev_get_machine(); > > + if (object_dynamic_cast(machine, TYPE_PC_MACHINE)) { > > + PCMachineState *pcms = PC_MACHINE(machine); > > + range->begin = pc_machine_get_reserved_memory_end(pcms); > > + if (!range->begin) { > > + range->begin = ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, > > + 1ULL << 30); > > + } > > + range->end = 1ULL << 40; /* 40 bits physical */ > > + } else { > > + range->begin = range->end = 0; > > + pci_for_each_device_under_bus(bus, pci_dev_get_w64, range); > > + } > > } > > > > static bool pcie_has_upstream_port(PCIDevice *dev)