From: Will Deacon Date: Wed, 21 Aug 2013 12:56:34 +0000 (+0100) Subject: iommu/arm-smmu: don't enable SMMU device until probing has completed X-Git-Tag: v3.11.5~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c92d069acbd6b7852eee27f062b62d1521efe75b;p=thirdparty%2Fkernel%2Fstable.git iommu/arm-smmu: don't enable SMMU device until probing has completed commit fd90cecbde065eac6ecc3ef38abace725ad27010 upstream. We currently reset and enable the SMMU before the device has finished being probed, so if we fail later on (for example, because we couldn't request a global irq successfully) then we will leave the device in an active state. This patch delays the reset and enabling of the SMMU hardware until probing has completed. Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index a50f951c02598..44e527660dd23 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1839,8 +1839,6 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) goto out_put_parent; } - arm_smmu_device_reset(smmu); - for (i = 0; i < smmu->num_global_irqs; ++i) { err = request_irq(smmu->irqs[i], arm_smmu_global_fault, @@ -1858,6 +1856,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) spin_lock(&arm_smmu_devices_lock); list_add(&smmu->list, &arm_smmu_devices); spin_unlock(&arm_smmu_devices_lock); + + arm_smmu_device_reset(smmu); return 0; out_free_irqs: