aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/esr.h
diff options
context:
space:
mode:
authorRobin Murphy <robin.murphy@arm.com>2017-07-25 11:55:41 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2017-08-09 11:00:43 +0100
commite1bc5d1b8e0547c258e65dd97a03560f4d69e635 (patch)
tree421aea530d18c65528ece256b0789dc3b05aa2e1 /arch/arm64/include/asm/esr.h
parentarm64: Expose DC CVAP to userspace (diff)
downloadlinux-dev-e1bc5d1b8e0547c258e65dd97a03560f4d69e635.tar.xz
linux-dev-e1bc5d1b8e0547c258e65dd97a03560f4d69e635.zip
arm64: Handle trapped DC CVAP
Cache clean to PoP is subject to the same access controls as to PoC, so if we are trapping userspace cache maintenance with SCTLR_EL1.UCI, we need to be prepared to handle it. To avoid getting into complicated fights with binutils about ARMv8.2 options, we'll just cheat and use the raw SYS instruction rather than the 'proper' DC alias. Reviewed-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to '')
-rw-r--r--arch/arm64/include/asm/esr.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
index 130b5343ba6d..66ed8b6b9976 100644
--- a/arch/arm64/include/asm/esr.h
+++ b/arch/arm64/include/asm/esr.h
@@ -169,9 +169,10 @@
/*
* User space cache operations have the following sysreg encoding
* in System instructions.
- * op0=1, op1=3, op2=1, crn=7, crm={ 5, 10, 11, 14 }, WRITE (L=0)
+ * op0=1, op1=3, op2=1, crn=7, crm={ 5, 10, 11, 12, 14 }, WRITE (L=0)
*/
#define ESR_ELx_SYS64_ISS_CRM_DC_CIVAC 14
+#define ESR_ELx_SYS64_ISS_CRM_DC_CVAP 12
#define ESR_ELx_SYS64_ISS_CRM_DC_CVAU 11
#define ESR_ELx_SYS64_ISS_CRM_DC_CVAC 10
#define ESR_ELx_SYS64_ISS_CRM_IC_IVAU 5