Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[mirror_ubuntu-artful-kernel.git] / arch / arm64 / include / asm / esr.h

diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
index 70522450ca2342a66b3ec27167bb94e08590f6d1..77eeb2cc648fd79d28cfc452c7373b6ebe04071b 100644 (file)
--- a/arch/arm64/include/asm/esr.h
+++ b/arch/arm64/include/asm/esr.h
@@ -18,6 +18,8 @@
 #ifndef __ASM_ESR_H
 #define __ASM_ESR_H
 
+#include <asm/memory.h>
+
 #define ESR_ELx_EC_UNKNOWN     (0x00)
 #define ESR_ELx_EC_WFx         (0x01)
 /* Unallocated EC: 0x02 */
@@ -99,6 +101,13 @@
 #define ESR_ELx_WFx_ISS_WFE    (UL(1) << 0)
 #define ESR_ELx_xVC_IMM_MASK   ((1UL << 16) - 1)
 
+/* ESR value templates for specific events */
+
+/* BRK instruction trap from AArch64 state */
+#define ESR_ELx_VAL_BRK64(imm)                                 \
+       ((ESR_ELx_EC_BRK64 << ESR_ELx_EC_SHIFT) | ESR_ELx_IL |  \
+        ((imm) & 0xffff))
+
 #ifndef __ASSEMBLY__
 #include <asm/types.h>