diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-02-22 08:57:44 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-02-22 12:14:51 +0000 |
| commit | dac84b66cc9adfdf7231f4c433553cc95db30930 (patch) | |
| tree | 52c088ee32d1c7ce60d8c6826aafc41348353192 /xen/include/public | |
| parent | da299e00cea39299ccab55d0b56a498d1b6f7c7b (diff) | |
| download | xen-dac84b66cc9adfdf7231f4c433553cc95db30930.tar.gz xen-dac84b66cc9adfdf7231f4c433553cc95db30930.tar.bz2 xen-dac84b66cc9adfdf7231f4c433553cc95db30930.zip | |
xen: arm64: initial build + config changes, start of day code
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Diffstat (limited to 'xen/include/public')
| -rw-r--r-- | xen/include/public/arch-arm.h | 14 | ||||
| -rw-r--r-- | xen/include/public/hvm/save.h | 2 | ||||
| -rw-r--r-- | xen/include/public/xen.h | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6ae10093fd..5306f7989f 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -172,6 +172,8 @@ typedef uint64_t xen_callback_t; /* 0-4: Mode */ #define PSR_MODE_MASK 0x1f + +/* 32 bit modes */ #define PSR_MODE_USR 0x10 #define PSR_MODE_FIQ 0x11 #define PSR_MODE_IRQ 0x12 @@ -182,6 +184,18 @@ typedef uint64_t xen_callback_t; #define PSR_MODE_UND 0x1b #define PSR_MODE_SYS 0x1f +/* 64 bit modes */ +#ifdef CONFIG_ARM_64 +#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ +#define PSR_MODE_EL3h 0x0d +#define PSR_MODE_EL3t 0x0c +#define PSR_MODE_EL2h 0x09 +#define PSR_MODE_EL2t 0x08 +#define PSR_MODE_EL1h 0x05 +#define PSR_MODE_EL1t 0x04 +#define PSR_MODE_EL0t 0x00 +#endif + #define PSR_THUMB (1<<5) /* Thumb Mode enable */ #define PSR_FIQ_MASK (1<<6) /* Fast Interrupt mask */ #define PSR_IRQ_MASK (1<<7) /* Interrupt mask */ diff --git a/xen/include/public/hvm/save.h b/xen/include/public/hvm/save.h index 5538d8e2ae..cc8b5fdce7 100644 --- a/xen/include/public/hvm/save.h +++ b/xen/include/public/hvm/save.h @@ -102,7 +102,7 @@ DECLARE_HVM_SAVE_TYPE(END, 0, struct hvm_save_end); #if defined(__i386__) || defined(__x86_64__) #include "../arch-x86/hvm/save.h" -#elif defined(__arm__) +#elif defined(__arm__) || defined(__aarch64__) #include "../arch-arm/hvm/save.h" #else #error "unsupported architecture" diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index c4d08d65d2..e9431e2c0b 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -31,7 +31,7 @@ #if defined(__i386__) || defined(__x86_64__) #include "arch-x86/xen.h" -#elif defined(__arm__) +#elif defined(__arm__) || defined (__aarch64__) #include "arch-arm.h" #else #error "Unsupported architecture" |