Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/fdt Fix PSCI 0.1 detection.



details:   https://anonhg.NetBSD.org/src/rev/59650510484c
branches:  trunk
changeset: 319914:59650510484c
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Jun 15 16:03:59 2018 +0000

description:
Fix PSCI 0.1 detection.

diffstat:

 sys/arch/arm/fdt/psci_fdt.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 0d876bb572ed -r 59650510484c sys/arch/arm/fdt/psci_fdt.c
--- a/sys/arch/arm/fdt/psci_fdt.c       Fri Jun 15 15:59:20 2018 +0000
+++ b/sys/arch/arm/fdt/psci_fdt.c       Fri Jun 15 16:03:59 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psci_fdt.c,v 1.4 2018/05/26 22:49:03 jmcneill Exp $ */
+/* $NetBSD: psci_fdt.c,v 1.5 2018/06/15 16:03:59 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.4 2018/05/26 22:49:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.5 2018/06/15 16:03:59 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -126,8 +126,7 @@
                return EINVAL;
        }
 
-       const char * const compat_0_1[] = { "arm,psci", NULL };
-       if (of_match_compatible(phandle, compat_0_1)) {
+       if (of_match_compatible(phandle, compatible) == 1) {
                psci_clearfunc();
                if (of_getprop_uint32(phandle, "cpu_on", &val) == 0)
                        psci_setfunc(PSCI_FUNC_CPU_ON, val);



Home | Main Index | Thread Index | Old Index