|
@@ -169,11 +169,29 @@ static void vp_set_status(struct virtio_device *vdev, u8 status)
|
|
|
iowrite8(status, vp_dev->ioaddr + VIRTIO_PCI_STATUS);
|
|
|
}
|
|
|
|
|
|
+/* wait for pending irq handlers */
|
|
|
+static void vp_synchronize_vectors(struct virtio_device *vdev)
|
|
|
+{
|
|
|
+ struct virtio_pci_device *vp_dev = to_vp_device(vdev);
|
|
|
+ int i;
|
|
|
+
|
|
|
+ if (vp_dev->intx_enabled)
|
|
|
+ synchronize_irq(vp_dev->pci_dev->irq);
|
|
|
+
|
|
|
+ for (i = 0; i < vp_dev->msix_vectors; ++i)
|
|
|
+ synchronize_irq(vp_dev->msix_entries[i].vector);
|
|
|
+}
|
|
|
+
|
|
|
static void vp_reset(struct virtio_device *vdev)
|
|
|
{
|
|
|
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
|
|
|
/* 0 status means a reset. */
|
|
|
iowrite8(0, vp_dev->ioaddr + VIRTIO_PCI_STATUS);
|
|
|
+ /* Flush out the status write, and flush in device writes,
|
|
|
+ * including MSi-X interrupts, if any. */
|
|
|
+ ioread8(vp_dev->ioaddr + VIRTIO_PCI_STATUS);
|
|
|
+ /* Flush pending VQ/configuration callbacks. */
|
|
|
+ vp_synchronize_vectors(vdev);
|
|
|
}
|
|
|
|
|
|
/* the notify function used when creating a virt queue */
|