OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

VFIO fixes for v2.4.0-rc3

Browse Source 
- Fix Realtek NIC quirk (Alex Williamson)
 - Restore bootindex functionality (Alex Williamson)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVsTerAAoJECObm247sIsiD1gQAIC9PEQX7lOaDcsSH5sV+jq6
 9OMmgsIu51K18An1J8wnd9IyGdf2pTDNJzj4RzfR41Z8dVwv6zHtZPP1dQ89clPa
 v/5ljEsau5sP8jgP4XNfHrrLNzlLq4ofpgS79rZ0YOdPOU+HVRtbhKzrB94iWmU4
 9TkrhJme1cl1vQCzayl8N+/cQHfjwmhVWjosabqaJNsbvK3WqFuM7Dw3pMwAkwir
 hnp6H2cvRhdIacndxPSG2asXuauS4G7Bs4oSAutKirSN7lAqkJJs/UYOTThrNZQz
 l5imvZc5/XJJYFHcLapTA5AFyBqvT6V/R7E5kKp+xpj0BYumpNEXeAISJt+2+TAl
 yXonORVPB0xTAdM5p0W4aBsf3OU4zpB10M9qiHsJzjuC6otkMyaLxAaOZZdYEu0M
 TCz68YYm9A3B53DdVyktdXBwKPcA/hLHaO6cl+tiQ++qLgAk6jUVhhgqdfiovIRi
 FT0PJyFfK8vaFda/5Rg2fmvAzWMlhDTKQXdUTWCUvPnVnqfTnl5s6qPkdUbnGcwV
 NG6CppgqDDFYxSd3qW4O+EZaQZRMnspKIkHS16QaE6MSXzQ2XCjdVPuwKgfTcC/6
 V48qrTWg25ZiEaTLXmpKm26mYdm9wgeSphju4c1chF9sXrJwKaZKidGELSA40M/e
 WYu9VDEzDHNmLaJcYFS9
 =KjO6
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20150723.0' into staging

VFIO fixes for v2.4.0-rc3
- Fix Realtek NIC quirk (Alex Williamson)
- Restore bootindex functionality (Alex Williamson)

# gpg: Signature made Thu Jul 23 19:51:23 2015 BST using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"

* remotes/awilliam/tags/vfio-fixes-20150723.0:
  vfio/pci: Fix bootindex
  vfio/pci: Fix RTL8168 NIC quirks

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-07-24 09:17:44 +01:00
commit f75b709853
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/vfio/pci.c
View File

@ -1517,7 +1517,7 @@ static uint64_t vfio_rtl8168_window_quirk_read(void *opaque,
memory_region_name(&quirk->mem),
vdev->vbasedev.name);
return quirk->data.address_match ^ 0x10000000U;
return quirk->data.address_match ^ 0x80000000U;
}
break;
case 0: /* data */
@ -1558,7 +1558,7 @@ static void vfio_rtl8168_window_quirk_write(void *opaque, hwaddr addr,
switch (addr) {
case 4: /* address */
if ((data & 0x7fff0000) == 0x10000) {
if (data & 0x10000000U &&
if (data & 0x80000000U &&
vdev->pdev.cap_present & QEMU_PCI_CAP_MSIX) {
trace_vfio_rtl8168_window_quirk_write_table(
@ -1566,11 +1566,9 @@ static void vfio_rtl8168_window_quirk_write(void *opaque, hwaddr addr,
vdev->vbasedev.name);
memory_region_dispatch_write(&vdev->pdev.msix_table_mmio,
(hwaddr)(quirk->data.address_match
& 0xfff),
data,
size,
MEMTXATTRS_UNSPECIFIED);
(hwaddr)(data & 0xfff),
(uint64_t)quirk->data.address_mask,
size, MEMTXATTRS_UNSPECIFIED);
}
quirk->data.flags = 1;
@ -3751,7 +3749,6 @@ static Property vfio_pci_dev_properties[] = {
VFIO_FEATURE_ENABLE_VGA_BIT, false),
DEFINE_PROP_BIT("x-req", VFIOPCIDevice, features,
VFIO_FEATURE_ENABLE_REQ_BIT, true),
DEFINE_PROP_INT32("bootindex", VFIOPCIDevice, bootindex, -1),
DEFINE_PROP_BOOL("x-mmap", VFIOPCIDevice, vbasedev.allow_mmap, true),
/*
* TODO - support passed fds... is this necessary?