david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-kvm/pci-assign: 64 bits bar emulation

Browse Source 
Enable 64 bits bar emulation.

Test pass with the current seabios which already support 64bit pci bars.

Signed-off-by: Xudong Hao <xudong.hao@intel.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
This commit is contained in:
Xudong Hao 2012-12-20 11:07:23 +08:00 committed by Gleb Natapov
parent f28558d3d3
commit 0a2a59d35c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/kvm/pci-assign.c
View File

@ -46,6 +46,7 @@
#define IORESOURCE_IRQ 0x00000400 #define IORESOURCE_IRQ 0x00000400
#define IORESOURCE_DMA 0x00000800 #define IORESOURCE_DMA 0x00000800
#define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */
#define IORESOURCE_MEM_64 0x00100000
//#define DEVICE_ASSIGNMENT_DEBUG //#define DEVICE_ASSIGNMENT_DEBUG
@ -442,9 +443,13 @@ static int assigned_dev_register_regions(PCIRegion *io_regions,
/* handle memory io regions */ /* handle memory io regions */
if (cur_region->type & IORESOURCE_MEM) { if (cur_region->type & IORESOURCE_MEM) {
int t = cur_region->type & IORESOURCE_PREFETCH int t = PCI_BASE_ADDRESS_SPACE_MEMORY;
? PCI_BASE_ADDRESS_MEM_PREFETCH if (cur_region->type & IORESOURCE_PREFETCH) {
: PCI_BASE_ADDRESS_SPACE_MEMORY; t |= PCI_BASE_ADDRESS_MEM_PREFETCH;
}
if (cur_region->type & IORESOURCE_MEM_64) {
t |= PCI_BASE_ADDRESS_MEM_TYPE_64;
}
/* map physical memory */ /* map physical memory */
pci_dev->v_addrs[i].u.r_virtbase = mmap(NULL, cur_region->size, pci_dev->v_addrs[i].u.r_virtbase = mmap(NULL, cur_region->size,
@ -632,7 +637,8 @@ again:
rp->valid = 0; rp->valid = 0;
rp->resource_fd = -1; rp->resource_fd = -1;
size = end - start + 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) { if (size == 0 || (flags & ~IORESOURCE_PREFETCH) == 0) {
continue; continue;
} }