iommu/tegra: Constrain return value of ->attach_dev()
Subsystems (3)
PATCH v2 12/13 iommu/tegra: Constrain return value of ->attach_dev()
Ensure attach_dev() callback functions only return errno values expected from the attach_dev() op. In particular, only return -EINVAL when we are sure that the device is incompatible with the domain.
Signed-off-by Nicolin Chen <[email protected]>
--- drivers/iommu/tegra-gart.c | 2 +- drivers/iommu/tegra-smmu.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/iommu/tegra-gart.c +1 -1
@@ -112,7 +112,7 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain,spin_lock (&gart->dom_lock);if (gart->active_domain && gart->active_domain != domain) { - ret = -EBUSY ; + ret = -EINVAL ; }else if (dev_iommu_priv_get (dev) != domain) {dev_iommu_priv_set (dev, domain); gart->active_domain = domain;
drivers/iommu/tegra-smmu.c +4 -2
@@ -432,8 +432,10 @@ static int tegra_smmu_as_prepare(struct tegra_smmu *smmu, } err =tegra_smmu_alloc_asid (smmu, &as->id); -if (err <0 ) +if (err <0 ) { + err = -ENOSPC ; goto err_unmap; + }smmu_flush_ptc (smmu, as->pd_dma,0 );smmu_flush_tlb_asid (smmu, as->id);
@@ -487,7 +489,7 @@ static int tegra_smmu_attach_dev(struct iommu_domain *domain,int err;if (!fwspec) -return -ENOENT ; +return -ENODEV ;for (index =0 ; index < fwspec->num_ids; index++) { err =tegra_smmu_as_prepare (smmu, as);
Signature · 1 line
2.17.1