Merge tag 'nfs-for-4.8-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / drivers / iommu / arm-smmu.c

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 9345a3fcb706dc00ce0e202ab87f2ddc64078fee..4f49fe29f2029ad0f1fdc4f7015ed0fa13e7c2bf 100644 (file)
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -987,8 +987,8 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
         * handler seeing a half-initialised domain state.
         */
        irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
-       ret = request_irq(irq, arm_smmu_context_fault, IRQF_SHARED,
-                         "arm-smmu-context-fault", domain);
+       ret = devm_request_irq(smmu->dev, irq, arm_smmu_context_fault,
+                              IRQF_SHARED, "arm-smmu-context-fault", domain);
        if (ret < 0) {
                dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n",
                        cfg->irptndx, irq);
@@ -1028,7 +1028,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
 
        if (cfg->irptndx != INVALID_IRPTNDX) {
                irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
-               free_irq(irq, domain);
+               devm_free_irq(smmu->dev, irq, domain);
        }
 
        free_io_pgtable_ops(smmu_domain->pgtbl_ops);
@@ -1986,15 +1986,15 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
        }
 
        for (i = 0; i < smmu->num_global_irqs; ++i) {
-               err = request_irq(smmu->irqs[i],
-                                 arm_smmu_global_fault,
-                                 IRQF_SHARED,
-                                 "arm-smmu global fault",
-                                 smmu);
+               err = devm_request_irq(smmu->dev, smmu->irqs[i],
+                                      arm_smmu_global_fault,
+                                      IRQF_SHARED,
+                                      "arm-smmu global fault",
+                                      smmu);
                if (err) {
                        dev_err(dev, "failed to request global IRQ %d (%u)\n",
                                i, smmu->irqs[i]);
-                       goto out_free_irqs;
+                       goto out_put_masters;
                }
        }
 
@@ -2006,10 +2006,6 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
        arm_smmu_device_reset(smmu);
        return 0;
 
-out_free_irqs:
-       while (i--)
-               free_irq(smmu->irqs[i], smmu);
-
 out_put_masters:
        for (node = rb_first(&smmu->masters); node; node = rb_next(node)) {
                struct arm_smmu_master *master
@@ -2050,7 +2046,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
                dev_err(dev, "removing device with active domains!\n");
 
        for (i = 0; i < smmu->num_global_irqs; ++i)
-               free_irq(smmu->irqs[i], smmu);
+               devm_free_irq(smmu->dev, smmu->irqs[i], smmu);
 
        /* Turn the thing off */
        writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0);
@@ -2096,8 +2092,10 @@ static int __init arm_smmu_init(void)
 #endif
 
 #ifdef CONFIG_PCI
-       if (!iommu_present(&pci_bus_type))
+       if (!iommu_present(&pci_bus_type)) {
+               pci_request_acs();
                bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
+       }
 #endif
 
        return 0;