MFC r317361:

Call the PSCI reset from cpu_reset on arm64. When rebooting from DDB the
kernel calls this directly so the event handler is not called, meaning
the computer fails to reboot.

2 files changed, 8 insertions, 1 deletions

diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c
index c5fe0fb..23e67fc 100644
--- a/sys/dev/psci/psci.c
+++ b/sys/dev/psci/psci.c
@@ -221,6 +221,13 @@ psci_shutdown(void *xsc, int howto)
 	/* System reset and off do not return. */
 }
 
+void
+psci_reset(void)
+{
+
+	psci_shutdown(NULL, 0);
+}
+
 static int
 psci_v0_1_init(device_t dev)
 {
diff --git a/sys/dev/psci/psci.h b/sys/dev/psci/psci.h
index 58f1e79..d727966 100644
--- a/sys/dev/psci/psci.h
+++ b/sys/dev/psci/psci.h
@@ -36,7 +36,7 @@ typedef int (*psci_callfn_t)(register_t, register_t, register_t, register_t);
 
 extern int psci_present;
 
-void	psci_system_reset(void);
+void	psci_reset(void);
 int	psci_cpu_on(unsigned long, unsigned long, unsigned long);
 int	psci_hvc_despatch(register_t, register_t, register_t, register_t);
 int	psci_smc_despatch(register_t, register_t, register_t, register_t);