x86/PCI: VMD: Allocate IRQ lists with correct MSI-X count

To reduce the amount of memory required for IRQ lists, only allocate their
space after calling pci_msix_enable_range() which may reduce the number of
MSI-X vectors allocated.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>

diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
index b814ca675131ec1bf647a91290cff0a76a308814..7a8538da62897cd6a993dad01a08718461e1e0f6 100644 (file)
--- a/arch/x86/pci/vmd.c
+++ b/arch/x86/pci/vmd.c
@@ -671,11 +671,6 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (vmd->msix_count < 0)
                return -ENODEV;
 
-       vmd->irqs = devm_kcalloc(&dev->dev, vmd->msix_count, sizeof(*vmd->irqs),
-                                GFP_KERNEL);
-       if (!vmd->irqs)
-               return -ENOMEM;
-
        vmd->msix_entries = devm_kcalloc(&dev->dev, vmd->msix_count,
                                         sizeof(*vmd->msix_entries),
                                         GFP_KERNEL);
@@ -689,6 +684,11 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (vmd->msix_count < 0)
                return vmd->msix_count;
 
+       vmd->irqs = devm_kcalloc(&dev->dev, vmd->msix_count, sizeof(*vmd->irqs),
+                                GFP_KERNEL);
+       if (!vmd->irqs)
+               return -ENOMEM;
+
        for (i = 0; i < vmd->msix_count; i++) {
                INIT_LIST_HEAD(&vmd->irqs[i].irq_list);
                vmd->irqs[i].vmd_vector = vmd->msix_entries[i].vector;