Commit f6717d72 authored by Tomasz Figa's avatar Tomasz Figa Committed by Joerg Roedel

iommu/rockchip: Fix error handling in attach

Currently if the driver encounters an error while attaching device, it
will leave the IOMMU in an inconsistent state. Even though it shouldn't
really happen in reality, let's just add proper error path to keep
things consistent.
Signed-off-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d0b912bd
...@@ -824,7 +824,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ...@@ -824,7 +824,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
ret = rk_iommu_force_reset(iommu); ret = rk_iommu_force_reset(iommu);
if (ret) if (ret)
return ret; goto out_disable_stall;
iommu->domain = domain; iommu->domain = domain;
...@@ -837,7 +837,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ...@@ -837,7 +837,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
ret = rk_iommu_enable_paging(iommu); ret = rk_iommu_enable_paging(iommu);
if (ret) if (ret)
return ret; goto out_disable_stall;
spin_lock_irqsave(&rk_domain->iommus_lock, flags); spin_lock_irqsave(&rk_domain->iommus_lock, flags);
list_add_tail(&iommu->node, &rk_domain->iommus); list_add_tail(&iommu->node, &rk_domain->iommus);
...@@ -845,9 +845,9 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ...@@ -845,9 +845,9 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
dev_dbg(dev, "Attached to iommu domain\n"); dev_dbg(dev, "Attached to iommu domain\n");
out_disable_stall:
rk_iommu_disable_stall(iommu); rk_iommu_disable_stall(iommu);
return ret;
return 0;
} }
static void rk_iommu_detach_device(struct iommu_domain *domain, static void rk_iommu_detach_device(struct iommu_domain *domain,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment