1 files changed, 15 insertions, 10 deletions

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 660ec84bc40f..4fd733ff72b1 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1478,8 +1478,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
         if (result > 0) {
                 dev_err(dev->ctrl.device,
                         "Could not set queue count (%d)\n", result);
-                nr_io_queues = 0;
-                result = 0;
+                return 0;
         }
 
         if (dev->cmb && NVME_CMB_SQS(dev->cmbsz)) {
@@ -1513,7 +1512,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
          * If we enable msix early due to not intx, disable it again before
          * setting up the full range we need.
          */
-        if (!pdev->irq)
+        if (pdev->msi_enabled)
+                pci_disable_msi(pdev);
+        else if (pdev->msix_enabled)
                 pci_disable_msix(pdev);
 
         for (i = 0; i < nr_io_queues; i++)
@@ -1696,7 +1697,6 @@ static int nvme_pci_enable(struct nvme_dev *dev)
         if (pci_enable_device_mem(pdev))
                 return result;
 
-        dev->entry[0].vector = pdev->irq;
         pci_set_master(pdev);
 
         if (dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(64)) &&
@@ -1709,13 +1709,18 @@ static int nvme_pci_enable(struct nvme_dev *dev)
         }
 
         /*
-         * Some devices don't advertse INTx interrupts, pre-enable a single
-         * MSIX vec for setup. We'll adjust this later.
+         * Some devices and/or platforms don't advertise or work with INTx
+         * interrupts. Pre-enable a single MSIX or MSI vec for setup. We'll
+         * adjust this later.
          */
-        if (!pdev->irq) {
-                result = pci_enable_msix(pdev, dev->entry, 1);
-                if (result < 0)
-                        goto disable;
+        if (pci_enable_msix(pdev, dev->entry, 1)) {
+                pci_enable_msi(pdev);
+                dev->entry[0].vector = pdev->irq;
+        }
+
+        if (!dev->entry[0].vector) {
+                result = -ENODEV;
+                goto disable;
         }
 
         cap = lo_hi_readq(dev->bar + NVME_REG_CAP);