From: Jan Kiszka <[email protected]>

Misplaced, they SMMUv1-specific.

Signed-off-by: Jan Kiszka <[email protected]>
---
 hypervisor/arch/arm64/include/asm/sysregs.h | 7 -------
 hypervisor/arch/arm64/smmu.c                | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hypervisor/arch/arm64/include/asm/sysregs.h 
b/hypervisor/arch/arm64/include/asm/sysregs.h
index ab813809..868ef887 100644
--- a/hypervisor/arch/arm64/include/asm/sysregs.h
+++ b/hypervisor/arch/arm64/include/asm/sysregs.h
@@ -183,11 +183,4 @@
 
 #endif /* __ASSEMBLY__ */
 
-/* Context Bank Index */
-#define S2CR_CBNDX(s2cr)               SET_FIELD((s2cr), 7, 0)
-/*  Register type */
-#define S2CR_TYPE(s2cr)                        SET_FIELD((s2cr), 17, 16)
-/* Privileged Attribute Configuration */
-#define S2CR_PRIVCFG(s2cr)             SET_FIELD((s2cr), 25, 24)
-
 #endif
diff --git a/hypervisor/arch/arm64/smmu.c b/hypervisor/arch/arm64/smmu.c
index d63f91cc..0fa3b0ca 100644
--- a/hypervisor/arch/arm64/smmu.c
+++ b/hypervisor/arch/arm64/smmu.c
@@ -208,6 +208,13 @@ enum arm_smmu_s2cr_type {
        .type = S2CR_TYPE_FAULT,                \
 }
 
+/* Context Bank Index */
+#define S2CR_CBNDX(s2cr)               SET_FIELD((s2cr), 7, 0)
+/*  Register type */
+#define S2CR_TYPE(s2cr)                        SET_FIELD((s2cr), 17, 16)
+/* Privileged Attribute Configuration */
+#define S2CR_PRIVCFG(s2cr)             SET_FIELD((s2cr), 25, 24)
+
 enum arm_smmu_s2cr_privcfg {
        S2CR_PRIVCFG_DEFAULT,
        S2CR_PRIVCFG_DIPAN,
-- 
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/1ac4c4aa05ae925a87ad07f259c86157d94277dd.1601838005.git.jan.kiszka%40siemens.com.

Reply via email to