From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tmga7-000540-O3 for qemu-devel@nongnu.org; Sun, 23 Dec 2012 03:06:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tmga4-0005zF-3y for qemu-devel@nongnu.org; Sun, 23 Dec 2012 03:06:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tmga3-0005z5-Sa for qemu-devel@nongnu.org; Sun, 23 Dec 2012 03:06:44 -0500 Date: Sun, 23 Dec 2012 10:06:39 +0200 From: Gleb Natapov Message-ID: <20121223080639.GL17584@redhat.com> References: <1355972844-30235-1-git-send-email-xudong.hao@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1355972844-30235-1-git-send-email-xudong.hao@intel.com> Subject: Re: [Qemu-devel] [PATCH v3] qemu-kvm/pci-assign: 64 bits bar emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Xudong Hao Cc: alex.williamson@redhat.com, mtosatti@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org On Thu, Dec 20, 2012 at 11:07:23AM +0800, Xudong Hao wrote: > Enable 64 bits bar emulation. > > v3 changes from v2: > - Leave original error string and drop the leading 016. > > v2 changes from v1: > - Change 0lx% to 0x%016 when print a 64 bit variable. > > Test pass with the current seabios which already support 64bit pci bars. > > Signed-off-by: Xudong Hao Alex, is this OK with you now? > --- > hw/kvm/pci-assign.c | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c > index 7a0998c..2271a2e 100644 > --- a/hw/kvm/pci-assign.c > +++ b/hw/kvm/pci-assign.c > @@ -46,6 +46,7 @@ > #define IORESOURCE_IRQ 0x00000400 > #define IORESOURCE_DMA 0x00000800 > #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ > +#define IORESOURCE_MEM_64 0x00100000 > > //#define DEVICE_ASSIGNMENT_DEBUG > > @@ -442,9 +443,13 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, > > /* handle memory io regions */ > if (cur_region->type & IORESOURCE_MEM) { > - int t = cur_region->type & IORESOURCE_PREFETCH > - ? PCI_BASE_ADDRESS_MEM_PREFETCH > - : PCI_BASE_ADDRESS_SPACE_MEMORY; > + int t = PCI_BASE_ADDRESS_SPACE_MEMORY; > + if (cur_region->type & IORESOURCE_PREFETCH) { > + t |= PCI_BASE_ADDRESS_MEM_PREFETCH; > + } > + if (cur_region->type & IORESOURCE_MEM_64) { > + t |= PCI_BASE_ADDRESS_MEM_TYPE_64; > + } > > /* map physical memory */ > pci_dev->v_addrs[i].u.r_virtbase = mmap(NULL, cur_region->size, > @@ -632,7 +637,8 @@ again: > rp->valid = 0; > rp->resource_fd = -1; > size = end - start + 1; > - flags &= IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; > + flags &= IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH > + | IORESOURCE_MEM_64; > if (size == 0 || (flags & ~IORESOURCE_PREFETCH) == 0) { > continue; > } > -- > 1.5.5 -- Gleb.