From: Michal Orzel <michal.orzel@arm.com>
To: xen-devel@lists.xenproject.org
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Julien Grall <julien@xen.org>,
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>,
bertrand.marquis@arm.com
Subject: [PATCH 1/9] arm64/vfp: Get rid of READ/WRITE_SYSREG32
Date: Tue, 20 Apr 2021 09:08:45 +0200 [thread overview]
Message-ID: <20210420070853.8918-2-michal.orzel@arm.com> (raw)
In-Reply-To: <20210420070853.8918-1-michal.orzel@arm.com>
AArch64 system registers are 64bit whereas AArch32 ones
are 32bit or 64bit. MSR/MRS are expecting 64bit values thus
we should get rid of helpers READ/WRITE_SYSREG32
in favour of using READ/WRITE_SYSREG.
We should also use register_t type when reading sysregs
which can correspond to uint64_t or uint32_t.
Even though many AArch64 sysregs have upper 32bit reserved
it does not mean that they can't be widen in the future.
Modify type of FPCR, FPSR, FPEXC32_EL2 to register_t.
Signed-off-by: Michal Orzel <michal.orzel@arm.com>
---
xen/arch/arm/arm64/vfp.c | 12 ++++++------
xen/include/asm-arm/arm64/vfp.h | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c
index 999a0d58a5..47885e76ba 100644
--- a/xen/arch/arm/arm64/vfp.c
+++ b/xen/arch/arm/arm64/vfp.c
@@ -26,10 +26,10 @@ void vfp_save_state(struct vcpu *v)
"stp q30, q31, [%1, #16 * 30]\n\t"
: "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs));
- v->arch.vfp.fpsr = READ_SYSREG32(FPSR);
- v->arch.vfp.fpcr = READ_SYSREG32(FPCR);
+ v->arch.vfp.fpsr = READ_SYSREG(FPSR);
+ v->arch.vfp.fpcr = READ_SYSREG(FPCR);
if ( is_32bit_domain(v->domain) )
- v->arch.vfp.fpexc32_el2 = READ_SYSREG32(FPEXC32_EL2);
+ v->arch.vfp.fpexc32_el2 = READ_SYSREG(FPEXC32_EL2);
}
void vfp_restore_state(struct vcpu *v)
@@ -55,8 +55,8 @@ void vfp_restore_state(struct vcpu *v)
"ldp q30, q31, [%1, #16 * 30]\n\t"
: : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs));
- WRITE_SYSREG32(v->arch.vfp.fpsr, FPSR);
- WRITE_SYSREG32(v->arch.vfp.fpcr, FPCR);
+ WRITE_SYSREG(v->arch.vfp.fpsr, FPSR);
+ WRITE_SYSREG(v->arch.vfp.fpcr, FPCR);
if ( is_32bit_domain(v->domain) )
- WRITE_SYSREG32(v->arch.vfp.fpexc32_el2, FPEXC32_EL2);
+ WRITE_SYSREG(v->arch.vfp.fpexc32_el2, FPEXC32_EL2);
}
diff --git a/xen/include/asm-arm/arm64/vfp.h b/xen/include/asm-arm/arm64/vfp.h
index 6ab5d36c6c..e6e8c363bc 100644
--- a/xen/include/asm-arm/arm64/vfp.h
+++ b/xen/include/asm-arm/arm64/vfp.h
@@ -7,9 +7,9 @@
struct vfp_state
{
uint64_t fpregs[64] __vfp_aligned;
- uint32_t fpcr;
- uint32_t fpexc32_el2;
- uint32_t fpsr;
+ register_t fpcr;
+ register_t fpexc32_el2;
+ register_t fpsr;
};
#endif /* _ARM_ARM64_VFP_H */
--
2.29.0
next prev parent reply other threads:[~2021-04-20 7:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 7:08 [PATCH 0/9] xen/arm64: Get rid of READ/WRITE_SYSREG32 Michal Orzel
2021-04-20 7:08 ` Michal Orzel [this message]
2021-04-20 13:04 ` [PATCH 1/9] arm64/vfp: " Julien Grall
2021-04-20 7:08 ` [PATCH 2/9] arm/domain: " Michal Orzel
2021-04-20 13:12 ` Julien Grall
2021-04-21 7:36 ` Michal Orzel
2021-04-21 10:20 ` Julien Grall
2021-04-20 7:08 ` [PATCH 3/9] arm/gic: " Michal Orzel
2021-04-20 13:28 ` Julien Grall
2021-04-21 7:48 ` Michal Orzel
2021-04-21 10:21 ` Julien Grall
2021-04-20 7:08 ` [PATCH 4/9] arm/p2m: " Michal Orzel
2021-04-20 13:31 ` Julien Grall
2021-04-20 7:08 ` [PATCH 5/9] arm/mm: " Michal Orzel
2021-04-20 13:37 ` Julien Grall
2021-04-22 11:47 ` Michal Orzel
2021-04-22 13:40 ` Julien Grall
2021-04-20 7:08 ` [PATCH 6/9] arm/page: " Michal Orzel
2021-04-21 15:11 ` Julien Grall
2021-04-20 7:08 ` [PATCH 7/9] arm/time,vtimer: " Michal Orzel
2021-04-21 16:01 ` Julien Grall
2021-04-20 7:08 ` [PATCH 8/9] arm: Change type of hsr to register_t Michal Orzel
2021-04-21 19:02 ` Julien Grall
2021-04-20 7:08 ` [PATCH 9/9] xen/arm64: Remove READ/WRITE_SYSREG32 helper macros Michal Orzel
2021-04-21 19:16 ` Julien Grall
2021-04-27 7:16 ` Michal Orzel
2021-04-27 8:30 ` Julien Grall
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=20210420070853.8918-2-michal.orzel@arm.com \
--to=michal.orzel@arm.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=bertrand.marquis@arm.com \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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).