CVS commit: [netbsd-8] src/sys/arch/arm

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon Jun 18 15:34:34 UTC 2018

Modified Files:
        src/sys/arch/arm/arm [netbsd-8]: psci.c
        src/sys/arch/arm/fdt [netbsd-8]: psci_fdt.c

Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #883):

        sys/arch/arm/fdt/psci_fdt.c: revision 1.5
        sys/arch/arm/arm/psci.c: revision 1.2

Use correct value for PSCI 0.2+ PSCI_CPU_ON.

Fix PSCI 0.1 detection.


To generate a diff of this commit:
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/arch/arm/arm/psci.c
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/arch/arm/fdt/psci_fdt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/arm/psci.c
diff -u src/sys/arch/arm/arm/psci.c:1.1.4.2 src/sys/arch/arm/arm/psci.c:1.1.4.3
--- src/sys/arch/arm/arm/psci.c:1.1.4.2	Tue Jul 18 19:13:08 2017
+++ src/sys/arch/arm/arm/psci.c	Mon Jun 18 15:34:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: psci.c,v 1.1.4.2 2017/07/18 19:13:08 snj Exp $ */
+/* $NetBSD: psci.c,v 1.1.4.3 2018/06/18 15:34:34 martin Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_diagnostic.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psci.c,v 1.1.4.2 2017/07/18 19:13:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psci.c,v 1.1.4.3 2018/06/18 15:34:34 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -43,9 +43,9 @@ __KERNEL_RCSID(0, "$NetBSD: psci.c,v 1.1
 #define	PSCI_SYSTEM_OFF		0x84000008
 #define	PSCI_SYSTEM_RESET	0x84000009
 #if defined(__aarch64__)
-#define	PSCI_CPU_ON		0xc4000002
+#define	PSCI_CPU_ON		0xc4000003
 #else
-#define	PSCI_CPU_ON		0x84000002
+#define	PSCI_CPU_ON		0x84000003
 #endif
 
 static psci_fn psci_call_fn;

Index: src/sys/arch/arm/fdt/psci_fdt.c
diff -u src/sys/arch/arm/fdt/psci_fdt.c:1.1.4.2 src/sys/arch/arm/fdt/psci_fdt.c:1.1.4.3
--- src/sys/arch/arm/fdt/psci_fdt.c:1.1.4.2	Tue Jul 18 19:13:08 2017
+++ src/sys/arch/arm/fdt/psci_fdt.c	Mon Jun 18 15:34:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: psci_fdt.c,v 1.1.4.2 2017/07/18 19:13:08 snj Exp $ */
+/* $NetBSD: psci_fdt.c,v 1.1.4.3 2018/06/18 15:34:34 martin Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.1.4.2 2017/07/18 19:13:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.1.4.3 2018/06/18 15:34:34 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -102,8 +102,7 @@ psci_fdt_init(const int phandle)
 		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);