msm: iommu: Don't read from write-only registers
Subsystems (3)
PATCH 1/2 msm: iommu: Don't read from write-only registers
Don't read from V2Pxx command registers when doing iova-to-phys operations. These registers are write-only and reading the value before modifying the VA bits is unnecessary.
Signed-off-by Stepan Moskovchenko <[email protected]>
--- arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h | 28 ------------------------ arch/arm/mach-msm/iommu.c | 2 +- 2 files changed, 1 insertions(+), 29 deletions(-)
arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h +0 -28
@@ -625,20 +625,6 @@ do { \#define SET_INDEX (b, c, v) SET_CONTEXT_FIELD(b, c, V2PSR, INDEX, v) -/* V2Pxx UW UR PW PR */ -#define SET_V2PUW_INDEX (b, c, v) SET_CONTEXT_FIELD(b, c, V2PUW, V2Pxx_INDEX, v) -#define SET_V2PUW_VA (b, c, v) SET_CONTEXT_FIELD(b, c, V2PUW, V2Pxx_VA, v) - -#define SET_V2PUR_INDEX (b, c, v) SET_CONTEXT_FIELD(b, c, V2PUR, V2Pxx_INDEX, v) -#define SET_V2PUR_VA (b, c, v) SET_CONTEXT_FIELD(b, c, V2PUR, V2Pxx_VA, v) - -#define SET_V2PPW_INDEX (b, c, v) SET_CONTEXT_FIELD(b, c, V2PPW, V2Pxx_INDEX, v) -#define SET_V2PPW_VA (b, c, v) SET_CONTEXT_FIELD(b, c, V2PPW, V2Pxx_VA, v) - -#define SET_V2PPR_INDEX (b, c, v) SET_CONTEXT_FIELD(b, c, V2PPR, V2Pxx_INDEX, v) -#define SET_V2PPR_VA (b, c, v) SET_CONTEXT_FIELD(b, c, V2PPR, V2Pxx_VA, v) - -/* Context Register getters */ /* ACTLR */ #define GET_CFERE (b, c) GET_CONTEXT_FIELD(b, c, ACTLR, CFERE)
@@ -826,20 +812,6 @@ do { \#define GET_INDEX (b, c) GET_CONTEXT_FIELD(b, c, V2PSR, INDEX) -/* V2Pxx UW UR PW PR */ -#define GET_V2PUW_INDEX (b, c) GET_CONTEXT_FIELD(b, c, V2PUW, V2Pxx_INDEX) -#define GET_V2PUW_VA (b, c) GET_CONTEXT_FIELD(b, c, V2PUW, V2Pxx_VA) - -#define GET_V2PUR_INDEX (b, c) GET_CONTEXT_FIELD(b, c, V2PUR, V2Pxx_INDEX) -#define GET_V2PUR_VA (b, c) GET_CONTEXT_FIELD(b, c, V2PUR, V2Pxx_VA) - -#define GET_V2PPW_INDEX (b, c) GET_CONTEXT_FIELD(b, c, V2PPW, V2Pxx_INDEX) -#define GET_V2PPW_VA (b, c) GET_CONTEXT_FIELD(b, c, V2PPW, V2Pxx_VA) - -#define GET_V2PPR_INDEX (b, c) GET_CONTEXT_FIELD(b, c, V2PPR, V2Pxx_INDEX) -#define GET_V2PPR_VA (b, c) GET_CONTEXT_FIELD(b, c, V2PPR, V2Pxx_VA) - -/* Global Registers */ #define M2VCBR_N (0xFF000)#define CBACR_N (0xFF800)
arch/arm/mach-msm/iommu.c +1 -1
@@ -579,7 +579,7 @@ static phys_addr_t msm_iommu_iova_to_phys(struct iommu_domain *domain,/* Invalidate context TLB */ SET_CTX_TLBIALL (base, ctx,0 ); -SET_V2PPR_VA (base, ctx, va >> V2Pxx_VA_SHIFT); +SET_V2PPR (base, ctx, va & V2Pxx_VA); par =GET_PAR (base, ctx);
--
Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH 2/2 msm: iommu: Enable HTW L2 redirection on MSM8960
Allow the MSM8960 IOMMU to access its page tables directly through the L2 cache.
Signed-off-by Stepan Moskovchenko <[email protected]>
--- arch/arm/mach-msm/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-msm/Kconfig +1 -1
@@ -162,7 +162,7 @@ config MSM_IOMMU config IOMMU_PGTABLES_L2 def_bool y - depends on ARCH_MSM8X60 && MMU && SMP && CPU_DCACHE_DISABLE=n + depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n config MSM_DEBUG_UART int
--
Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.