From: Alexandru Elisei <alexandru.elisei@arm.com>
To: drjones@redhat.com, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu
Cc: andre.przywara@arm.com
Subject: [kvm-unit-tests PATCH v2 4/6] lib: arm64: Consolidate register definitions to sysreg.h
Date: Mon, 22 Mar 2021 15:06:39 +0000 [thread overview]
Message-ID: <20210322150641.58878-5-alexandru.elisei@arm.com> (raw)
In-Reply-To: <20210322150641.58878-1-alexandru.elisei@arm.com>
Move system register field definitions to sysreg.h, where the opcodes for
system register access are defined, to align ourselves with the Linux
kernel. EL2 support, needed for EFI and nested virtualization testing, will
require additional register and field definions, and having them in the
same place as Linux will make maintenance easier.
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
---
lib/arm64/asm/arch_gicv3.h | 6 ------
lib/arm64/asm/processor.h | 10 ----------
lib/arm64/asm/sysreg.h | 17 +++++++++++++++++
arm/cstart64.S | 2 +-
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/lib/arm64/asm/arch_gicv3.h b/lib/arm64/asm/arch_gicv3.h
index a7994ec2fbbe..fdee4de1f1f6 100644
--- a/lib/arm64/asm/arch_gicv3.h
+++ b/lib/arm64/asm/arch_gicv3.h
@@ -10,12 +10,6 @@
#include <asm/sysreg.h>
-#define ICC_PMR_EL1 sys_reg(3, 0, 4, 6, 0)
-#define ICC_SGI1R_EL1 sys_reg(3, 0, 12, 11, 5)
-#define ICC_IAR1_EL1 sys_reg(3, 0, 12, 12, 0)
-#define ICC_EOIR1_EL1 sys_reg(3, 0, 12, 12, 1)
-#define ICC_GRPEN1_EL1 sys_reg(3, 0, 12, 12, 7)
-
#ifndef __ASSEMBLY__
#include <libcflat.h>
diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h
index cdc2463e1981..4a3d826ab560 100644
--- a/lib/arm64/asm/processor.h
+++ b/lib/arm64/asm/processor.h
@@ -6,16 +6,6 @@
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
-/* System Control Register (SCTLR_EL1) bits */
-#define SCTLR_EL1_EE (1 << 25)
-#define SCTLR_EL1_WXN (1 << 19)
-#define SCTLR_EL1_I (1 << 12)
-#define SCTLR_EL1_SA0 (1 << 4)
-#define SCTLR_EL1_SA (1 << 3)
-#define SCTLR_EL1_C (1 << 2)
-#define SCTLR_EL1_A (1 << 1)
-#define SCTLR_EL1_M (1 << 0)
-
#ifndef __ASSEMBLY__
#include <asm/ptrace.h>
#include <asm/esr.h>
diff --git a/lib/arm64/asm/sysreg.h b/lib/arm64/asm/sysreg.h
index 378bf7ebb3b5..9d6b4fc66936 100644
--- a/lib/arm64/asm/sysreg.h
+++ b/lib/arm64/asm/sysreg.h
@@ -70,4 +70,21 @@ asm(
" .endm\n"
);
#endif /* __ASSEMBLY__ */
+
+#define ICC_PMR_EL1 sys_reg(3, 0, 4, 6, 0)
+#define ICC_SGI1R_EL1 sys_reg(3, 0, 12, 11, 5)
+#define ICC_IAR1_EL1 sys_reg(3, 0, 12, 12, 0)
+#define ICC_EOIR1_EL1 sys_reg(3, 0, 12, 12, 1)
+#define ICC_GRPEN1_EL1 sys_reg(3, 0, 12, 12, 7)
+
+/* System Control Register (SCTLR_EL1) bits */
+#define SCTLR_EL1_EE (1 << 25)
+#define SCTLR_EL1_WXN (1 << 19)
+#define SCTLR_EL1_I (1 << 12)
+#define SCTLR_EL1_SA0 (1 << 4)
+#define SCTLR_EL1_SA (1 << 3)
+#define SCTLR_EL1_C (1 << 2)
+#define SCTLR_EL1_A (1 << 1)
+#define SCTLR_EL1_M (1 << 0)
+
#endif /* _ASMARM64_SYSREG_H_ */
diff --git a/arm/cstart64.S b/arm/cstart64.S
index c1deff842f03..f6c5d2ebccf3 100644
--- a/arm/cstart64.S
+++ b/arm/cstart64.S
@@ -10,9 +10,9 @@
#include <asm/asm-offsets.h>
#include <asm/assembler.h>
#include <asm/ptrace.h>
-#include <asm/processor.h>
#include <asm/page.h>
#include <asm/pgtable-hwdef.h>
+#include <asm/sysreg.h>
.section .init
--
2.31.0
next prev parent reply other threads:[~2021-03-22 15:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 15:06 [kvm-unit-tests PATCH v2 0/6] Misc assembly fixes and cleanups Alexandru Elisei
2021-03-22 15:06 ` [kvm-unit-tests PATCH v2 1/6] arm64: Remove unnecessary ISB when writing to SPSel Alexandru Elisei
2021-03-22 15:06 ` [kvm-unit-tests PATCH v2 2/6] arm/arm64: Remove dcache_line_size global variable Alexandru Elisei
2021-03-23 16:32 ` Andre Przywara
2021-03-22 15:06 ` [kvm-unit-tests PATCH v2 3/6] arm/arm64: Remove unnecessary ISB when doing dcache maintenance Alexandru Elisei
2021-03-22 15:06 ` Alexandru Elisei [this message]
2021-03-22 15:06 ` [kvm-unit-tests PATCH v2 5/6] arm64: Configure SCTLR_EL1 at boot Alexandru Elisei
2021-03-22 15:06 ` [kvm-unit-tests PATCH v2 6/6] arm64: Disable TTBR1_EL1 translation table walks Alexandru Elisei
2021-03-25 15:31 ` [kvm-unit-tests PATCH v2 0/6] Misc assembly fixes and cleanups Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322150641.58878-5-alexandru.elisei@arm.com \
--to=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=drjones@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).