summaryrefslogtreecommitdiffstats
path: root/drivers/virtio/virtio_pci.c
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2012-01-10 20:55:11 +0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2012-01-10 20:55:11 +0400
commit913272b3864d6da89c70d9fc2c30ccb57794b369 (patch)
tree4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /drivers/virtio/virtio_pci.c
parent6cfc2a23540667cff6da6e41d1f1167a9a45aa9a (diff)
parent629bcb4b72d49b3631ae3dd0fe1d345820fadfcc (diff)
downloadop-kernel-dev-913272b3864d6da89c70d9fc2c30ccb57794b369.zip
op-kernel-dev-913272b3864d6da89c70d9fc2c30ccb57794b369.tar.gz
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'drivers/virtio/virtio_pci.c')
-rw-r--r--drivers/virtio/virtio_pci.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 3d1bf41..03d1984 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -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 */
OpenPOWER on IntegriCloud