1 files changed, 16 insertions, 23 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 4c0b47867258..73986825d221 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -532,7 +532,7 @@ error_attrs:
 }
 
 static struct msi_desc *
-msi_setup_entry(struct pci_dev *dev, int nvec, const struct irq_affinity *affd)
+msi_setup_entry(struct pci_dev *dev, int nvec, struct irq_affinity *affd)
 {
         struct irq_affinity_desc *masks = NULL;
         struct msi_desc *entry;
@@ -597,7 +597,7 @@ static int msi_verify_entries(struct pci_dev *dev)
  * which could have been allocated.
  */
 static int msi_capability_init(struct pci_dev *dev, int nvec,
-                               const struct irq_affinity *affd)
+                               struct irq_affinity *affd)
 {
         struct msi_desc *entry;
         int ret;
@@ -669,7 +669,7 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries)
 
 static int msix_setup_entries(struct pci_dev *dev, void __iomem *base,
                               struct msix_entry *entries, int nvec,
-                              const struct irq_affinity *affd)
+                              struct irq_affinity *affd)
 {
         struct irq_affinity_desc *curmsk, *masks = NULL;
         struct msi_desc *entry;
@@ -736,7 +736,7 @@ static void msix_program_entries(struct pci_dev *dev,
  * requested MSI-X entries with allocated irqs or non-zero for otherwise.
  **/
 static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
-                                int nvec, const struct irq_affinity *affd)
+                                int nvec, struct irq_affinity *affd)
 {
         int ret;
         u16 control;
@@ -932,7 +932,7 @@ int pci_msix_vec_count(struct pci_dev *dev)
 EXPORT_SYMBOL(pci_msix_vec_count);
 
 static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries,
-                             int nvec, const struct irq_affinity *affd)
+                             int nvec, struct irq_affinity *affd)
 {
         int nr_entries;
         int i, j;
@@ -1018,7 +1018,7 @@ int pci_msi_enabled(void)
 EXPORT_SYMBOL(pci_msi_enabled);
 
 static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
-                                  const struct irq_affinity *affd)
+                                  struct irq_affinity *affd)
 {
         int nvec;
         int rc;
@@ -1035,13 +1035,6 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
         if (maxvec < minvec)
                 return -ERANGE;
 
-        /*
-         * If the caller is passing in sets, we can't support a range of
-         * vectors. The caller needs to handle that.
-         */
-        if (affd && affd->nr_sets && minvec != maxvec)
-                return -EINVAL;
-
         if (WARN_ON_ONCE(dev->msi_enabled))
                 return -EINVAL;
 
@@ -1086,20 +1079,13 @@ EXPORT_SYMBOL(pci_enable_msi);
 
 static int __pci_enable_msix_range(struct pci_dev *dev,
                                    struct msix_entry *entries, int minvec,
-                                   int maxvec, const struct irq_affinity *affd)
+                                   int maxvec, struct irq_affinity *affd)
 {
         int rc, nvec = maxvec;
 
         if (maxvec < minvec)
                 return -ERANGE;
 
-        /*
-         * If the caller is passing in sets, we can't support a range of
-         * supported vectors. The caller needs to handle that.
-         */
-        if (affd && affd->nr_sets && minvec != maxvec)
-                return -EINVAL;
-
         if (WARN_ON_ONCE(dev->msix_enabled))
                 return -EINVAL;
 
@@ -1165,9 +1151,9 @@ EXPORT_SYMBOL(pci_enable_msix_range);
  */
 int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
                                    unsigned int max_vecs, unsigned int flags,
-                                   const struct irq_affinity *affd)
+                                   struct irq_affinity *affd)
 {
-        static const struct irq_affinity msi_default_affd;
+        struct irq_affinity msi_default_affd = {0};
         int msix_vecs = -ENOSPC;
         int msi_vecs = -ENOSPC;
 
@@ -1196,6 +1182,13 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
         /* use legacy irq if allowed */
         if (flags & PCI_IRQ_LEGACY) {
                 if (min_vecs == 1 && dev->irq) {
+                        /*
+                         * Invoke the affinity spreading logic to ensure that
+                         * the device driver can adjust queue configuration
+                         * for the single interrupt case.
+                         */
+                        if (affd)
+                                irq_create_affinity_masks(1, affd);
                         pci_intx(dev, 1);
                         return 1;
                 }