[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 08/11] vfio: vote the function 0 to do host bus r
From: |
Zhou Jie |
Subject: |
[Qemu-devel] [PATCH v9 08/11] vfio: vote the function 0 to do host bus reset when aer occurred |
Date: |
Tue, 19 Jul 2016 15:38:26 +0800 |
From: Chen Fan <address@hidden>
Due to all devices assigned to VM on the same way as host if enable
aer, so we can easily do the hot reset by selecting the function #0
to do the hot reset.
Signed-off-by: Chen Fan <address@hidden>
---
hw/vfio/pci.c | 14 ++++++++++++++
hw/vfio/pci.h | 1 +
2 files changed, 15 insertions(+)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 8bcb26b..0521652 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1924,6 +1924,8 @@ static void vfio_check_hot_bus_reset(VFIOPCIDevice *vdev,
Error **errp)
/* List all affected devices by bus reset */
devices = &info->devices[0];
+ vdev->single_depend_dev = (info->count == 1);
+
/* Verify that we have all the groups required */
for (i = 0; i < info->count; i++) {
PCIHostDeviceAddress host;
@@ -3120,6 +3122,18 @@ static void vfio_pci_reset(DeviceState *dev)
trace_vfio_pci_reset(vdev->vbasedev.name);
+ if (vdev->features & VFIO_FEATURE_ENABLE_AER) {
+ PCIDevice *br = pci_bridge_get_device(pdev->bus);
+
+ if ((pci_get_word(br->config + PCI_BRIDGE_CONTROL) &
+ PCI_BRIDGE_CTL_BUS_RESET)) {
+ if (pci_get_function_0(pdev) == pdev) {
+ vfio_pci_hot_reset(vdev, vdev->single_depend_dev);
+ }
+ return;
+ }
+ }
+
vfio_pci_pre_reset(vdev);
if (vdev->resetfn && !vdev->resetfn(vdev)) {
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index e2faffb..ed14322 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -147,6 +147,7 @@ typedef struct VFIOPCIDevice {
bool no_kvm_intx;
bool no_kvm_msi;
bool no_kvm_msix;
+ bool single_depend_dev;
} VFIOPCIDevice;
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
--
1.8.3.1
- [Qemu-devel] [PATCH v9 00/11] vfio-pci: pass the aer error to guest, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 02/11] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 01/11] vfio: extract vfio_get_hot_reset_info as a single function, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 03/11] vfio: add aer support for vfio device, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 05/11] vfio: add check host bus reset is support or not, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 04/11] vfio: refine function vfio_pci_host_match, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 06/11] pci: add a pci_function_is_valid callback to check function if valid, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 07/11] vfio: add check aer functionality for hotplug device, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 08/11] vfio: vote the function 0 to do host bus reset when aer occurred,
Zhou Jie <=
- [Qemu-devel] [PATCH v9 09/11] vfio-pci: pass the aer error to guest, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 11/11] vfio: add 'aer' property to expose aercap, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 10/11] vfio: Add waiting for host aer error progress, Zhou Jie, 2016/07/19