[src/trunk]: src/sys/arch/arm/acpi Don't rely on PSCI node in FDT to reboot

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/612e9060e24c
branches:  trunk
changeset: 433942:612e9060e24c
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 13 00:08:29 2018 +0000

description:
Don't rely on PSCI node in FDT to reboot

diffstat:

 sys/arch/arm/acpi/acpi_platform.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 92117bb22385 -r 612e9060e24c sys/arch/arm/acpi/acpi_platform.c
--- a/sys/arch/arm/acpi/acpi_platform.c Sat Oct 13 00:07:55 2018 +0000
+++ b/sys/arch/arm/acpi/acpi_platform.c Sat Oct 13 00:08:29 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.1 2018/10/12 22:20:04 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.2 2018/10/13 00:08:29 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.1 2018/10/12 22:20:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.2 2018/10/13 00:08:29 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -162,6 +162,13 @@
 {
 }
 
+static void
+acpi_platform_reset(void)
+{
+       if (psci_available())
+               psci_system_reset();
+}
+
 static u_int
 acpi_platform_uart_freq(void)
 {
@@ -175,7 +182,7 @@
        .ap_init_attach_args = acpi_platform_init_attach_args,
        .ap_early_putchar = acpi_platform_early_putchar,
        .ap_device_register = acpi_platform_device_register,
-       .ap_reset = psci_fdt_reset,
+       .ap_reset = acpi_platform_reset,
        .ap_delay = gtmr_delay,
        .ap_uart_freq = acpi_platform_uart_freq,
 };