Revert "virtio_pci: don't duplicate the msix_enable flag in struct pc…

…i_dev" This reverts commit 53a020c. The cleanup seems to be one of the changes that broke hybernation for some users. We are still not sure why but revert helps. Tested-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
BtbN · Apr 10, 2017 · 2008c15 · 2008c15
1 parent bf951b1
commit 2008c15
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
@@ -125,7 +125,7 @@ void vp_del_vqs(struct virtio_device *vdev)
 
  vp_remove_vqs(vdev);
 
- if (vp_dev->pci_dev->msix_enabled) {
+ if (vp_dev->msix_enabled) {
  for (i = 0; i < vp_dev->msix_vectors; i++)
  free_cpumask_var(vp_dev->msix_affinity_masks[i]);
 
@@ -249,6 +249,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,
  allocated_vectors++;
  }
 
+ vp_dev->msix_enabled = 1;
  return 0;
 
 out_remove_vqs:
@@ -343,7 +344,7 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
  if (!vq->callback)
  return -EINVAL;
 
- if (vp_dev->pci_dev->msix_enabled) {
+ if (vp_dev->msix_enabled) {
  int vec = vp_dev->msix_vector_map[vq->index];
  struct cpumask *mask = vp_dev->msix_affinity_masks[vec];
  unsigned int irq = pci_irq_vector(vp_dev->pci_dev, vec);

diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
@@ -64,6 +64,8 @@ struct virtio_pci_device {
  /* the IO mapping for the PCI config space */
  void __iomem *ioaddr;
 
+ /* MSI-X support */
+ int msix_enabled;
  cpumask_var_t *msix_affinity_masks;
  /* Name strings for interrupts. This size should be enough,
  * and I'm too lazy to allocate each name separately. */

diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
@@ -165,7 +165,7 @@ static void del_vq(struct virtqueue *vq)
 
  iowrite16(vq->index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL);
 
- if (vp_dev->pci_dev->msix_enabled) {
+ if (vp_dev->msix_enabled) {
  iowrite16(VIRTIO_MSI_NO_VECTOR,
  vp_dev->ioaddr + VIRTIO_MSI_QUEUE_VECTOR);
  /* Flush the write out to device */

diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
@@ -411,7 +411,7 @@ static void del_vq(struct virtqueue *vq)
 
  vp_iowrite16(vq->index, &vp_dev->common->queue_select);
 
- if (vp_dev->pci_dev->msix_enabled) {
+ if (vp_dev->msix_enabled) {
  vp_iowrite16(VIRTIO_MSI_NO_VECTOR,
  &vp_dev->common->queue_msix_vector);
  /* Flush the write out to device */

diff --git a/include/uapi/linux/virtio_pci.h b/include/uapi/linux/virtio_pci.h
@@ -79,7 +79,7 @@
  * configuration space */
 #define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)
 /* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */
-#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->pci_dev->msix_enabled)
+#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled)
 
 /* Virtio ABI version, this must match exactly */
 #define VIRTIO_PCI_ABI_VERSION 0