irqchip: Convert all platform MSI users to the new API

Switch all the users of the platform MSI domain over to invoke the new
interfaces which branch to the original platform MSI functions when the
irqdomain associated to the caller device does not yet provide MSI parent
functionality.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240127161753.114685-7-apatel@ventanamicro.com

diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c
index 1ebfbe88e7335af1f9ba4894e2e2ffa2e85becf2..97ebc791a30bd61af42f347f39e08899bd2c6184 100644 (file)
--- a/drivers/dma/mv_xor_v2.c
+++ b/drivers/dma/mv_xor_v2.c
@@ -747,8 +747,8 @@ static int mv_xor_v2_probe(struct platform_device *pdev)
        if (IS_ERR(xor_dev->clk))
                return PTR_ERR(xor_dev->clk);
 
-       ret = platform_msi_domain_alloc_irqs(&pdev->dev, 1,
-                                            mv_xor_v2_set_msi_msg);
+       ret = platform_device_msi_init_and_alloc_irqs(&pdev->dev, 1,
+                                                     mv_xor_v2_set_msi_msg);
        if (ret)
                return ret;
 
@@ -851,7 +851,7 @@ free_hw_desq:
                          xor_dev->desc_size * MV_XOR_V2_DESC_NUM,
                          xor_dev->hw_desq_virt, xor_dev->hw_desq);
 free_msi_irqs:
-       platform_msi_domain_free_irqs(&pdev->dev);
+       platform_device_msi_free_irqs_all(&pdev->dev);
        return ret;
 }
 
@@ -867,7 +867,7 @@ static void mv_xor_v2_remove(struct platform_device *pdev)
 
        devm_free_irq(&pdev->dev, xor_dev->irq, xor_dev);
 
-       platform_msi_domain_free_irqs(&pdev->dev);
+       platform_device_msi_free_irqs_all(&pdev->dev);
 
        tasklet_kill(&xor_dev->irq_tasklet);
 }

diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index d63b93dc7047643c00b5381df936715bc4c56369..202ac95227cbe8495871cfa0e1114e7a31c558c7 100644 (file)
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -696,7 +696,7 @@ static void hidma_free_msis(struct hidma_dev *dmadev)
                        devm_free_irq(dev, virq, &dmadev->lldev);
        }
 
-       platform_msi_domain_free_irqs(dev);
+       platform_device_msi_free_irqs_all(dev);
 #endif
 }
 
@@ -706,8 +706,8 @@ static int hidma_request_msi(struct hidma_dev *dmadev,
 #ifdef CONFIG_GENERIC_MSI_IRQ
        int rc, i, virq;
 
-       rc = platform_msi_domain_alloc_irqs(&pdev->dev, HIDMA_MSI_INTS,
-                                           hidma_write_msi_msg);
+       rc = platform_device_msi_init_and_alloc_irqs(&pdev->dev, HIDMA_MSI_INTS,
+                                                    hidma_write_msi_msg);
        if (rc)
                return rc;
 

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 0ffb1cf17e0b2e6687b1c5ff12ff87405e2552b6..a74a509bcd630a212e65b82fb27dea9cb5517fa6 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -3125,7 +3125,8 @@ static int arm_smmu_update_gbpa(struct arm_smmu_device *smmu, u32 set, u32 clr)
 static void arm_smmu_free_msis(void *data)
 {
        struct device *dev = data;
-       platform_msi_domain_free_irqs(dev);
+
+       platform_device_msi_free_irqs_all(dev);
 }
 
 static void arm_smmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
@@ -3166,7 +3167,7 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu)
        }
 
        /* Allocate MSIs for evtq, gerror and priq. Ignore cmdq */
-       ret = platform_msi_domain_alloc_irqs(dev, nvec, arm_smmu_write_msi_msg);
+       ret = platform_device_msi_init_and_alloc_irqs(dev, nvec, arm_smmu_write_msi_msg);
        if (ret) {
                dev_warn(dev, "failed to allocate MSIs - falling back to wired irqs\n");
                return;

diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c
index e3e28a4f7d017cc12751c3eb331f0046c8df93ec..b1abc2a0c971a528a64d7d7aec1bcdfcc8822393 100644 (file)
--- a/drivers/mailbox/bcm-flexrm-mailbox.c
+++ b/drivers/mailbox/bcm-flexrm-mailbox.c
@@ -1587,8 +1587,8 @@ static int flexrm_mbox_probe(struct platform_device *pdev)
        }
 
        /* Allocate platform MSIs for each ring */
-       ret = platform_msi_domain_alloc_irqs(dev, mbox->num_rings,
-                                               flexrm_mbox_msi_write);
+       ret = platform_device_msi_init_and_alloc_irqs(dev, mbox->num_rings,
+                                                     flexrm_mbox_msi_write);
        if (ret)
                goto fail_destroy_cmpl_pool;
 
@@ -1641,7 +1641,7 @@ skip_debugfs:
 
 fail_free_debugfs_root:
        debugfs_remove_recursive(mbox->root);
-       platform_msi_domain_free_irqs(dev);
+       platform_device_msi_free_irqs_all(dev);
 fail_destroy_cmpl_pool:
        dma_pool_destroy(mbox->cmpl_pool);
 fail_destroy_bd_pool:
@@ -1657,7 +1657,7 @@ static void flexrm_mbox_remove(struct platform_device *pdev)
 
        debugfs_remove_recursive(mbox->root);
 
-       platform_msi_domain_free_irqs(dev);
+       platform_device_msi_free_irqs_all(dev);
 
        dma_pool_destroy(mbox->cmpl_pool);
        dma_pool_destroy(mbox->bd_pool);

diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index 6303b82566f9811261447ec8035e0e453301da37..9e5d7fa647b6d376e69620eae387383c101cb452 100644 (file)
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -716,7 +716,7 @@ static void smmu_pmu_free_msis(void *data)
 {
        struct device *dev = data;
 
-       platform_msi_domain_free_irqs(dev);
+       platform_device_msi_free_irqs_all(dev);
 }
 
 static void smmu_pmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
@@ -746,7 +746,7 @@ static void smmu_pmu_setup_msi(struct smmu_pmu *pmu)
        if (!(readl(pmu->reg_base + SMMU_PMCG_CFGR) & SMMU_PMCG_CFGR_MSI))
                return;
 
-       ret = platform_msi_domain_alloc_irqs(dev, 1, smmu_pmu_write_msi_msg);
+       ret = platform_device_msi_init_and_alloc_irqs(dev, 1, smmu_pmu_write_msi_msg);
        if (ret) {
                dev_warn(dev, "failed to allocate MSIs\n");
                return;

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 39eef470f8fa5b88b41450aeec8833a619899e34..8fde5204e88b06d1d83a055316064d55126c5de5 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1712,8 +1712,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
         * 2. Poll queues do not need ESI.
         */
        nr_irqs = hba->nr_hw_queues - hba->nr_queues[HCTX_TYPE_POLL];
-       ret = platform_msi_domain_alloc_irqs(hba->dev, nr_irqs,
-                                            ufs_qcom_write_msi_msg);
+       ret = platform_device_msi_init_and_alloc_irqs(hba->dev, nr_irqs,
+                                                     ufs_qcom_write_msi_msg);
        if (ret) {
                dev_err(hba->dev, "Failed to request Platform MSI %d\n", ret);
                return ret;
@@ -1742,7 +1742,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)
                        devm_free_irq(hba->dev, desc->irq, hba);
                }
                msi_unlock_descs(hba->dev);
-               platform_msi_domain_free_irqs(hba->dev);
+               platform_device_msi_free_irqs_all(hba->dev);
        } else {
                if (host->hw_ver.major == 6 && host->hw_ver.minor == 0 &&
                    host->hw_ver.step == 0)
@@ -1818,7 +1818,7 @@ static void ufs_qcom_remove(struct platform_device *pdev)
 
        pm_runtime_get_sync(&(pdev)->dev);
        ufshcd_remove(hba);
-       platform_msi_domain_free_irqs(hba->dev);
+       platform_device_msi_free_irqs_all(hba->dev);
 }
 
 static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = {