From: Jan Kiszka <[email protected]> No need to duplicate them in the arm/arm64 specific headers.
Signed-off-by: Jan Kiszka <[email protected]> --- .../arch/arm-common/include/asm/processor.h | 34 +++++++++++++++++++ hypervisor/arch/arm/include/asm/processor.h | 31 ++++------------- hypervisor/arch/arm64/include/asm/processor.h | 31 ++++------------- 3 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 hypervisor/arch/arm-common/include/asm/processor.h diff --git a/hypervisor/arch/arm-common/include/asm/processor.h b/hypervisor/arch/arm-common/include/asm/processor.h new file mode 100644 index 00000000..710bf197 --- /dev/null +++ b/hypervisor/arch/arm-common/include/asm/processor.h @@ -0,0 +1,34 @@ +/* + * Jailhouse, a Linux-based partitioning hypervisor + * + * Copyright (c) Siemens AG, 2013-2020 + * + * Authors: + * Jan Kiszka <[email protected]> + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#define dmb(domain) asm volatile("dmb " #domain ::: "memory") +#define dsb(domain) asm volatile("dsb " #domain ::: "memory") +#define isb() asm volatile("isb") + +#ifndef __ASSEMBLY__ + +static inline void cpu_relax(void) +{ + asm volatile("" : : : "memory"); +} + +static inline void memory_barrier(void) +{ + dmb(ish); +} + +static inline void memory_load_barrier(void) +{ + dmb(ish); +} + +#endif /* !__ASSEMBLY__ */ diff --git a/hypervisor/arch/arm/include/asm/processor.h b/hypervisor/arch/arm/include/asm/processor.h index 79b66f39..cd7c5589 100644 --- a/hypervisor/arch/arm/include/asm/processor.h +++ b/hypervisor/arch/arm/include/asm/processor.h @@ -14,9 +14,11 @@ #define _JAILHOUSE_ASM_PROCESSOR_H #include <jailhouse/types.h> -#include <jailhouse/utils.h> #include <asm/sysregs.h> +/* also include from arm-common */ +#include_next <asm/processor.h> + #define EXIT_REASON_UNDEF 0x1 #define EXIT_REASON_HVC 0x2 #define EXIT_REASON_PABT 0x3 @@ -27,6 +29,10 @@ #define NUM_USR_REGS 14 +#define ARM_PARKING_CODE \ + 0xe320f003, /* 1: wfi */ \ + 0xeafffffd, /* b 1b */ + #ifndef __ASSEMBLY__ union registers { @@ -37,29 +43,6 @@ union registers { }; }; -#define ARM_PARKING_CODE \ - 0xe320f003, /* 1: wfi */ \ - 0xeafffffd, /* b 1b */ - -#define dmb(domain) asm volatile("dmb " #domain ::: "memory") -#define dsb(domain) asm volatile("dsb " #domain ::: "memory") -#define isb() asm volatile("isb") - -static inline void cpu_relax(void) -{ - asm volatile("" : : : "memory"); -} - -static inline void memory_barrier(void) -{ - dmb(ish); -} - -static inline void memory_load_barrier(void) -{ - dmb(ish); -} - static inline bool is_el2(void) { u32 psr; diff --git a/hypervisor/arch/arm64/include/asm/processor.h b/hypervisor/arch/arm64/include/asm/processor.h index b52782b7..312214b3 100644 --- a/hypervisor/arch/arm64/include/asm/processor.h +++ b/hypervisor/arch/arm64/include/asm/processor.h @@ -14,10 +14,16 @@ #define _JAILHOUSE_ASM_PROCESSOR_H #include <jailhouse/types.h> -#include <jailhouse/utils.h> + +/* also include from arm-common */ +#include_next <asm/processor.h> #define NUM_USR_REGS 31 +#define ARM_PARKING_CODE \ + 0xd503207f, /* 1: wfi */ \ + 0x17ffffff, /* b 1b */ + #ifndef __ASSEMBLY__ union registers { @@ -32,29 +38,6 @@ union registers { }; }; -#define ARM_PARKING_CODE \ - 0xd503207f, /* 1: wfi */ \ - 0x17ffffff, /* b 1b */ - -#define dmb(domain) asm volatile("dmb " #domain "\n" : : : "memory") -#define dsb(domain) asm volatile("dsb " #domain "\n" : : : "memory") -#define isb() asm volatile("isb\n") - -static inline void cpu_relax(void) -{ - asm volatile("" : : : "memory"); -} - -static inline void memory_barrier(void) -{ - dmb(ish); -} - -static inline void memory_load_barrier(void) -{ - dmb(ish); -} - #endif /* !__ASSEMBLY__ */ #endif /* !_JAILHOUSE_ASM_PROCESSOR_H */ -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/eb8343dfc7e3340a67d8ec735d02ded7ef5a6ead.1601360827.git.jan.kiszka%40web.de.
