diff options
| author | Stepan Moskovchenko <stepanm@codeaurora.org> | 2011-02-24 18:00:41 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-03-08 14:40:58 -0800 |
| commit | 2e8c8ba98376459e73d03a285f5d3406b630ea2d (patch) | |
| tree | 774f957b4aab21d8799f9d42d761eb7b1f624ba8 /arch/arm/mach-msm/iommu_dev.c | |
| parent | b61401adf38f56dbfdac91f31425edf60595ed30 (diff) | |
| download | talos-op-linux-2e8c8ba98376459e73d03a285f5d3406b630ea2d.tar.gz talos-op-linux-2e8c8ba98376459e73d03a285f5d3406b630ea2d.zip | |
msm: iommu: Use ASID tagging instead of VMID tagging
Use ASID tags in the TLB instead of VMID tags in
preparation for changes to the secure environment.
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/iommu_dev.c')
| -rw-r--r-- | arch/arm/mach-msm/iommu_dev.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/iommu_dev.c b/arch/arm/mach-msm/iommu_dev.c index 79ade0b3b326..0e240c9d6e71 100644 --- a/arch/arm/mach-msm/iommu_dev.c +++ b/arch/arm/mach-msm/iommu_dev.c @@ -330,14 +330,17 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) SET_M2VCBR_N(drvdata->base, mid, 0); SET_CBACR_N(drvdata->base, c->num, 0); - /* Set VMID = MID */ - SET_VMID(drvdata->base, mid, mid); + /* Set VMID = 0 */ + SET_VMID(drvdata->base, mid, 0); /* Set the context number for that MID to this context */ SET_CBNDX(drvdata->base, mid, c->num); - /* Set MID associated with this context bank */ - SET_CBVMID(drvdata->base, c->num, mid); + /* Set MID associated with this context bank to 0*/ + SET_CBVMID(drvdata->base, c->num, 0); + + /* Set the ASID for TLB tagging for this context */ + SET_CONTEXTIDR_ASID(drvdata->base, c->num, c->num); /* Set security bit override to be Non-secure */ SET_NSCFG(drvdata->base, mid, 3); |
