[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Minios-devel] [UNIKRAFT PATCHv5 42/46] plat/kvm: Implement shutdown for Arm64


  • To: <minios-devel@xxxxxxxxxxxxxxxxxxxx>, <simon.kuenzer@xxxxxxxxx>
  • From: Wei Chen <wei.chen@xxxxxxx>
  • Date: Fri, 10 Aug 2018 07:08:32 +0000
  • Authentication-results: spf=fail (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=arm.com;
  • Cc: Kaly.Xin@xxxxxxx, nd@xxxxxxx, wei.chen@xxxxxxx
  • Delivery-date: Fri, 10 Aug 2018 07:10:26 +0000
  • List-id: Mini-os development list <minios-devel.lists.xenproject.org>
  • Nodisclaimer: True
  • Spamdiagnosticmetadata: NSPM
  • Spamdiagnosticoutput: 1:99

From: Wei Chen <Wei.Chen@xxxxxxx>

QEMU/KVM provide a PSCI interface for virtual machine on
Arm64 platform. So we use this interface to implement
platform system off function.

Signed-off-by: Wei Chen <Wei.Chen@xxxxxxx>
---
 plat/kvm/shutdown.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plat/kvm/shutdown.c b/plat/kvm/shutdown.c
index a513df9..56ef89c 100644
--- a/plat/kvm/shutdown.c
+++ b/plat/kvm/shutdown.c
@@ -22,7 +22,8 @@
  */
 
 #include <errno.h>
-#include <x86/cpu.h>
+#include <cpu.h>
+#include <irq.h>
 #include <uk/print.h>
 #include <uk/plat/bootstrap.h>
 
@@ -38,7 +39,11 @@ void ukplat_terminate(enum ukplat_gstate request __unused)
         * be 83 ('S', 41 << 1 | 1).
         */
        uk_printk("Unikraft halted\n");
+#if defined(__X86_64__)
        outw(0x501, 41);
+#elif defined(__ARM_64__)
+       system_off();
+#endif
 
        /*
         * If we got here, there is no way to initiate "shutdown" on virtio
@@ -49,9 +54,9 @@ void ukplat_terminate(enum ukplat_gstate request __unused)
 
 static void cpu_halt(void)
 {
-       __asm__ __volatile__("cli; hlt");
+       local_irq_disable();
        for (;;)
-               ;
+               halt();
 }
 
 int ukplat_suspend(void)
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.