@@ -12,19 +12,7 @@ static const uint32_t gunyah_known_uuids[][4] = {
{0x673d5f14, 0x9265ce36, 0xa4535fdb, 0xc1d58fcd}, /* GUNYAH (open source build) */
};
-#define GH_HYPERCALL_HYP_IDENTIFY GH_HYPERCALL(0x0000)
-#define GH_HYPERCALL_MSGQ_SEND GH_HYPERCALL(0x001B)
-#define GH_HYPERCALL_MSGQ_RECV GH_HYPERCALL(0x001C)
-#define GH_HYPERCALL_VCPU_RUN GH_HYPERCALL(0x0065)
-
-/**
- * gh_hypercall_get_uid() - Returns a UID when running under a Gunyah hypervisor
- * @uid: An array of 4 u32's (u32 uid[4];)
- *
- * Caller should compare the resulting UID to a list of known Gunyah UIDs to
- * confirm that Linux is running as a guest of Gunyah.
- */
-void gh_hypercall_get_uid(u32 uid[4])
+bool arch_is_gunyah_guest(void)
{
struct arm_smccc_res res;
u32 uid[4];
@@ -74,6 +62,31 @@ void gh_hypercall_hyp_identify(struct gh_hypercall_hyp_identify_resp *hyp_identi
}
EXPORT_SYMBOL_GPL(gh_hypercall_hyp_identify);
+int gh_hypercall_dbl_send(u64 capid, u64 new_flags, u64 *old_flags)
+{
+ struct arm_smccc_res res;
+
+ arm_smccc_1_1_hvc(GH_HYPERCALL_DBL_SEND, capid, new_flags, 0, &res);
+
+ if (res.a0)
+ return res.a0;
+
+ *old_flags = res.a1;
+
+ return res.a0;
+}
+EXPORT_SYMBOL_GPL(gh_hypercall_dbl_send);
+
+int gh_hypercall_dbl_set_mask(u64 capid, u64 enable_mask, u64 ack_mask)
+{
+ struct arm_smccc_res res;
+
+ arm_smccc_1_1_hvc(GH_HYPERCALL_DBL_SET_MASK, capid, enable_mask, ack_mask, 0, &res);
+
+ return res.a0;
+}
+EXPORT_SYMBOL_GPL(gh_hypercall_dbl_set_mask);
+
int gh_hypercall_msgq_send(u64 capid, size_t size, uintptr_t buff, int tx_flags, bool *ready)
{
struct arm_smccc_res res;
@@ -164,6 +164,9 @@ struct gh_hypercall_hyp_identify_resp {
void gh_hypercall_hyp_identify(struct gh_hypercall_hyp_identify_resp *hyp_identity);
+int gh_hypercall_dbl_send(u64 capid, u64 new_flags, u64 *old_flags);
+int gh_hypercall_dbl_set_mask(u64 capid, u64 enable_mask, u64 ack_mask);
+
#define GH_HYPERCALL_MSGQ_TX_FLAGS_PUSH BIT(0)
int gh_hypercall_msgq_send(u64 capid, size_t size, uintptr_t buff, int tx_flags, bool *ready);
Gunyah doorbells allow two virtual machines to signal each other using interrupts. Add the hypercalls needed to assert the interrupt. Signed-off-by: Elliot Berman <quic_eberman@quicinc.com> --- arch/arm64/gunyah/gunyah_hypercall.c | 39 ++++++++++++++++++---------- include/linux/gunyah.h | 3 +++ 2 files changed, 29 insertions(+), 13 deletions(-)