diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-03-28 00:14:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-03-28 00:14:36 -0700 |
| commit | eb04df33c5cf42e5d4cfdfcc7435c5f0e1147232 (patch) | |
| tree | 6212bbee53a435375d26a78b0280986fd6c0365f /drivers/iommu | |
| parent | 299069290fabe11bad314df990503f52d7915387 (diff) | |
| parent | 8e15c568069246e3715d835998b9a46adb129754 (diff) | |
Merge "iommu: msm: Move location of local iommu halt"
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/msm_iommu-v1.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/iommu/msm_iommu-v1.c b/drivers/iommu/msm_iommu-v1.c index 7f1f7bcd0e73..81fb615feead 100644 --- a/drivers/iommu/msm_iommu-v1.c +++ b/drivers/iommu/msm_iommu-v1.c @@ -899,16 +899,15 @@ static void msm_iommu_detach_dev(struct iommu_domain *domain, iommu_drvdata->asid[ctx_drvdata->asid - 1]--; ctx_drvdata->asid = -1; - iommu_halt(iommu_drvdata); - __reset_context(iommu_drvdata->cb_base, ctx_drvdata->num); /* * Only reset the M2V tables on the very last detach */ - if (!is_secure && iommu_drvdata->ctx_attach_count == 1) + if (!is_secure && iommu_drvdata->ctx_attach_count == 1) { + iommu_halt(iommu_drvdata); __release_smg(iommu_drvdata->base); - - iommu_resume(iommu_drvdata); + iommu_resume(iommu_drvdata); + } __disable_clocks(iommu_drvdata); |