Merge "iommu: msm: Move location of local iommu halt"

	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);

	}

	__disable_clocks(iommu_drvdata);