UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Stepan Moskovchenko 2011-02-24 18:00:41 -08:00 committed by David Brown
parent b61401adf3
commit 2e8c8ba983
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. /* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -68,6 +68,7 @@ do { \
#define FL_CACHEABLE (1 << 3) #define FL_CACHEABLE (1 << 3)
#define FL_TEX0 (1 << 12) #define FL_TEX0 (1 << 12)
#define FL_OFFSET(va) (((va) & 0xFFF00000) >> 20) #define FL_OFFSET(va) (((va) & 0xFFF00000) >> 20)
#define FL_NG (1 << 17)
/* Second-level page table bits */ /* Second-level page table bits */
#define SL_BASE_MASK_LARGE 0xFFFF0000 #define SL_BASE_MASK_LARGE 0xFFFF0000
@ -81,6 +82,7 @@ do { \
#define SL_CACHEABLE (1 << 3) #define SL_CACHEABLE (1 << 3)
#define SL_TEX0 (1 << 6) #define SL_TEX0 (1 << 6)
#define SL_OFFSET(va) (((va) & 0xFF000) >> 12) #define SL_OFFSET(va) (((va) & 0xFF000) >> 12)
#define SL_NG (1 << 11)
/* Memory type and cache policy attributes */ /* Memory type and cache policy attributes */
#define MT_SO 0 #define MT_SO 0

9
arch/arm/mach-msm/iommu.c
View File

@ -137,7 +137,6 @@ static void __reset_context(void __iomem *base, int ctx)
SET_TLBLKCR(base, ctx, 0); SET_TLBLKCR(base, ctx, 0);
SET_PRRR(base, ctx, 0); SET_PRRR(base, ctx, 0);
SET_NMRR(base, ctx, 0); SET_NMRR(base, ctx, 0);
SET_CONTEXTIDR(base, ctx, 0);
} }
static void __program_context(void __iomem *base, int ctx, phys_addr_t pgtable) static void __program_context(void __iomem *base, int ctx, phys_addr_t pgtable)
@ -418,11 +417,11 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
*(fl_pte+i) = (pa & 0xFF000000) | FL_SUPERSECTION | *(fl_pte+i) = (pa & 0xFF000000) | FL_SUPERSECTION |
FL_AP_READ | FL_AP_WRITE | FL_TYPE_SECT | FL_AP_READ | FL_AP_WRITE | FL_TYPE_SECT |
FL_SHARED | pgprot; FL_SHARED | FL_NG | pgprot;
} }
if (len == SZ_1M) if (len == SZ_1M)
*fl_pte = (pa & 0xFFF00000) | FL_AP_READ | FL_AP_WRITE | *fl_pte = (pa & 0xFFF00000) | FL_AP_READ | FL_AP_WRITE | FL_NG |
FL_TYPE_SECT | FL_SHARED | pgprot; FL_TYPE_SECT | FL_SHARED | pgprot;
/* Need a 2nd level table */ /* Need a 2nd level table */
@ -447,7 +446,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,
if (len == SZ_4K) if (len == SZ_4K)
*sl_pte = (pa & SL_BASE_MASK_SMALL) | SL_AP0 | SL_AP1 | *sl_pte = (pa & SL_BASE_MASK_SMALL) | SL_AP0 | SL_AP1 | SL_NG |
SL_SHARED | SL_TYPE_SMALL | pgprot; SL_SHARED | SL_TYPE_SMALL | pgprot;
if (len == SZ_64K) { if (len == SZ_64K) {
@ -455,7 +454,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va,
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
*(sl_pte+i) = (pa & SL_BASE_MASK_LARGE) | SL_AP0 | *(sl_pte+i) = (pa & SL_BASE_MASK_LARGE) | SL_AP0 |
SL_AP1 | SL_SHARED | SL_TYPE_LARGE | pgprot; SL_NG | SL_AP1 | SL_SHARED | SL_TYPE_LARGE | pgprot;
} }
ret = __flush_iotlb(domain); ret = __flush_iotlb(domain);

11
arch/arm/mach-msm/iommu_dev.c
View File

@ -330,14 +330,17 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev)
SET_M2VCBR_N(drvdata->base, mid, 0); SET_M2VCBR_N(drvdata->base, mid, 0);
SET_CBACR_N(drvdata->base, c->num, 0); SET_CBACR_N(drvdata->base, c->num, 0);
/* Set VMID = MID */ /* Set VMID = 0 */
SET_VMID(drvdata->base, mid, mid); SET_VMID(drvdata->base, mid, 0);
/* Set the context number for that MID to this context */ /* Set the context number for that MID to this context */
SET_CBNDX(drvdata->base, mid, c->num); SET_CBNDX(drvdata->base, mid, c->num);
/* Set MID associated with this context bank */ /* Set MID associated with this context bank to 0*/
SET_CBVMID(drvdata->base, c->num, mid); 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 security bit override to be Non-secure */
SET_NSCFG(drvdata->base, mid, 3); SET_NSCFG(drvdata->base, mid, 3);