[src/trunk]: src/sys/arch/arm/fdt Re-add support for cpu nodes with status = ...

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

details:   https://anonhg.NetBSD.org/src/rev/97ba3c7cf748
branches:  trunk
changeset: 835817:97ba3c7cf748
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Sep 10 19:15:16 2018 +0000

description:
Re-add support for cpu nodes with status = "disabled", lost in previous commit

diffstat:

 sys/arch/arm/fdt/cpu_fdt.c |  32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diffs (74 lines):

diff -r 1b8d3c9dd058 -r 97ba3c7cf748 sys/arch/arm/fdt/cpu_fdt.c
--- a/sys/arch/arm/fdt/cpu_fdt.c        Mon Sep 10 19:09:38 2018 +0000
+++ b/sys/arch/arm/fdt/cpu_fdt.c        Mon Sep 10 19:15:16 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.12 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.13 2018/09/10 19:15:16 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #include "psci_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.12 2018/09/10 11:05:12 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.13 2018/09/10 19:15:16 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -205,6 +205,26 @@
 }
 #endif /* MULTIPROCESSOR */
 
+static bool
+arm_fdt_cpu_okay(const int child)
+{
+       const char *s;
+
+       s = fdtbus_get_string(child, "device_type");
+       if (!s || strcmp(s, "cpu") != 0)
+               return false;
+
+       s = fdtbus_get_string(child, "status");
+       if (s) {
+               if (strcmp(s, "okay") == 0)
+                       return false;
+               if (strcmp(s, "disabled") == 0)
+                       return of_hasprop(child, "enable-method");
+               return false;
+       } else {
+               return true;
+       }
+}
 
 void
 arm_fdt_cpu_bootstrap(void)
@@ -213,7 +233,7 @@
        uint64_t mpidr, bp_mpidr;
        u_int cpuindex;
        int child, ret;
-       const char *devtype, *method;
+       const char *method;
 
        const int cpus = OF_finddevice("/cpus");
        if (cpus == -1) {
@@ -225,9 +245,7 @@
        /* Count CPUs */
        arm_cpu_max = 0;
        for (child = OF_child(cpus); child; child = OF_peer(child))
-               if (fdtbus_status_okay(child) && ((devtype =
-                   fdtbus_get_string(child, "device_type")) != NULL) &&
-                   (strcmp(devtype, "cpu") == 0))
+               if (arm_fdt_cpu_okay(child))
                        arm_cpu_max++;
 
 #if NPSCI_FDT > 0
@@ -242,7 +260,7 @@
        uint32_t started = 0;
        cpuindex = 1;
        for (child = OF_child(cpus); child; child = OF_peer(child)) {
-               if (!fdtbus_status_okay(child))
+               if (!arm_fdt_cpu_okay(child))
                        continue;
                if (fdtbus_get_reg64(child, 0, &mpidr, NULL) != 0)
                        continue;