diff options
| author | Ryo Kataoka <ryo.kataoka.wt@renesas.com> | 2019-05-20 11:07:17 +0900 |
|---|---|---|
| committer | Ryo Kataoka <ryo.kataoka.wt@renesas.com> | 2019-05-20 11:07:17 +0900 |
| commit | 2665f215c36dcd6f8d3d0e3ef2d93c0b1982c98f (patch) | |
| tree | 53ba8d5ac96066cee570da9b5d82cf860810e97b | |
| parent | 1e1a7e99eac8308b5f4914dc454a94344c378a1e (diff) | |
| parent | 5c07e6431ec500fbc115a27207f7e7a2210576b6 (diff) | |
| download | renesas-bsp-v4.14.75-ltsi/rcar-3.9.5.rc2.tar.gz | |
Merge branch 'rcar-3.9.4/iommu-ipmmu-vmsa.rc1' into v4.14.75-ltsi/rcar-3.9.5rcar-3.9.5.rc2v4.14.75-ltsi/rcar-3.9.5.rc2
* rcar-3.9.4/iommu-ipmmu-vmsa.rc1:
iommu/ipmmu-vmsa: Remove cache snoop transaction for page table walk request
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index e1aabb7295a400..21020b36fe6255 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -763,8 +763,8 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) /* * TTBCR - * We use long descriptors with inner-shareable WBWA tables and allocate - * the whole 32-bit VA space to TTBR0. + * We use long descriptors and allocate the whole 32-bit VA space to + * TTBR0. */ if (domain->mmu->features->twobit_imttbcr_sl0) tmp = IMTTBCR_SL0_TWOBIT_LVL_1; @@ -773,8 +773,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) ipmmu_ctx_write_root(domain, IMTTBCR, ipmmu_ctx_read_root(domain, IMTTBCR) | - IMTTBCR_EAE | IMTTBCR_SH0_INNER_SHAREABLE | - IMTTBCR_ORGN0_WB_WA | IMTTBCR_IRGN0_WB_WA | tmp); + IMTTBCR_EAE | tmp); /* MAIR0 */ ipmmu_ctx_write_root(domain, IMMAIR0, |