From: Gavin Shan <gshan@redhat.com>
To: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org, maz@kernel.org, will@kernel.org,
pbonzini@redhat.com, james.morse@arm.com, mark.rutland@arm.com,
Jonathan.Cameron@huawei.com, shan.gavin@gmail.com
Subject: [PATCH v3 01/21] KVM: arm64: Introduce template for inline functions
Date: Fri, 7 May 2021 16:31:04 +0800 [thread overview]
Message-ID: <20210507083124.43347-2-gshan@redhat.com> (raw)
In-Reply-To: <20210507083124.43347-1-gshan@redhat.com>
The inline functions used to get the SMCCC parameters have same
layout. It means the logical functionality can be presented by
a template, to make the code simplified. Besides, this adds more
similar inline functions like smccc_get_arg{4,5,6,7,8}() to visit
more SMCCC arguments, which are required by SDEI virtualization
support.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
include/kvm/arm_hypercalls.h | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/include/kvm/arm_hypercalls.h b/include/kvm/arm_hypercalls.h
index 0e2509d27910..1120eff7aa28 100644
--- a/include/kvm/arm_hypercalls.h
+++ b/include/kvm/arm_hypercalls.h
@@ -6,27 +6,21 @@
#include <asm/kvm_emulate.h>
-int kvm_hvc_call_handler(struct kvm_vcpu *vcpu);
-
-static inline u32 smccc_get_function(struct kvm_vcpu *vcpu)
-{
- return vcpu_get_reg(vcpu, 0);
+#define SMCCC_DECLARE_GET_FUNCTION(type, name, reg) \
+static inline type smccc_get_##name(struct kvm_vcpu *vcpu) \
+{ \
+ return vcpu_get_reg(vcpu, (reg)); \
}
-static inline unsigned long smccc_get_arg1(struct kvm_vcpu *vcpu)
-{
- return vcpu_get_reg(vcpu, 1);
-}
-
-static inline unsigned long smccc_get_arg2(struct kvm_vcpu *vcpu)
-{
- return vcpu_get_reg(vcpu, 2);
-}
-
-static inline unsigned long smccc_get_arg3(struct kvm_vcpu *vcpu)
-{
- return vcpu_get_reg(vcpu, 3);
-}
+SMCCC_DECLARE_GET_FUNCTION(u32, function, 0)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg1, 1)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg2, 2)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg3, 3)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg4, 4)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg5, 5)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg6, 6)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg7, 7)
+SMCCC_DECLARE_GET_FUNCTION(unsigned long, arg8, 8)
static inline void smccc_set_retval(struct kvm_vcpu *vcpu,
unsigned long a0,
@@ -40,4 +34,6 @@ static inline void smccc_set_retval(struct kvm_vcpu *vcpu,
vcpu_set_reg(vcpu, 3, a3);
}
+int kvm_hvc_call_handler(struct kvm_vcpu *vcpu);
+
#endif
--
2.23.0
next prev parent reply other threads:[~2021-05-07 6:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 8:31 [PATCH v3 00/21] Support SDEI Virtualization Gavin Shan
2021-05-07 8:31 ` Gavin Shan [this message]
2021-05-07 8:31 ` [PATCH v3 02/21] KVM: arm64: Add SDEI virtualization infrastructure Gavin Shan
2021-05-07 8:31 ` [PATCH v3 03/21] KVM: arm64: Support SDEI_VERSION hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 04/21] KVM: arm64: Support SDEI_EVENT_REGISTER hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 05/21] KVM: arm64: Support SDEI_EVENT_{ENABLE, DISABLE} hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 06/21] KVM: arm64: Support SDEI_EVENT_CONTEXT hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 07/21] KVM: arm64: Support SDEI_EVENT_UNREGISTER hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 08/21] KVM: arm64: Support SDEI_EVENT_STATUS hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 09/21] KVM: arm64: Support SDEI_EVENT_GET_INFO hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 10/21] KVM: arm64: Support SDEI_EVENT_ROUTING_SET hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 11/21] KVM: arm64: Support SDEI_PE_{MASK, UNMASK} hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 12/21] KVM: arm64: Support SDEI_{PRIVATE, SHARED}_RESET hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 13/21] KVM: arm64: Impment SDEI event delivery Gavin Shan
2021-05-07 8:31 ` [PATCH v3 14/21] KVM: arm64: Support SDEI_EVENT_{COMPLETE, COMPLETE_AND_RESUME} hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 15/21] KVM: arm64: Support SDEI event notifier Gavin Shan
2021-05-07 8:31 ` [PATCH v3 16/21] KVM: arm64: Support SDEI ioctl commands on VM Gavin Shan
2021-05-07 8:31 ` [PATCH v3 17/21] KVM: arm64: Support SDEI ioctl commands on vCPU Gavin Shan
2021-05-07 8:31 ` [PATCH v3 18/21] KVM: arm64: Support SDEI event injection Gavin Shan
2021-05-07 8:31 ` [PATCH v3 19/21] KVM: arm64: Support SDEI event cancellation Gavin Shan
2021-05-07 8:31 ` [PATCH v3 20/21] KVM: arm64: Export SDEI capability Gavin Shan
2021-05-07 8:31 ` [PATCH v3 21/21] KVM: selftests: Add SDEI test case Gavin Shan
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=20210507083124.43347-2-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=james.morse@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.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).