device: Move MSI related data into a struct

The only unconditional part of MSI data in struct device is the irqdomain
pointer. Everything else can be allocated on demand. Create a data
structure and move the irqdomain pointer into it. The other MSI specific
parts are going to be removed from struct device in later steps.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20211210221813.617178827@linutronix.de

diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
index 3d6c8f9caf431e80908322b23cb8be69bf71174b..f1f0876510a4f1a0f6273eb3b952240ed1856a88 100644 (file)
--- a/drivers/base/platform-msi.c
+++ b/drivers/base/platform-msi.c
@@ -210,10 +210,10 @@ platform_msi_alloc_priv_data(struct device *dev, unsigned int nvec,
         * accordingly (which would impact the max number of MSI
         * capable devices).
         */
-       if (!dev->msi_domain || !write_msi_msg || !nvec || nvec > MAX_DEV_MSIS)
+       if (!dev->msi.domain || !write_msi_msg || !nvec || nvec > MAX_DEV_MSIS)
                return ERR_PTR(-EINVAL);
 
-       if (dev->msi_domain->bus_token != DOMAIN_BUS_PLATFORM_MSI) {
+       if (dev->msi.domain->bus_token != DOMAIN_BUS_PLATFORM_MSI) {
                dev_err(dev, "Incompatible msi_domain, giving up\n");
                return ERR_PTR(-EINVAL);
        }
@@ -269,7 +269,7 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec,
        if (err)
                goto out_free_priv_data;
 
-       err = msi_domain_alloc_irqs(dev->msi_domain, dev, nvec);
+       err = msi_domain_alloc_irqs(dev->msi.domain, dev, nvec);
        if (err)
                goto out_free_desc;
 
@@ -282,7 +282,7 @@ int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec,
        return 0;
 
 out_free_irqs:
-       msi_domain_free_irqs(dev->msi_domain, dev);
+       msi_domain_free_irqs(dev->msi.domain, dev);
 out_free_desc:
        platform_msi_free_descs(dev, 0, nvec);
 out_free_priv_data:
@@ -306,7 +306,7 @@ void platform_msi_domain_free_irqs(struct device *dev)
                platform_msi_free_priv_data(desc->platform.msi_priv_data);
        }
 
-       msi_domain_free_irqs(dev->msi_domain, dev);
+       msi_domain_free_irqs(dev->msi.domain, dev);
        platform_msi_free_descs(dev, 0, MAX_DEV_MSIS);
 }
 EXPORT_SYMBOL_GPL(platform_msi_domain_free_irqs);
@@ -354,7 +354,7 @@ __platform_msi_create_device_domain(struct device *dev,
                return NULL;
 
        data->host_data = host_data;
-       domain = irq_domain_create_hierarchy(dev->msi_domain, 0,
+       domain = irq_domain_create_hierarchy(dev->msi.domain, 0,
                                             is_tree ? 0 : nvec,
                                             dev->fwnode, ops, data);
        if (!domain)

diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 041d8e32d6300551210769a339d1acafd4ad5a8d..20edd0bf3e8bab1d4f6385046630245940c350b1 100644 (file)
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -5279,9 +5279,9 @@ static int udma_probe(struct platform_device *pdev)
        if (IS_ERR(ud->ringacc))
                return PTR_ERR(ud->ringacc);
 
-       dev->msi_domain = of_msi_get_domain(dev, dev->of_node,
+       dev->msi.domain = of_msi_get_domain(dev, dev->of_node,
                                            DOMAIN_BUS_TI_SCI_INTA_MSI);
-       if (!dev->msi_domain) {
+       if (!dev->msi.domain) {
                dev_err(dev, "Failed to get MSI domain\n");
                return -EPROBE_DEFER;
        }

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index f5848b351b1935900e54c69c1a9c76b88e409011..5ba9006ec5503f343947fe4beb3f781d26819d7f 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -3170,7 +3170,7 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu)
        if (!(smmu->features & ARM_SMMU_FEAT_MSI))
                return;
 
-       if (!dev->msi_domain) {
+       if (!dev->msi.domain) {
                dev_info(smmu->dev, "msi_domain absent - falling back to wired irqs\n");
                return;
        }

diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c
index 3e7297fc5948b372342e642d7c448eec67e8d089..4a4a65a6f6326136999279637d33e4c4a96ef6e5 100644 (file)
--- a/drivers/irqchip/irq-mvebu-icu.c
+++ b/drivers/irqchip/irq-mvebu-icu.c
@@ -314,12 +314,12 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev)
                msi_data->subset_data = of_device_get_match_data(dev);
        }
 
-       dev->msi_domain = of_msi_get_domain(dev, dev->of_node,
+       dev->msi.domain = of_msi_get_domain(dev, dev->of_node,
                                            DOMAIN_BUS_PLATFORM_MSI);
-       if (!dev->msi_domain)
+       if (!dev->msi.domain)
                return -EPROBE_DEFER;
 
-       msi_parent_dn = irq_domain_get_of_node(dev->msi_domain);
+       msi_parent_dn = irq_domain_get_of_node(dev->msi.domain);
        if (!msi_parent_dn)
                return -ENODEV;
 

diff --git a/drivers/soc/ti/k3-ringacc.c b/drivers/soc/ti/k3-ringacc.c
index 312ba0f98ad7948fa3c71cc05a56e68e0b3c5e53..26159a5eef88ab8843539a926a95a76c5d99389a 100644 (file)
--- a/drivers/soc/ti/k3-ringacc.c
+++ b/drivers/soc/ti/k3-ringacc.c
@@ -1356,9 +1356,9 @@ static int k3_ringacc_init(struct platform_device *pdev,
        struct resource *res;
        int ret, i;
 
-       dev->msi_domain = of_msi_get_domain(dev, dev->of_node,
+       dev->msi.domain = of_msi_get_domain(dev, dev->of_node,
                                            DOMAIN_BUS_TI_SCI_INTA_MSI);
-       if (!dev->msi_domain) {
+       if (!dev->msi.domain) {
                dev_err(dev, "Failed to get MSI domain\n");
                return -EPROBE_DEFER;
        }

diff --git a/drivers/soc/ti/ti_sci_inta_msi.c b/drivers/soc/ti/ti_sci_inta_msi.c
index a1d9c027022a7270824580877d3d9683e0272afd..428a482df0f21c7e052e3496528585eddabeb3f4 100644 (file)
--- a/drivers/soc/ti/ti_sci_inta_msi.c
+++ b/drivers/soc/ti/ti_sci_inta_msi.c
@@ -140,7 +140,7 @@ EXPORT_SYMBOL_GPL(ti_sci_inta_msi_domain_alloc_irqs);
 
 void ti_sci_inta_msi_domain_free_irqs(struct device *dev)
 {
-       msi_domain_free_irqs(dev->msi_domain, dev);
+       msi_domain_free_irqs(dev->msi.domain, dev);
        ti_sci_inta_msi_free_descs(dev);
 }
 EXPORT_SYMBOL_GPL(ti_sci_inta_msi_domain_free_irqs);

diff --git a/include/linux/device.h b/include/linux/device.h
index 2a22875238a6fc6265ece01bec4b4f7bbadc0a6c..f212b7a7b156a05e540a65dc22ff5c14bb4322b6 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -371,6 +371,16 @@ struct dev_links_info {
        enum dl_dev_state status;
 };
 
+/**
+ * struct dev_msi_info - Device data related to MSI
+ * @domain:    The MSI interrupt domain associated to the device
+ */
+struct dev_msi_info {
+#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
+       struct irq_domain       *domain;
+#endif
+};
+
 /**
  * struct device - The basic device structure
  * @parent:    The device's "parent" device, the device to which it is attached.
@@ -407,8 +417,8 @@ struct dev_links_info {
  * @em_pd:     device's energy model performance domain
  * @pins:      For device pin management.
  *             See Documentation/driver-api/pin-control.rst for details.
+ * @msi:       MSI related data
  * @msi_list:  Hosts MSI descriptors
- * @msi_domain: The generic MSI domain this device is using.
  * @numa_node: NUMA node this device is close to.
  * @dma_ops:    DMA mapping operations for this device.
  * @dma_mask:  Dma mask (if dma'ble device).
@@ -500,12 +510,10 @@ struct device {
        struct em_perf_domain   *em_pd;
 #endif
 
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-       struct irq_domain       *msi_domain;
-#endif
 #ifdef CONFIG_PINCTRL
        struct dev_pin_info     *pins;
 #endif
+       struct dev_msi_info     msi;
 #ifdef CONFIG_GENERIC_MSI_IRQ
        struct list_head        msi_list;
 #endif
@@ -666,7 +674,7 @@ static inline void set_dev_node(struct device *dev, int node)
 static inline struct irq_domain *dev_get_msi_domain(const struct device *dev)
 {
 #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-       return dev->msi_domain;
+       return dev->msi.domain;
 #else
        return NULL;
 #endif
@@ -675,7 +683,7 @@ static inline struct irq_domain *dev_get_msi_domain(const struct device *dev)
 static inline void dev_set_msi_domain(struct device *dev, struct irq_domain *d)
 {
 #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-       dev->msi_domain = d;
+       dev->msi.domain = d;
 #endif
 }