genirq/msi: Make descriptor allocation device domain aware

Change the descriptor allocation and insertion functions to take a domain
id to prepare for the upcoming multi MSI domain per device support.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221124230314.163043028@linutronix.de

diff --git a/include/linux/msi.h b/include/linux/msi.h
index f8ba85af3542a48c683b3ba41201cf9b03623be8..35e9d0050ca14843de0470d8e5c1b3c85470b007 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -286,7 +286,21 @@ static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc,
 }
 #endif
 
-int msi_insert_msi_desc(struct device *dev, struct msi_desc *init_desc);
+int msi_domain_insert_msi_desc(struct device *dev, unsigned int domid,
+                              struct msi_desc *init_desc);
+/**
+ * msi_insert_msi_desc - Allocate and initialize a MSI descriptor in the
+ *                      default irqdomain and insert it at @init_desc->msi_index
+ * @dev:       Pointer to the device for which the descriptor is allocated
+ * @init_desc: Pointer to an MSI descriptor to initialize the new descriptor
+ *
+ * Return: 0 on success or an appropriate failure code.
+ */
+static inline int msi_insert_msi_desc(struct device *dev, struct msi_desc *init_desc)
+{
+       return msi_domain_insert_msi_desc(dev, MSI_DEFAULT_DOMAIN, init_desc);
+}
+
 void msi_free_msi_descs_range(struct device *dev, unsigned int first_index, unsigned int last_index);
 
 /**

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 33b8a6cca3f8eaf16203bb4bb5148964597a3884..e75b07fffbcdaa7aa695bb65c439286d350426c7 100644 (file)
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -39,7 +39,7 @@ static inline int msi_sysfs_create_group(struct device *dev);
  * Return: pointer to allocated &msi_desc on success or %NULL on failure
  */
 static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,
-                                       const struct irq_affinity_desc *affinity)
+                                      const struct irq_affinity_desc *affinity)
 {
        struct msi_desc *desc = kzalloc(sizeof(*desc), GFP_KERNEL);
 
@@ -64,9 +64,10 @@ static void msi_free_desc(struct msi_desc *desc)
        kfree(desc);
 }
 
-static int msi_insert_desc(struct msi_device_data *md, struct msi_desc *desc, unsigned int index)
+static int msi_insert_desc(struct msi_device_data *md, struct msi_desc *desc,
+                          unsigned int domid, unsigned int index)
 {
-       struct xarray *xa = &md->__domains[MSI_DEFAULT_DOMAIN].store;
+       struct xarray *xa = &md->__domains[domid].store;
        int ret;
 
        desc->msi_index = index;
@@ -77,15 +78,17 @@ static int msi_insert_desc(struct msi_device_data *md, struct msi_desc *desc, un
 }
 
 /**
- * msi_insert_msi_desc - Allocate and initialize a MSI descriptor and
- *                      insert it at @init_desc->msi_index
+ * msi_domain_insert_msi_desc - Allocate and initialize a MSI descriptor and
+ *                             insert it at @init_desc->msi_index
  *
  * @dev:       Pointer to the device for which the descriptor is allocated
+ * @domid:     The id of the interrupt domain to which the desriptor is added
  * @init_desc: Pointer to an MSI descriptor to initialize the new descriptor
  *
  * Return: 0 on success or an appropriate failure code.
  */
-int msi_insert_msi_desc(struct device *dev, struct msi_desc *init_desc)
+int msi_domain_insert_msi_desc(struct device *dev, unsigned int domid,
+                              struct msi_desc *init_desc)
 {
        struct msi_desc *desc;
 
@@ -97,7 +100,8 @@ int msi_insert_msi_desc(struct device *dev, struct msi_desc *init_desc)
 
        /* Copy type specific data to the new descriptor. */
        desc->pci = init_desc->pci;
-       return msi_insert_desc(dev->msi.data, desc, init_desc->msi_index);
+
+       return msi_insert_desc(dev->msi.data, desc, domid, init_desc->msi_index);
 }
 
 /**
@@ -120,7 +124,7 @@ static int msi_add_simple_msi_descs(struct device *dev, unsigned int index, unsi
                desc = msi_alloc_desc(dev, 1, NULL);
                if (!desc)
                        goto fail_mem;
-               ret = msi_insert_desc(dev->msi.data, desc, idx);
+               ret = msi_insert_desc(dev->msi.data, desc, MSI_DEFAULT_DOMAIN, idx);
                if (ret)
                        goto fail;
        }