2 files changed, 31 insertions, 0 deletions

diff --git a/include/soc/tegra/virt/syscalls.h b/include/soc/tegra/virt/syscalls.h
index 70a2611a7..bacef2471 100644
--- a/include/soc/tegra/virt/syscalls.h
+++ b/include/soc/tegra/virt/syscalls.h
@@ -42,6 +42,7 @@
 #define HVC_NR_RAISE_IRQ                4
 #define HVC_NR_READ_NGUESTS             5
 #define HVC_NR_READ_IPA_PA              6
+#define HVC_NR_READ_GUEST_STATE         7
 #define HVC_NR_READ_HYP_INFO            9
 #define HVC_NR_GUEST_RESET              10
 #define HVC_NR_SYSINFO_IPA              13
@@ -174,6 +175,9 @@ struct hyp_server_page {
 
 #ifdef CONFIG_ARM64
 
+#define _X3_X17 "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", \
+"x13", "x14", "x15", "x16", "x17"
+
 #define _X4_X17 "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", \
 "x13", "x14", "x15", "x16", "x17"
 
@@ -253,6 +257,20 @@ static inline int hyp_raise_irq(unsigned int irq, unsigned int vmid)
         return (int)r0;
 }
 
+static inline int hyp_read_guest_state(unsigned int vmid, unsigned int *state)
+{
+        register uint64_t r0 asm("x0") = vmid;
+        register uint64_t r1 asm("x1");
+
+        asm("hvc %2"
+                : "+r"(r0), "=r"(r1)
+                : "i"(HVC_NR_READ_GUEST_STATE)
+                : "x2", _X3_X17);
+
+        *state = (unsigned int)r1;
+        return (int)r0;
+}
+
 static inline int hyp_read_hyp_info(uint64_t *hyp_info_page_pa)
 {
         register uint64_t r0 asm("x0");
@@ -302,6 +320,7 @@ static inline uint64_t hyp_sysinfo_ipa(void)
         return r0;
 }
 
+#undef _X3_X17
 #undef _X4_X17
 
 #else
diff --git a/include/soc/tegra/virt/tegra_hv_sysmgr.h b/include/soc/tegra/virt/tegra_hv_sysmgr.h
index 62b66fc19..e93879277 100644
--- a/include/soc/tegra/virt/tegra_hv_sysmgr.h
+++ b/include/soc/tegra/virt/tegra_hv_sysmgr.h
@@ -101,6 +101,18 @@ enum system_function_id {
         MAX_FUNC_ID,
 };
 
+typedef enum  {
+        VM_STATE_BOOT,
+        VM_STATE_HALT,
+        VM_STATE_UNHALT,
+        VM_STATE_REBOOT,
+        VM_STATE_SHUTDOWN,
+        VM_STATE_SUSPEND,
+        VM_STATE_RESUME,
+        VM_STATE_INVALID,
+        VM_STATE_MAX
+} vm_state;
+
 #define CREATE_CMD(func_id, vmid)       ((func_id << 24U) | vmid)
 
 #define QUERY_CMD                       CREATE_CMD(QUERY_SYSTEM_STATE, 0)