CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Jun 11 05:16:22 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_osdep.h
Log Message:
Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem was
only on X550*. Not tested on big endian machine.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe_osdep.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.25 src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.26
--- src/sys/dev/pci/ixgbe/ixgbe_osdep.h:1.25 Tue Dec 17 05:49:01 2019
+++ src/sys/dev/pci/ixgbe/ixgbe_osdep.h Thu Jun 11 05:16:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_osdep.h,v 1.25 2019/12/17 05:49:01 msaitoh Exp $ */
+/* $NetBSD: ixgbe_osdep.h,v 1.26 2020/06/11 05:16:22 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -139,7 +139,7 @@ enum {
#define IXGBE_CPU_TO_LE16 htole16
#define IXGBE_CPU_TO_LE32 htole32
#define IXGBE_LE32_TO_CPU le32toh
-#define IXGBE_LE32_TO_CPUS(x)
+#define IXGBE_LE32_TO_CPUS(x) (*(x) = le32toh(*(x)))
#define IXGBE_CPU_TO_BE16 htobe16
#define IXGBE_CPU_TO_BE32 htobe32
#define IXGBE_BE32_TO_CPU be32toh
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Jun 11 05:16:22 UTC 2020 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_osdep.h Log Message: Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem was only on X550*. Not tested on big endian machine. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/ixgbe/ixgbe_osdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sunos
Module Name:src
Committed By: dholland
Date: Thu Jun 11 03:47:05 UTC 2020
Modified Files:
src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h
sunos_syscalls.c sunos_sysent.c
Log Message:
Regen after -r1.82 of compat_sunos syscalls.master last September.
(Apparently forgotten.)
"Treat valsize as unsigned"
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.82 -r1.83 src/sys/compat/sunos/sunos_syscallargs.h
cvs rdiff -u -r1.97 -r1.98 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.93 -r1.94 src/sys/compat/sunos/sunos_sysent.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/compat/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.98 src/sys/compat/sunos/sunos_syscall.h:1.99
--- src/sys/compat/sunos/sunos_syscall.h:1.98 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/sunos/sunos_syscall.h Thu Jun 11 03:47:05 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.98 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.99 2020/06/11 03:47:05 dholland Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.82 2019/09/23 20:42:29 christos Exp
*/
#ifndef _SUNOS_SYS_SYSCALL_H_
@@ -245,7 +245,7 @@
/* syscall: "bind" ret: "int" args: "int" "void *" "int" */
#define SUNOS_SYS_bind 104
-/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "void *" "int" */
+/* syscall: "setsockopt" ret: "int" args: "int" "int" "int" "void *" "u_int" */
#define SUNOS_SYS_setsockopt 105
/* syscall: "listen" ret: "int" args: "int" "int" */
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.82 src/sys/compat/sunos/sunos_syscallargs.h:1.83
--- src/sys/compat/sunos/sunos_syscallargs.h:1.82 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/sunos/sunos_syscallargs.h Thu Jun 11 03:47:05 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.82 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.83 2020/06/11 03:47:05 dholland Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.82 2019/09/23 20:42:29 christos Exp
*/
#ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -246,7 +246,7 @@ struct sunos_sys_setsockopt_args {
syscallarg(int) level;
syscallarg(int) name;
syscallarg(void *) val;
- syscallarg(int) valsize;
+ syscallarg(u_int) valsize;
};
check_syscall_args(sunos_sys_setsockopt)
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.97 src/sys/compat/sunos/sunos_syscalls.c:1.98
--- src/sys/compat/sunos/sunos_syscalls.c:1.97 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/sunos/sunos_syscalls.c Thu Jun 11 03:47:05 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.97 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.98 2020/06/11 03:47:05 dholland Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.82 2019/09/23 20:42:29 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.97 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.98 2020/06/11 03:47:05 dholland Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/sunos/sunos_sysent.c
diff -u src/sys/compat/sunos/sunos_sysent.c:1.93 src/sys/compat/sunos/sunos_sysent.c:1.94
--- src/sys/compat/sunos/sunos_sysent.c:1.93 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/sunos/sunos_sysent.c Thu Jun 11 03:47:05 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_sysent.c,v 1.93 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: sunos_sysent.c,v 1.94 2020/06/11 03:47:05 dholland Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.82 2019/09/23 20:42:29 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_sysent.c,v 1.93 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_sysent.c,v 1.94 2020/06/11 03:47:05 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
CVS commit: src/sys/compat/sunos
Module Name:src Committed By: dholland Date: Thu Jun 11 03:47:05 UTC 2020 Modified Files: src/sys/compat/sunos: sunos_syscall.h sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c Log Message: Regen after -r1.82 of compat_sunos syscalls.master last September. (Apparently forgotten.) "Treat valsize as unsigned" To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/compat/sunos/sunos_syscall.h cvs rdiff -u -r1.82 -r1.83 src/sys/compat/sunos/sunos_syscallargs.h cvs rdiff -u -r1.97 -r1.98 src/sys/compat/sunos/sunos_syscalls.c cvs rdiff -u -r1.93 -r1.94 src/sys/compat/sunos/sunos_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: dholland Date: Thu Jun 11 03:45:31 UTC 2020 Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: Regen with new makesyscalls. (the large diff of rump_syscalls.h has been checked and was the point of the makesyscalls change) To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 src/sys/kern/init_sysent.c cvs rdiff -u -r1.322 -r1.323 src/sys/kern/syscalls.c cvs rdiff -u -r1.39 -r1.40 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.41 -r1.42 src/sys/kern/systrace_args.c cvs rdiff -u -r1.121 -r1.122 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.152 -r1.153 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.316 -r1.317 src/sys/sys/syscall.h cvs rdiff -u -r1.300 -r1.301 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: dholland Date: Thu Jun 11 03:45:31 UTC 2020 Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: Regen with new makesyscalls. (the large diff of rump_syscalls.h has been checked and was the point of the makesyscalls change) To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 src/sys/kern/init_sysent.c cvs rdiff -u -r1.322 -r1.323 src/sys/kern/syscalls.c cvs rdiff -u -r1.39 -r1.40 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.41 -r1.42 src/sys/kern/systrace_args.c cvs rdiff -u -r1.121 -r1.122 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.152 -r1.153 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.316 -r1.317 src/sys/sys/syscall.h cvs rdiff -u -r1.300 -r1.301 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.334 src/sys/kern/init_sysent.c:1.335 --- src/sys/kern/init_sysent.c:1.334 Tue Jun 2 17:23:21 2020 +++ src/sys/kern/init_sysent.c Thu Jun 11 03:45:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysent.c,v 1.334 2020/06/02 17:23:21 kamil Exp $ */ +/* $NetBSD: init_sysent.c,v 1.335 2020/06/11 03:45:30 dholland Exp $ */ /* * System call switch table. @@ -8,7 +8,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.334 2020/06/02 17:23:21 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.335 2020/06/11 03:45:30 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.322 src/sys/kern/syscalls.c:1.323 --- src/sys/kern/syscalls.c:1.322 Tue Jun 2 17:23:21 2020 +++ src/sys/kern/syscalls.c Thu Jun 11 03:45:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: syscalls.c,v 1.322 2020/06/02 17:23:21 kamil Exp $ */ +/* $NetBSD: syscalls.c,v 1.323 2020/06/11 03:45:30 dholland Exp $ */ /* * System call names. @@ -8,7 +8,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.322 2020/06/02 17:23:21 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.323 2020/06/11 03:45:30 dholland Exp $"); #if defined(_KERNEL_OPT) #ifdef _KERNEL_OPT Index: src/sys/kern/syscalls_autoload.c diff -u src/sys/kern/syscalls_autoload.c:1.39 src/sys/kern/syscalls_autoload.c:1.40 --- src/sys/kern/syscalls_autoload.c:1.39 Tue Jun 2 17:23:21 2020 +++ src/sys/kern/syscalls_autoload.c Thu Jun 11 03:45:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: syscalls_autoload.c,v 1.39 2020/06/02 17:23:21 kamil Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.40 2020/06/11 03:45:30 dholland Exp $ */ /* * System call autoload table. @@ -8,7 +8,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.39 2020/06/02 17:23:21 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.40 2020/06/11 03:45:30 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.41 src/sys/kern/systrace_args.c:1.42 --- src/sys/kern/systrace_args.c:1.41 Tue Jun 2 17:23:21 2020 +++ src/sys/kern/systrace_args.c Thu Jun 11 03:45:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.41 2020/06/02 17:23:21 kamil Exp $ */ +/* $NetBSD: systrace_args.c,v 1.42 2020/06/11 03:45:30 dholland Exp $ */ /* * System call argument to DTrace register array converstion. Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.121 src/sys/rump/include/rump/rump_syscalls.h:1.122 --- src/sys/rump/include/rump/rump_syscalls.h:1.121 Tue Jun 2 17:23:22 2020 +++ src/sys/rump/include/rump/rump_syscalls.h Thu Jun 11 03:45:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.h,v 1.121 2020/06/02 17:23:22 kamil Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.122 2020/06/11 03:45:30 dholland Exp $ */ /* * System call protos in rump namespace. @@ -16,832 +16,832 @@ #include -#ifndef RUMP_SYS_RENAME_FKTRACE -#define RUMP_SYS_RENAME_FKTRACE rump___sysimpl_fktrace +#ifndef RUMP_SYS_RENAME___GETCWD +#define RUMP_SYS_RENAME___GETCWD rump___sysimpl___getcwd #endif -#ifndef RUMP_SYS_RENAME_GETSID -#define RUMP_SYS_RENAME_GETSID rump___sysimpl_getsid +#ifndef RUMP_SYS_RENAME___GETLOGIN +#define RUMP_SYS_RENAME___GETLOGIN rump___sysimpl___getlogin #endif -#ifndef RUMP_SYS_RENAME_RECVMMSG -#define RUMP_SYS_RENAME_RECVMMSG rump___sysimpl_recvmmsg +#ifndef RUMP_SYS_RENAME___POSIX_CHOWN +#define RUMP_SYS_RENAME___POSIX_CHOWN rump___sysimpl___posix_chown #endif -#ifndef RUMP_SYS_RENAME_UTIMENSAT -#define RUMP_SYS_RENAME_UTIMENSAT rump___sysimpl_utimensat +#ifndef RUMP_SYS_RENAME___POSIX_FCHOWN +#define RUMP_SYS_RENAME___POSIX_FCHOWN
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Thu Jun 11 03:25:35 UTC 2020 Modified Files: src/sys/kern: makesyscalls.sh Log Message: Don't output things in awk hash order. Sort first. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/kern/makesyscalls.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: dholland
Date: Thu Jun 11 03:25:35 UTC 2020
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
Don't output things in awk hash order. Sort first.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.180 src/sys/kern/makesyscalls.sh:1.181
--- src/sys/kern/makesyscalls.sh:1.180 Thu Jun 11 02:21:26 2020
+++ src/sys/kern/makesyscalls.sh Thu Jun 11 03:25:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.180 2020/06/11 02:21:26 dholland Exp $
+# $NetBSD: makesyscalls.sh,v 1.181 2020/06/11 03:25:35 dholland Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -,6 +,24 @@ $2 == "EXTERN" {
printf("%s: line %d: unrecognized keyword %s\n", infile, NR, $2)
exit 1
}
+
+function sort(arr, n,i, j, t) {
+ # this is going to be bubble sort because I cannot be bothered to
+ # write a real sort, this whole script is hopefully going to be
+ # deprecated before much longer, and performance of a few hundred
+ # things (even interpreted in awk) should be adequate.
+ for (i = 1; i <= n; i++) {
+ for (j = i + 1; j <= n; j++) {
+ if (arr[j] < arr[i]) {
+t = arr[i];
+arr[i] = arr[j];
+arr[j] = t;
+ }
+ }
+ }
+ return 0;
+}
+
END {
# output pipe() syscall with its special retval[2] handling
if (rumphaspipe) {
@@ -1134,7 +1152,15 @@ END {
}
# print default rump syscall interfaces
+ # be sure to generate them in a deterministic order, not awk
+ # hash order as would happen with a plain "for (var in funcseen)"
+ numfuncseenvars = 0;
for (var in funcseen) {
+ funcseenvars[++numfuncseenvars] = var;
+ }
+ sort(funcseenvars, numfuncseenvars)
+ for (i = 1; i <= numfuncseenvars; i++) {
+ var = funcseenvars[i];
printf("#ifndef RUMP_SYS_RENAME_%s\n", \
toupper(var)) > rumpcallshdr
printf("#define RUMP_SYS_RENAME_%s rump___sysimpl_%s\n", \
CVS commit: src/sys/dev
Module Name:src
Committed By: thorpej
Date: Thu Jun 11 02:39:31 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_i2c.c
src/sys/dev/bluetooth: bthidev.c bthub.c btmagic.c btsco.c
src/sys/dev/fdt: fdtbus.c
src/sys/dev/hdaudio: hdafg.c hdaudio.c
src/sys/dev/i2c: i2c.c
src/sys/dev/ofw: ofw_subr.c
src/sys/dev/pci: if_ixl.c if_tl.c if_wm.c
src/sys/dev/spi: spi.c
src/sys/dev/sysmon: swsensor.c sysmon_envsys.c sysmon_envsys_util.c
sysmon_power.c
src/sys/dev/usb: usb_subr.c
src/sys/dev/wscons: wsdisplay_util.c
src/sys/dev/wsfb: genfb.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_i2c.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/bluetooth/bthub.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/bluetooth/btmagic.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/hdaudio/hdafg.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/hdaudio/hdaudio.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ofw/ofw_subr.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.676 -r1.677 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/spi/spi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/sysmon/swsensor.c
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sysmon/sysmon_envsys_util.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.247 -r1.248 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wscons/wsdisplay_util.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/wsfb/genfb.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/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.6 src/sys/dev/acpi/acpi_i2c.c:1.7
--- src/sys/dev/acpi/acpi_i2c.c:1.6 Mon Jun 8 20:21:56 2020
+++ src/sys/dev/acpi/acpi_i2c.c Thu Jun 11 02:39:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.6 2020/06/08 20:21:56 thorpej Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.7 2020/06/11 02:39:30 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.6 2020/06/08 20:21:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.7 2020/06/11 02:39:30 thorpej Exp $");
#include
#include
@@ -203,7 +203,7 @@ acpi_enter_i2c_device(struct acpi_devnod
if (i2c_id != NULL) {
if (i2c_id->compat != NULL) {
prop_data_t data;
- data = prop_data_create_data(i2c_id->compat,
+ data = prop_data_create_copy(i2c_id->compat,
i2c_id->compatlen);
prop_dictionary_set(dev, "compatible", data);
prop_object_release(data);
Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.31 src/sys/dev/bluetooth/bthidev.c:1.32
--- src/sys/dev/bluetooth/bthidev.c:1.31 Thu Nov 15 23:01:45 2018
+++ src/sys/dev/bluetooth/bthidev.c Thu Jun 11 02:39:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.31 2018/11/15 23:01:45 jakllsch Exp $ */
+/* $NetBSD: bthidev.c,v 1.32 2020/06/11 02:39:31 thorpej Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.31 2018/11/15 23:01:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.32 2020/06/11 02:39:31 thorpej Exp $");
#include
#include
@@ -172,7 +172,7 @@ bthidev_match(device_t self, cfdata_t cf
prop_object_t obj;
obj = prop_dictionary_get(dict, BTDEVservice);
- if (prop_string_equals_cstring(obj, "HID"))
+ if (prop_string_equals_string(obj, "HID"))
return 1;
return 0;
@@ -216,24 +216,24 @@ bthidev_attach(device_t parent, device_t
* extract config from proplist
*/
obj = prop_dictionary_get(dict, BTDEVladdr);
- bdaddr_copy(>sc_laddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(>sc_laddr, prop_data_value(obj));
obj = prop_dictionary_get(dict, BTDEVraddr);
- bdaddr_copy(>sc_raddr, prop_data_data_nocopy(obj));
+ bdaddr_copy(>sc_raddr, prop_data_value(obj));
obj = prop_dictionary_get(dict, BTDEVvendor);
- vendor = (int)prop_number_integer_value(obj);
+ vendor = (int)prop_number_signed_value(obj);
obj = prop_dictionary_get(dict, BTDEVproduct);
- product = (int)prop_number_integer_value(obj);
+ product = (int)prop_number_signed_value(obj);
obj = prop_dictionary_get(dict, BTDEVmode);
if (prop_object_type(obj) == PROP_TYPE_STRING) {
- if (prop_string_equals_cstring(obj, BTDEVauth))
+ if (prop_string_equals_string(obj, BTDEVauth))
sockopt_setint(>sc_mode, L2CAP_LM_AUTH);
- else if (prop_string_equals_cstring(obj, BTDEVencrypt))
+ else if
CVS commit: src/sys/dev
Module Name:src Committed By: thorpej Date: Thu Jun 11 02:39:31 UTC 2020 Modified Files: src/sys/dev/acpi: acpi_i2c.c src/sys/dev/bluetooth: bthidev.c bthub.c btmagic.c btsco.c src/sys/dev/fdt: fdtbus.c src/sys/dev/hdaudio: hdafg.c hdaudio.c src/sys/dev/i2c: i2c.c src/sys/dev/ofw: ofw_subr.c src/sys/dev/pci: if_ixl.c if_tl.c if_wm.c src/sys/dev/spi: spi.c src/sys/dev/sysmon: swsensor.c sysmon_envsys.c sysmon_envsys_util.c sysmon_power.c src/sys/dev/usb: usb_subr.c src/sys/dev/wscons: wsdisplay_util.c src/sys/dev/wsfb: genfb.c Log Message: Update for proplib(3) API changes. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_i2c.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/bluetooth/bthidev.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/bluetooth/bthub.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/bluetooth/btmagic.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/bluetooth/btsco.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/fdt/fdtbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/hdaudio/hdafg.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/hdaudio/hdaudio.c cvs rdiff -u -r1.72 -r1.73 src/sys/dev/i2c/i2c.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ofw/ofw_subr.c cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/if_ixl.c cvs rdiff -u -r1.120 -r1.121 src/sys/dev/pci/if_tl.c cvs rdiff -u -r1.676 -r1.677 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/spi/spi.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/sysmon/swsensor.c cvs rdiff -u -r1.146 -r1.147 src/sys/dev/sysmon/sysmon_envsys.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sysmon/sysmon_envsys_util.c cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sysmon/sysmon_power.c cvs rdiff -u -r1.247 -r1.248 src/sys/dev/usb/usb_subr.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wscons/wsdisplay_util.c cvs rdiff -u -r1.73 -r1.74 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Thu Jun 11 02:32:06 UTC 2020 Modified Files: src/sys/kern: subr_disk.c Log Message: Update for proplib(3) API changes. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/kern/subr_disk.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/kern/subr_disk.c diff -u src/sys/kern/subr_disk.c:1.130 src/sys/kern/subr_disk.c:1.131 --- src/sys/kern/subr_disk.c:1.130 Fri Mar 27 11:13:57 2020 +++ src/sys/kern/subr_disk.c Thu Jun 11 02:32:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_disk.c,v 1.130 2020/03/27 11:13:57 mlelstv Exp $ */ +/* $NetBSD: subr_disk.c,v 1.131 2020/06/11 02:32:06 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.130 2020/03/27 11:13:57 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.131 2020/06/11 02:32:06 thorpej Exp $"); #include #include @@ -737,7 +737,7 @@ disk_set_info(device_t dev, struct disk prop_dictionary_set(disk_info, "geometry", geom); if (type) - prop_dictionary_set_cstring_nocopy(disk_info, "type", type); + prop_dictionary_set_string_nocopy(disk_info, "type", type); prop_object_release(geom);
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Thu Jun 11 02:32:06 UTC 2020 Modified Files: src/sys/kern: subr_disk.c Log Message: Update for proplib(3) API changes. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/kern/subr_disk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Thu Jun 11 02:30:21 UTC 2020 Modified Files: src/sys/kern: kern_pmf.c kern_veriexec.c Log Message: Oops, missed a couple. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/kern_pmf.c cvs rdiff -u -r1.25 -r1.26 src/sys/kern/kern_veriexec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Thu Jun 11 02:30:21 UTC 2020 Modified Files: src/sys/kern: kern_pmf.c kern_veriexec.c Log Message: Oops, missed a couple. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/kern_pmf.c cvs rdiff -u -r1.25 -r1.26 src/sys/kern/kern_veriexec.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/kern/kern_pmf.c diff -u src/sys/kern/kern_pmf.c:1.44 src/sys/kern/kern_pmf.c:1.45 --- src/sys/kern/kern_pmf.c:1.44 Thu Jun 11 02:28:01 2020 +++ src/sys/kern/kern_pmf.c Thu Jun 11 02:30:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_pmf.c,v 1.44 2020/06/11 02:28:01 thorpej Exp $ */ +/* $NetBSD: kern_pmf.c,v 1.45 2020/06/11 02:30:21 thorpej Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.44 2020/06/11 02:28:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.45 2020/06/11 02:30:21 thorpej Exp $"); #include #include @@ -404,7 +404,7 @@ pmf_get_platform(const char *key) if (pmf_platform == NULL) return NULL; - if (!prop_dictionary_get_cstring_nocopy(pmf_platform, key, )) + if (!prop_dictionary_get_string(pmf_platform, key, )) return NULL; return value; Index: src/sys/kern/kern_veriexec.c diff -u src/sys/kern/kern_veriexec.c:1.25 src/sys/kern/kern_veriexec.c:1.26 --- src/sys/kern/kern_veriexec.c:1.25 Thu Jun 11 02:28:01 2020 +++ src/sys/kern/kern_veriexec.c Thu Jun 11 02:30:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_veriexec.c,v 1.25 2020/06/11 02:28:01 thorpej Exp $ */ +/* $NetBSD: kern_veriexec.c,v 1.26 2020/06/11 02:30:21 thorpej Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.25 2020/06/11 02:28:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.26 2020/06/11 02:30:21 thorpej Exp $"); #include "opt_veriexec.h" @@ -1045,7 +1045,7 @@ veriexec_file_add(struct lwp *l, prop_di int error; bool ignore_dup = false; - if (!prop_dictionary_get_cstring_nocopy(dict, "file", )) + if (!prop_dictionary_get_string(dict, "file", )) return (EINVAL); error = namei_simple_kernel(file, NSM_FOLLOW_NOEMULROOT, );
CVS commit: src/sys/kern
Module Name:src
Committed By: thorpej
Date: Thu Jun 11 02:28:02 UTC 2020
Modified Files:
src/sys/kern: kern_drvctl.c kern_pmf.c kern_veriexec.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/kern_pmf.c
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/kern_veriexec.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/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.44 src/sys/kern/kern_drvctl.c:1.45
--- src/sys/kern/kern_drvctl.c:1.44 Tue Sep 18 01:25:09 2018
+++ src/sys/kern/kern_drvctl.c Thu Jun 11 02:28:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.44 2018/09/18 01:25:09 mrg Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.45 2020/06/11 02:28:01 thorpej Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.44 2018/09/18 01:25:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.45 2020/06/11 02:28:01 thorpej Exp $");
#include
#include
@@ -144,7 +144,7 @@ devmon_insert(const char *event, prop_di
}
/* Fill in mandatory member */
- if (!prop_dictionary_set_cstring_nocopy(ev, "event", event)) {
+ if (!prop_dictionary_set_string_nocopy(ev, "event", event)) {
prop_object_release(ev);
mutex_exit(_lock);
return 0;
@@ -468,7 +468,7 @@ drvctl_command_get_properties(struct lwp
for (dev = deviter_first(, 0); dev != NULL;
dev = deviter_next()) {
- if (prop_string_equals_cstring(devname_string,
+ if (prop_string_equals_string(devname_string,
device_xname(dev))) {
prop_dictionary_set(results_dict, "drvctl-result-data",
device_properties(dev));
@@ -527,8 +527,8 @@ drvctl_command(struct lwp *l, struct pli
}
for (dcd = drvctl_command_table; dcd->dcd_name != NULL; dcd++) {
- if (prop_string_equals_cstring(command_string,
- dcd->dcd_name))
+ if (prop_string_equals_string(command_string,
+ dcd->dcd_name))
break;
}
Index: src/sys/kern/kern_pmf.c
diff -u src/sys/kern/kern_pmf.c:1.43 src/sys/kern/kern_pmf.c:1.44
--- src/sys/kern/kern_pmf.c:1.43 Tue May 12 10:02:56 2020
+++ src/sys/kern/kern_pmf.c Thu Jun 11 02:28:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pmf.c,v 1.43 2020/05/12 10:02:56 jdolecek Exp $ */
+/* $NetBSD: kern_pmf.c,v 1.44 2020/06/11 02:28:01 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.43 2020/05/12 10:02:56 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.44 2020/06/11 02:28:01 thorpej Exp $");
#include
#include
@@ -393,7 +393,7 @@ pmf_set_platform(const char *key, const
if (pmf_platform == NULL)
return false;
- return prop_dictionary_set_cstring(pmf_platform, key, value);
+ return prop_dictionary_set_string(pmf_platform, key, value);
}
const char *
Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.24 src/sys/kern/kern_veriexec.c:1.25
--- src/sys/kern/kern_veriexec.c:1.24 Mon Jun 8 20:14:24 2020
+++ src/sys/kern/kern_veriexec.c Thu Jun 11 02:28:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_veriexec.c,v 1.24 2020/06/08 20:14:24 thorpej Exp $ */
+/* $NetBSD: kern_veriexec.c,v 1.25 2020/06/11 02:28:01 thorpej Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.24 2020/06/08 20:14:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.25 2020/06/11 02:28:01 thorpej Exp $");
#include "opt_veriexec.h"
@@ -1064,8 +1064,7 @@ veriexec_file_add(struct lwp *l, prop_di
rw_init(>lock);
/* Lookup fingerprint hashing algorithm. */
- fp_type = prop_string_cstring_nocopy(prop_dictionary_get(dict,
- "fp-type"));
+ fp_type = prop_string_value(prop_dictionary_get(dict, "fp-type"));
if ((vfe->ops = veriexec_fpops_lookup(fp_type)) == NULL) {
log(LOG_ERR, "Veriexec: Invalid or unknown fingerprint type "
"`%s' for file `%s'.\n", fp_type, file);
@@ -1082,7 +1081,7 @@ veriexec_file_add(struct lwp *l, prop_di
}
vfe->fp = kmem_alloc(vfe->ops->hash_len, KM_SLEEP);
- memcpy(vfe->fp, prop_data_data_nocopy(prop_dictionary_get(dict, "fp")),
+ memcpy(vfe->fp, prop_data_value(prop_dictionary_get(dict, "fp")),
vfe->ops->hash_len);
rw_enter(_op_lock, RW_WRITER);
@@ -1219,7 +1218,7 @@ veriexec_file_convert(struct veriexec_fi
prop_dictionary_set(rdict, "fp-type",
prop_string_create_copy(vfe->ops->type));
prop_dictionary_set(rdict, "fp",
- prop_data_create_data(vfe->fp, vfe->ops->hash_len));
+ prop_data_create_copy(vfe->fp, vfe->ops->hash_len));
}
int
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Thu Jun 11 02:28:02 UTC 2020 Modified Files: src/sys/kern: kern_drvctl.c kern_pmf.c kern_veriexec.c Log Message: Update for proplib(3) API changes. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/kern_drvctl.c cvs rdiff -u -r1.43 -r1.44 src/sys/kern/kern_pmf.c cvs rdiff -u -r1.24 -r1.25 src/sys/kern/kern_veriexec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: dholland
Date: Thu Jun 11 02:21:26 UTC 2020
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
fix awk-induced bug (using wrong variable, getting away with it by luck)
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.179 src/sys/kern/makesyscalls.sh:1.180
--- src/sys/kern/makesyscalls.sh:1.179 Tue Jun 9 04:48:45 2020
+++ src/sys/kern/makesyscalls.sh Thu Jun 11 02:21:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.179 2020/06/09 04:48:45 dholland Exp $
+# $NetBSD: makesyscalls.sh,v 1.180 2020/06/11 02:21:26 dholland Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -756,7 +756,7 @@ function printproto(wrap) {
}
}
-function printrumpsysent(insysent, compatwrap) {
+function printrumpsysent(insysent, compatwrap_) {
if (modular) {
fn = rumpnomodule
flags = rumpnoflags
@@ -941,7 +941,7 @@ function putent(type, compatwrap) {
} else {
insysent = 1
}
- printrumpsysent(insysent, compatwrap)
+ printrumpsysent(insysent, compatwrap_)
# output rump marshalling code if necessary
if (!rumpable) {
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Thu Jun 11 02:21:26 UTC 2020 Modified Files: src/sys/kern: makesyscalls.sh Log Message: fix awk-induced bug (using wrong variable, getting away with it by luck) To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 src/sys/kern/makesyscalls.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: kamil Date: Thu Jun 11 00:33:30 UTC 2020 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Follow the syscall() logic and mask unsupported syscall ranges in rump Avoids invalid pointer dereference from too large syscall numbers. To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.348 src/sys/rump/librump/rumpkern/rump.c:1.349 --- src/sys/rump/librump/rumpkern/rump.c:1.348 Sat May 23 23:42:44 2020 +++ src/sys/rump/librump/rumpkern/rump.c Thu Jun 11 00:33:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.348 2020/05/23 23:42:44 ad Exp $ */ +/* $NetBSD: rump.c,v 1.349 2020/06/11 00:33:30 kamil Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.348 2020/05/23 23:42:44 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.349 2020/06/11 00:33:30 kamil Exp $"); #include #define ELFSIZE ARCH_ELFSIZE @@ -756,7 +756,9 @@ rump_syscall(int num, void *data, size_t p = curproc; e = p->p_emul; #ifndef __HAVE_MINIMAL_EMUL - KASSERT(num > 0 && num < e->e_nsysent); + num &= e->e_nsysent - 1; +#else + num &= SYS_NSYSENT - 1; #endif callp = e->e_sysent + num;
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: kamil Date: Thu Jun 11 00:33:30 UTC 2020 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: Follow the syscall() logic and mask unsupported syscall ranges in rump Avoids invalid pointer dereference from too large syscall numbers. To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/sys/rump/librump/rumpkern/rump.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src
"Maxime Villard" writes: > Module Name: src > Committed By: maxv > Date: Sun Jun 7 09:45:20 UTC 2020 > > Modified Files: > src/etc: MAKEDEV.tmpl > src/sys/arch/amd64/conf: ALL GENERIC > src/sys/conf: files majors > src/sys/kern: files.kern subr_pool.c > Added Files: > src/sys/kern: subr_fault.c > src/sys/sys: fault.h > > Log Message: > Add fault(4). excellent! thank you for this. .mrg.
CVS commit: src/lib/libpthread
Module Name:src
Committed By: ad
Date: Wed Jun 10 22:45:15 UTC 2020
Modified Files:
src/lib/libpthread: pthread.c pthread_cond.c pthread_int.h
pthread_mutex.c pthread_types.h
Log Message:
- Make pthread_condvar and pthread_mutex work on the stack rather than in
pthread_t, so there's less chance of bad things happening if someone calls
(for example) pthread_cond_broadcast() from a signal handler.
- Remove all the deferred waiter handling except for the one case that really
matters which is transferring waiters from condvar -> mutex on wakeup, and
do that by splicing the condvar's waiters onto the mutex.
- Remove the mutex waiters bit as it's another complication that's not
strictly needed.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.73 -r1.74 src/lib/libpthread/pthread_cond.c
cvs rdiff -u -r1.106 -r1.107 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.79 -r1.80 src/lib/libpthread/pthread_mutex.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libpthread/pthread_types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.174 src/lib/libpthread/pthread.c:1.175
--- src/lib/libpthread/pthread.c:1.174 Thu Jun 4 00:45:32 2020
+++ src/lib/libpthread/pthread.c Wed Jun 10 22:45:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.174 2020/06/04 00:45:32 joerg Exp $ */
+/* $NetBSD: pthread.c,v 1.175 2020/06/10 22:45:15 ad Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.174 2020/06/04 00:45:32 joerg Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.175 2020/06/10 22:45:15 ad Exp $");
#define __EXPOSE_STACK 1
@@ -297,11 +297,7 @@ pthread__initthread(pthread_t t)
t->pt_self = t;
t->pt_magic = PT_MAGIC;
- t->pt_willpark = 0;
- t->pt_waiters[0] = 0;
- t->pt_nwaiters = 0;
t->pt_sleepobj = NULL;
- t->pt_signalled = 0;
t->pt_havespecific = 0;
t->pt_lwpctl = __dummy_lwpctl;
@@ -602,48 +598,6 @@ pthread_resume_np(pthread_t thread)
return errno;
}
-/*
- * Wake all deferred waiters hanging off self.
- *
- * It's possible for threads to have called _lwp_exit() before we wake them,
- * because of cancellation and timeout, so ESRCH is tolerated here. If a
- * thread exits and its LID is reused, and the a thread receives an wakeup
- * meant for the previous incarnation of the LID, no harm will be done.
- */
-void
-pthread__clear_waiters(pthread_t self)
-{
- int rv;
-
- pthread__smt_wake();
-
- switch (self->pt_nwaiters) {
- case 0:
- break;
- case 1:
- if (self->pt_willpark) {
- break;
- }
- rv = _lwp_unpark(self->pt_waiters[0], NULL);
- self->pt_waiters[0] = 0;
- self->pt_nwaiters = 0;
- if (rv != 0 && errno != ESRCH) {
- pthread__errorfunc(__FILE__, __LINE__, __func__,
- "_lwp_unpark failed: %d", errno);
- }
- break;
- default:
- rv = _lwp_unpark_all(self->pt_waiters, self->pt_nwaiters, NULL);
- self->pt_waiters[0] = 0;
- self->pt_nwaiters = 0;
- if (rv != 0 && errno != ESRCH) {
- pthread__errorfunc(__FILE__, __LINE__, __func__,
- "_lwp_unpark_all failed: %d", errno);
- }
- break;
- }
-}
-
void
pthread_exit(void *retval)
{
@@ -658,7 +612,6 @@ pthread_exit(void *retval)
self = pthread__self();
/* Disable cancellability. */
- self->pt_willpark = 0;
pthread_mutex_lock(>pt_lock);
self->pt_flags |= PT_FLAG_CS_DISABLED;
self->pt_cancel = 0;
@@ -692,14 +645,10 @@ pthread_exit(void *retval)
if (self->pt_flags & PT_FLAG_DETACHED) {
/* pthread__reap() will drop the lock. */
pthread__reap(self);
- pthread__assert(!self->pt_willpark);
- pthread__clear_waiters(self);
_lwp_exit();
} else {
self->pt_state = PT_STATE_ZOMBIE;
- pthread__assert(!self->pt_willpark);
pthread_mutex_unlock(>pt_lock);
- pthread__clear_waiters(self);
/* Note: name will be freed by the joiner. */
_lwp_exit();
}
@@ -1166,9 +1115,7 @@ pthread__park(pthread_t self, pthread_mu
{
int rv, error;
- self->pt_willpark = 1;
pthread_mutex_unlock(lock);
- self->pt_willpark = 0;
/*
* Wait until we are awoken by a pending unpark operation,
@@ -1194,13 +1141,8 @@ pthread__park(pthread_t self, pthread_mu
* If we deferred unparking a thread, arrange to
* have _lwp_park() restart it before blocking.
*/
- pthread__assert(self->pt_nwaiters <= 1);
- pthread__assert(self->pt_nwaiters != 0 ||
- self->pt_waiters[0] == 0);
error = _lwp_park(CLOCK_REALTIME, TIMER_ABSTIME,
- __UNCONST(abstime), self->pt_waiters[0], NULL, NULL);
- self->pt_waiters[0] = 0;
- self->pt_nwaiters = 0;
+ __UNCONST(abstime), 0, NULL, NULL);
if (error != 0) {
switch (rv = errno) {
case EINTR:
@@ -1230,31 +1172,34 @@ pthread__unpark(pthread_queue_t *queue,
pthread_t target;
target = PTQ_FIRST(queue);
- if
CVS commit: src/lib/libpthread
Module Name:src Committed By: ad Date: Wed Jun 10 22:45:15 UTC 2020 Modified Files: src/lib/libpthread: pthread.c pthread_cond.c pthread_int.h pthread_mutex.c pthread_types.h Log Message: - Make pthread_condvar and pthread_mutex work on the stack rather than in pthread_t, so there's less chance of bad things happening if someone calls (for example) pthread_cond_broadcast() from a signal handler. - Remove all the deferred waiter handling except for the one case that really matters which is transferring waiters from condvar -> mutex on wakeup, and do that by splicing the condvar's waiters onto the mutex. - Remove the mutex waiters bit as it's another complication that's not strictly needed. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/lib/libpthread/pthread.c cvs rdiff -u -r1.73 -r1.74 src/lib/libpthread/pthread_cond.c cvs rdiff -u -r1.106 -r1.107 src/lib/libpthread/pthread_int.h cvs rdiff -u -r1.79 -r1.80 src/lib/libpthread/pthread_mutex.c cvs rdiff -u -r1.24 -r1.25 src/lib/libpthread/pthread_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: ad
Date: Wed Jun 10 22:24:22 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
- Wired/resident stats shouldn't covered by PMAPCOUNTERS.
- Rename need_update_pv -> need_enter_pv.
Ok ryo@
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.76 src/sys/arch/aarch64/aarch64/pmap.c:1.77
--- src/sys/arch/aarch64/aarch64/pmap.c:1.76 Mon Jun 1 02:42:24 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Wed Jun 10 22:24:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.76 2020/06/01 02:42:24 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.77 2020/06/10 22:24:22 ad Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.76 2020/06/01 02:42:24 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.77 2020/06/10 22:24:22 ad Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -1594,7 +1594,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
unsigned int idx;
int error = 0;
const bool user = (pm != pmap_kernel());
- bool need_sync_icache, need_update_pv;
+ bool need_sync_icache, need_enter_pv;
bool l3only = true;
UVMHIST_FUNC(__func__);
@@ -1659,10 +1659,10 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
* pool_cache_get() may call pmap_kenter() internally.
*/
spv = pool_cache_get(&_pmap_pv_pool, PR_NOWAIT);
- need_update_pv = true;
+ need_enter_pv = true;
} else {
spv = NULL;
- need_update_pv = false;
+ need_enter_pv = false;
}
pm_lock(pm);
@@ -1764,12 +1764,12 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
bool need_remove_pv;
KASSERT(!kenter); /* pmap_kenter_pa() cannot override */
-#ifdef PMAPCOUNTERS
- PMAP_COUNT(remappings);
if (opte & LX_BLKPAG_OS_WIRED) {
PMSTAT_DEC_WIRED_COUNT(pm);
}
PMSTAT_DEC_RESIDENT_COUNT(pm);
+#ifdef PMAPCOUNTERS
+ PMAP_COUNT(remappings);
if (user) {
PMAP_COUNT(user_mappings_changed);
} else {
@@ -1784,7 +1784,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
if (pa == l3pte_pa(opte)) {
/* old and new pte have same pa, no need to update pv */
need_remove_pv = (pp == NULL);
- need_update_pv = false;
+ need_enter_pv = false;
if (need_sync_icache && l3pte_executable(opte, user))
need_sync_icache = false;
} else {
@@ -1831,7 +1831,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
flags |= VM_PROT_READ;
mdattr = VM_PROT_READ | VM_PROT_WRITE;
- if (need_update_pv) {
+ if (need_enter_pv) {
error = _pmap_enter_pv(pp, pm, , va, ptep, pa, flags);
if (error != 0) {
/*
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: ad Date: Wed Jun 10 22:24:22 UTC 2020 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: - Wired/resident stats shouldn't covered by PMAPCOUNTERS. - Rename need_update_pv -> need_enter_pv. Ok ryo@ To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/aarch64/aarch64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libpthread
Module Name:src Committed By: ad Date: Wed Jun 10 21:46:50 UTC 2020 Modified Files: src/tests/lib/libpthread: t_cond.c Log Message: Adjust cond_timedwait_race to take account of spurious wakeups (which are completely legit). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libpthread/t_cond.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libpthread
Module Name:src
Committed By: ad
Date: Wed Jun 10 21:46:50 UTC 2020
Modified Files:
src/tests/lib/libpthread: t_cond.c
Log Message:
Adjust cond_timedwait_race to take account of spurious wakeups (which are
completely legit).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libpthread/t_cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libpthread/t_cond.c
diff -u src/tests/lib/libpthread/t_cond.c:1.7 src/tests/lib/libpthread/t_cond.c:1.8
--- src/tests/lib/libpthread/t_cond.c:1.7 Sun Jul 3 14:24:59 2016
+++ src/tests/lib/libpthread/t_cond.c Wed Jun 10 21:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cond.c,v 1.7 2016/07/03 14:24:59 christos Exp $ */
+/* $NetBSD: t_cond.c,v 1.8 2020/06/10 21:46:50 ad Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_cond.c,v 1.7 2016/07/03 14:24:59 christos Exp $");
+__RCSID("$NetBSD: t_cond.c,v 1.8 2020/06/10 21:46:50 ad Exp $");
#include
@@ -329,7 +329,7 @@ pthread_cond_timedwait_func(void *arg)
* Sometimes we catch ESRCH.
* This should never happen.
*/
- ATF_REQUIRE(rv == ETIMEDOUT);
+ ATF_REQUIRE(rv == ETIMEDOUT || rv == 0);
PTHREAD_REQUIRE(pthread_mutex_unlock(_mutex));
}
}
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Jun 10 20:26:53 UTC 2020
Modified Files:
src/share/misc: acronyms
Log Message:
URM
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.301 src/share/misc/acronyms:1.302
--- src/share/misc/acronyms:1.301 Tue Jun 9 19:45:29 2020
+++ src/share/misc/acronyms Wed Jun 10 20:26:52 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.301 2020/06/09 19:45:29 nia Exp $
+$NetBSD: acronyms,v 1.302 2020/06/10 20:26:52 sevan Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -587,6 +587,7 @@ UGT universal greeting time
UPC Universal Product Code
UR your
UR {you're, you are}
+URM underrepresented minority
UTSL use the source, Luke
VCR video cassette recorder
VEG very evil grin
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Jun 10 20:26:53 UTC 2020 Modified Files: src/share/misc: acronyms Log Message: URM To generate a diff of this commit: cvs rdiff -u -r1.301 -r1.302 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx/fdt
Module Name:src Committed By: jmcneill Date: Wed Jun 10 19:30:23 UTC 2020 Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 Removed Files: src/sys/arch/arm/imx/fdt: imx7_platform.c imx7_platform.h Log Message: Use generic platform definition for i.MX7 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/imx/fdt/imx7_platform.c \ src/sys/arch/arm/imx/fdt/imx7_platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/imx/fdt
Module Name:src Committed By: jmcneill Date: Wed Jun 10 19:30:23 UTC 2020 Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 Removed Files: src/sys/arch/arm/imx/fdt: imx7_platform.c imx7_platform.h Log Message: Use generic platform definition for i.MX7 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/imx/fdt/imx7_platform.c \ src/sys/arch/arm/imx/fdt/imx7_platform.h 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/imx/fdt/files.imx6 diff -u src/sys/arch/arm/imx/fdt/files.imx6:1.13 src/sys/arch/arm/imx/fdt/files.imx6:1.14 --- src/sys/arch/arm/imx/fdt/files.imx6:1.13 Wed Jun 10 17:57:50 2020 +++ src/sys/arch/arm/imx/fdt/files.imx6 Wed Jun 10 19:30:23 2020 @@ -1,10 +1,9 @@ -# $NetBSD: files.imx6,v 1.13 2020/06/10 17:57:50 jmcneill Exp $ +# $NetBSD: files.imx6,v 1.14 2020/06/10 19:30:23 jmcneill Exp $ # # Configuration info for the Freescale i.MX6 # file arch/arm/imx/fdt/imx6_platform.c soc_imx -file arch/arm/imx/fdt/imx7_platform.c soc_imx # SOC parameters defflag opt_soc.h SOC_IMX
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Wed Jun 10 19:29:48 UTC 2020 Modified Files: src/sys/arch/arm/fdt: cpu_fdt.c Log Message: If enable-method is missing, try psci To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/fdt/cpu_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Wed Jun 10 19:29:48 UTC 2020
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
If enable-method is missing, try psci
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/fdt/cpu_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/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.35 src/sys/arch/arm/fdt/cpu_fdt.c:1.36
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.35 Fri Feb 21 13:15:54 2020
+++ src/sys/arch/arm/fdt/cpu_fdt.c Wed Jun 10 19:29:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.35 2020/02/21 13:15:54 skrll Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.36 2020/06/10 19:29:48 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "psci_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.35 2020/02/21 13:15:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.36 2020/06/10 19:29:48 jmcneill Exp $");
#include
#include
@@ -191,16 +191,11 @@ arm_fdt_cpu_bootstrap(void)
#ifdef MULTIPROCESSOR
static struct arm_cpu_method *
-arm_fdt_cpu_enable_method(int phandle)
+arm_fdt_cpu_enable_method_byname(const char *method)
{
- const char *method;
-
- method = fdtbus_get_string(phandle, "enable-method");
- if (method == NULL)
- return NULL;
-
__link_set_decl(arm_cpu_methods, struct arm_cpu_method);
struct arm_cpu_method * const *acmp;
+
__link_set_foreach(acmp, arm_cpu_methods) {
if (strcmp(method, (*acmp)->acm_compat) == 0)
return *acmp;
@@ -209,6 +204,18 @@ arm_fdt_cpu_enable_method(int phandle)
return NULL;
}
+static struct arm_cpu_method *
+arm_fdt_cpu_enable_method(int phandle)
+{
+ const char *method;
+
+ method = fdtbus_get_string(phandle, "enable-method");
+ if (method == NULL)
+ return NULL;
+
+ return arm_fdt_cpu_enable_method_byname(method);
+}
+
static int
arm_fdt_cpu_enable(int phandle, struct arm_cpu_method *acm)
{
@@ -251,6 +258,8 @@ arm_fdt_cpu_mpstart(void)
if (acm == NULL)
acm = arm_fdt_cpu_enable_method(cpus);
if (acm == NULL)
+ acm = arm_fdt_cpu_enable_method_byname("psci");
+ if (acm == NULL)
continue;
error = arm_fdt_cpu_enable(child, acm);
CVS commit: src
Module Name:src Committed By: jmcneill Date: Wed Jun 10 18:53:31 UTC 2020 Modified Files: src/distrib/sets/lists/dtb: ad.aarch64 ad.aarch64eb ad.earmv6 ad.earmv6eb ad.earmv6hf ad.earmv6hfeb ad.earmv7 ad.earmv7hf ad.earmv7hfeb src/sys/dtb/arm: Makefile Log Message: Build i.MX7D dtbs for armv7 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/dtb/ad.aarch64 cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/dtb/ad.aarch64eb cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/dtb/ad.earmv6 \ src/distrib/sets/lists/dtb/ad.earmv6eb \ src/distrib/sets/lists/dtb/ad.earmv6hf \ src/distrib/sets/lists/dtb/ad.earmv6hfeb cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/dtb/ad.earmv7 \ src/distrib/sets/lists/dtb/ad.earmv7hf \ src/distrib/sets/lists/dtb/ad.earmv7hfeb cvs rdiff -u -r1.2 -r1.3 src/sys/dtb/arm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jmcneill Date: Wed Jun 10 18:53:31 UTC 2020 Modified Files: src/distrib/sets/lists/dtb: ad.aarch64 ad.aarch64eb ad.earmv6 ad.earmv6eb ad.earmv6hf ad.earmv6hfeb ad.earmv7 ad.earmv7hf ad.earmv7hfeb src/sys/dtb/arm: Makefile Log Message: Build i.MX7D dtbs for armv7 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/dtb/ad.aarch64 cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/dtb/ad.aarch64eb cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/dtb/ad.earmv6 \ src/distrib/sets/lists/dtb/ad.earmv6eb \ src/distrib/sets/lists/dtb/ad.earmv6hf \ src/distrib/sets/lists/dtb/ad.earmv6hfeb cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/dtb/ad.earmv7 \ src/distrib/sets/lists/dtb/ad.earmv7hf \ src/distrib/sets/lists/dtb/ad.earmv7hfeb cvs rdiff -u -r1.2 -r1.3 src/sys/dtb/arm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/dtb/ad.aarch64 diff -u src/distrib/sets/lists/dtb/ad.aarch64:1.2 src/distrib/sets/lists/dtb/ad.aarch64:1.3 --- src/distrib/sets/lists/dtb/ad.aarch64:1.2 Fri May 22 23:58:22 2020 +++ src/distrib/sets/lists/dtb/ad.aarch64 Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2 2020/05/22 23:58:22 rin Exp $ +# $NetBSD: ad.aarch64,v 1.3 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb Index: src/distrib/sets/lists/dtb/ad.aarch64eb diff -u src/distrib/sets/lists/dtb/ad.aarch64eb:1.1 src/distrib/sets/lists/dtb/ad.aarch64eb:1.2 --- src/distrib/sets/lists/dtb/ad.aarch64eb:1.1 Fri May 22 23:59:01 2020 +++ src/distrib/sets/lists/dtb/ad.aarch64eb Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64eb,v 1.1 2020/05/22 23:59:01 rin Exp $ +# $NetBSD: ad.aarch64eb,v 1.2 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb Index: src/distrib/sets/lists/dtb/ad.earmv6 diff -u src/distrib/sets/lists/dtb/ad.earmv6:1.3 src/distrib/sets/lists/dtb/ad.earmv6:1.4 --- src/distrib/sets/lists/dtb/ad.earmv6:1.3 Fri May 22 23:58:22 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6 Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv6,v 1.3 2020/05/22 23:58:22 rin Exp $ +# $NetBSD: ad.earmv6,v 1.4 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb Index: src/distrib/sets/lists/dtb/ad.earmv6eb diff -u src/distrib/sets/lists/dtb/ad.earmv6eb:1.3 src/distrib/sets/lists/dtb/ad.earmv6eb:1.4 --- src/distrib/sets/lists/dtb/ad.earmv6eb:1.3 Fri May 22 23:58:22 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6eb Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv6eb,v 1.3 2020/05/22 23:58:22 rin Exp $ +# $NetBSD: ad.earmv6eb,v 1.4 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb Index: src/distrib/sets/lists/dtb/ad.earmv6hf diff -u src/distrib/sets/lists/dtb/ad.earmv6hf:1.3 src/distrib/sets/lists/dtb/ad.earmv6hf:1.4 --- src/distrib/sets/lists/dtb/ad.earmv6hf:1.3 Fri May 22 23:58:22 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6hf Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv6hf,v 1.3 2020/05/22 23:58:22 rin Exp $ +# $NetBSD: ad.earmv6hf,v 1.4 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb Index: src/distrib/sets/lists/dtb/ad.earmv6hfeb diff -u src/distrib/sets/lists/dtb/ad.earmv6hfeb:1.3 src/distrib/sets/lists/dtb/ad.earmv6hfeb:1.4 --- src/distrib/sets/lists/dtb/ad.earmv6hfeb:1.3 Fri May 22 23:58:22 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6hfeb Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv6hfeb,v 1.3 2020/05/22 23:58:22 rin Exp $ +# $NetBSD: ad.earmv6hfeb,v 1.4 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb Index: src/distrib/sets/lists/dtb/ad.earmv7 diff -u src/distrib/sets/lists/dtb/ad.earmv7:1.4 src/distrib/sets/lists/dtb/ad.earmv7:1.5 --- src/distrib/sets/lists/dtb/ad.earmv7:1.4 Sat May 23 13:24:08 2020 +++ src/distrib/sets/lists/dtb/ad.earmv7 Wed Jun 10 18:53:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv7,v 1.4 2020/05/23 13:24:08 skrll Exp $ +# $NetBSD: ad.earmv7,v 1.5 2020/06/10 18:53:31 jmcneill Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb @@ -222,6 +222,23 @@ ./boot/dtb/imx6qp-tx6qp-8137.dtb dtb-base-boot dtb ./boot/dtb/imx6qp-wandboard-revd1.dtbdtb-base-boot dtb ./boot/dtb/imx6qp-zii-rdu2.dtb dtb-base-boot dtb +./boot/dtb/imx7d-cl-som-imx7.dtb dtb-base-boot dtb +./boot/dtb/imx7d-colibri-emmc-eval-v3.dtbdtb-base-boot dtb +./boot/dtb/imx7d-colibri-eval-v3.dtb
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Wed Jun 10 17:57:50 UTC 2020 Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 imx6_clk.c imx_ccm.c imx_ccm.h imx_ccm_composite.c imx_ccm_gate.c src/sys/arch/evbarm/conf: GENERIC Added Files: src/sys/arch/arm/imx/fdt: imx7_platform.c imx7_platform.h imx7d_ccm.c imx7d_ccm.h imx_ccm_div.c imx_ccm_mux.c imx_ccm_pll.c Log Message: FDT-ize i.MX7. I don't have a board so this has only been tested on QEMU. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/fdt/imx6_clk.c \ src/sys/arch/arm/imx/fdt/imx_ccm.c src/sys/arch/arm/imx/fdt/imx_ccm.h \ src/sys/arch/arm/imx/fdt/imx_ccm_composite.c \ src/sys/arch/arm/imx/fdt/imx_ccm_gate.c cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/fdt/imx7_platform.c \ src/sys/arch/arm/imx/fdt/imx7_platform.h \ src/sys/arch/arm/imx/fdt/imx7d_ccm.c src/sys/arch/arm/imx/fdt/imx7d_ccm.h \ src/sys/arch/arm/imx/fdt/imx_ccm_div.c \ src/sys/arch/arm/imx/fdt/imx_ccm_mux.c \ src/sys/arch/arm/imx/fdt/imx_ccm_pll.c cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/conf/GENERIC 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/imx/fdt/files.imx6 diff -u src/sys/arch/arm/imx/fdt/files.imx6:1.12 src/sys/arch/arm/imx/fdt/files.imx6:1.13 --- src/sys/arch/arm/imx/fdt/files.imx6:1.12 Wed Jun 3 13:14:01 2020 +++ src/sys/arch/arm/imx/fdt/files.imx6 Wed Jun 10 17:57:50 2020 @@ -1,30 +1,40 @@ -# $NetBSD: files.imx6,v 1.12 2020/06/03 13:14:01 jmcneill Exp $ +# $NetBSD: files.imx6,v 1.13 2020/06/10 17:57:50 jmcneill Exp $ # # Configuration info for the Freescale i.MX6 # file arch/arm/imx/fdt/imx6_platform.c soc_imx +file arch/arm/imx/fdt/imx7_platform.c soc_imx # SOC parameters defflag opt_soc.h SOC_IMX defflag opt_soc.h SOC_IMX6DL: SOC_IMX defflag opt_soc.h SOC_IMX6Q: SOC_IMX defflag opt_soc.h SOC_IMX6QDL: SOC_IMX +defflag opt_soc.h SOC_IMX7D: SOC_IMX # Clock -device imxccm: clk -attach imxccm at fdt -file arch/arm/imx/imx6_ccm.c imxccm -file arch/arm/imx/fdt/imx6_clk.c imxccm +device imx6ccm: clk +attach imx6ccm at fdt +file arch/arm/imx/imx6_ccm.c imx6ccm +file arch/arm/imx/fdt/imx6_clk.c imx6ccm # Common FDT clock framework define imx_ccm: clk file arch/arm/imx/fdt/imx_ccm.c imx_ccm -file arch/arm/imx/fdt/imx_ccm_extclk.c imx_ccm -file arch/arm/imx/fdt/imx_ccm_gate.c imx_ccm file arch/arm/imx/fdt/imx_ccm_composite.c imx_ccm +file arch/arm/imx/fdt/imx_ccm_div.c imx_ccm +file arch/arm/imx/fdt/imx_ccm_extclk.c imx_ccm file arch/arm/imx/fdt/imx_ccm_fixed.c imx_ccm file arch/arm/imx/fdt/imx_ccm_fixed_factor.c imx_ccm +file arch/arm/imx/fdt/imx_ccm_gate.c imx_ccm +file arch/arm/imx/fdt/imx_ccm_mux.c imx_ccm +file arch/arm/imx/fdt/imx_ccm_pll.c imx_ccm + +# CCM (iMX7D) +device imx7dccm: imx_ccm +attach imx7dccm at fdt with imx7d_ccm +file arch/arm/imx/fdt/imx7d_ccm.c imx7d_ccm # CCM (iMX8MQ) device imx8mqccm: imx_ccm Index: src/sys/arch/arm/imx/fdt/imx6_clk.c diff -u src/sys/arch/arm/imx/fdt/imx6_clk.c:1.1 src/sys/arch/arm/imx/fdt/imx6_clk.c:1.2 --- src/sys/arch/arm/imx/fdt/imx6_clk.c:1.1 Wed Jul 24 13:12:33 2019 +++ src/sys/arch/arm/imx/fdt/imx6_clk.c Wed Jun 10 17:57:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_clk.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $ */ +/* $NetBSD: imx6_clk.c,v 1.2 2020/06/10 17:57:50 jmcneill Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.2 2020/06/10 17:57:50 jmcneill Exp $"); #include "opt_fdt.h" @@ -86,7 +86,7 @@ imx6_clk_fixed_from_fdt(const char *name static int imxccm_match(device_t, cfdata_t, void *); static void imxccm_attach(device_t, device_t, void *); -CFATTACH_DECL_NEW(imxccm, sizeof(struct imxccm_softc), +CFATTACH_DECL_NEW(imx6ccm, sizeof(struct imxccm_softc), imxccm_match, imxccm_attach, NULL, NULL); static int Index: src/sys/arch/arm/imx/fdt/imx_ccm.c diff -u src/sys/arch/arm/imx/fdt/imx_ccm.c:1.1 src/sys/arch/arm/imx/fdt/imx_ccm.c:1.2 --- src/sys/arch/arm/imx/fdt/imx_ccm.c:1.1 Wed Jan 15 01:09:56 2020 +++ src/sys/arch/arm/imx/fdt/imx_ccm.c Wed Jun 10 17:57:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: imx_ccm.c,v 1.1 2020/01/15 01:09:56 jmcneill Exp $ */ +/* $NetBSD: imx_ccm.c,v 1.2 2020/06/10 17:57:50 jmcneill Exp $ */ /*- * Copyright (c) 2020 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: imx_ccm.c,v 1.1 2020/01/15 01:09:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx_ccm.c,v 1.2 2020/06/10 17:57:50 jmcneill Exp $"); #include #include @@ -215,7 +215,7 @@
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Wed Jun 10 17:57:50 UTC 2020 Modified Files: src/sys/arch/arm/imx/fdt: files.imx6 imx6_clk.c imx_ccm.c imx_ccm.h imx_ccm_composite.c imx_ccm_gate.c src/sys/arch/evbarm/conf: GENERIC Added Files: src/sys/arch/arm/imx/fdt: imx7_platform.c imx7_platform.h imx7d_ccm.c imx7d_ccm.h imx_ccm_div.c imx_ccm_mux.c imx_ccm_pll.c Log Message: FDT-ize i.MX7. I don't have a board so this has only been tested on QEMU. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/fdt/files.imx6 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/fdt/imx6_clk.c \ src/sys/arch/arm/imx/fdt/imx_ccm.c src/sys/arch/arm/imx/fdt/imx_ccm.h \ src/sys/arch/arm/imx/fdt/imx_ccm_composite.c \ src/sys/arch/arm/imx/fdt/imx_ccm_gate.c cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/fdt/imx7_platform.c \ src/sys/arch/arm/imx/fdt/imx7_platform.h \ src/sys/arch/arm/imx/fdt/imx7d_ccm.c src/sys/arch/arm/imx/fdt/imx7d_ccm.h \ src/sys/arch/arm/imx/fdt/imx_ccm_div.c \ src/sys/arch/arm/imx/fdt/imx_ccm_mux.c \ src/sys/arch/arm/imx/fdt/imx_ccm_pll.c cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/cobalt
Module Name:src Committed By: tsutsui Date: Wed Jun 10 16:56:22 UTC 2020 Modified Files: src/usr.sbin/sysinst/arch/cobalt: md.c Log Message: MBR type for Ext2 should be MBR_PTYPE_LNXEXT2, not MBR_PTYPE_FAT12. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/arch/cobalt/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/cobalt
Module Name:src
Committed By: tsutsui
Date: Wed Jun 10 16:56:22 UTC 2020
Modified Files:
src/usr.sbin/sysinst/arch/cobalt: md.c
Log Message:
MBR type for Ext2 should be MBR_PTYPE_LNXEXT2, not MBR_PTYPE_FAT12.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/arch/cobalt/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/cobalt/md.c
diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.12 src/usr.sbin/sysinst/arch/cobalt/md.c:1.13
--- src/usr.sbin/sysinst/arch/cobalt/md.c:1.12 Mon Jan 27 21:21:22 2020
+++ src/usr.sbin/sysinst/arch/cobalt/md.c Wed Jun 10 16:56:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.12 2020/01/27 21:21:22 martin Exp $ */
+/* $NetBSD: md.c,v 1.13 2020/06/10 16:56:22 tsutsui Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -281,7 +281,7 @@ md_parts_use_wholedisk(struct disk_parti
struct disk_part_info boot_part = {
.size = PART_BOOT / 512,
.fs_type = PART_BOOT_TYPE,
- .fs_sub_type = MBR_PTYPE_FAT12,
+ .fs_sub_type = MBR_PTYPE_LNXEXT2,
.last_mounted = PART_BOOT_MOUNT,
};
CVS commit: src/usr.sbin/sysinst/arch/cobalt
Module Name:src Committed By: tsutsui Date: Wed Jun 10 16:26:33 UTC 2020 Modified Files: src/usr.sbin/sysinst/arch/cobalt: md.h Log Message: Change mountpoint of boot ext2fs from /stand to /ext2 to avoid conflict. Should be pulled up to netbsd-9, with fixes of PR/55060. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/cobalt/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/cobalt
Module Name:src Committed By: tsutsui Date: Wed Jun 10 16:26:33 UTC 2020 Modified Files: src/usr.sbin/sysinst/arch/cobalt: md.h Log Message: Change mountpoint of boot ext2fs from /stand to /ext2 to avoid conflict. Should be pulled up to netbsd-9, with fixes of PR/55060. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/cobalt/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/arch/cobalt/md.h diff -u src/usr.sbin/sysinst/arch/cobalt/md.h:1.5 src/usr.sbin/sysinst/arch/cobalt/md.h:1.6 --- src/usr.sbin/sysinst/arch/cobalt/md.h:1.5 Wed Dec 11 19:23:38 2019 +++ src/usr.sbin/sysinst/arch/cobalt/md.h Wed Jun 10 16:26:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2019/12/11 19:23:38 martin Exp $ */ +/* $NetBSD: md.h,v 1.6 2020/06/10 16:26:33 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,7 +49,7 @@ #define PART_BOOT_MIN (1 * 1024 * 1024) /* 1MB minimum */ #define PART_BOOT_TYPE FS_EX2FS #define PART_BOOT_SUBT 1 /* use "old" ext2 */ -#define PART_BOOT_MOUNT "/stand" +#define PART_BOOT_MOUNT "/ext2" /* default partition size */ #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */
CVS commit: src/sys/arch
Module Name:src
Committed By: simonb
Date: Wed Jun 10 07:34:19 UTC 2020
Modified Files:
src/sys/arch/evbmips/cavium: autoconf.c
src/sys/arch/mips/cavium/dev: if_cnmac.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/cavium/autoconf.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/cavium/dev/if_cnmac.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/evbmips/cavium/autoconf.c
diff -u src/sys/arch/evbmips/cavium/autoconf.c:1.5 src/sys/arch/evbmips/cavium/autoconf.c:1.6
--- src/sys/arch/evbmips/cavium/autoconf.c:1.5 Sun May 31 04:56:35 2020
+++ src/sys/arch/evbmips/cavium/autoconf.c Wed Jun 10 07:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.5 2020/05/31 04:56:35 simonb Exp $ */
+/* $NetBSD: autoconf.c,v 1.6 2020/06/10 07:34:19 simonb Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2020/05/31 04:56:35 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2020/06/10 07:34:19 simonb Exp $");
#include
#include
@@ -131,17 +131,17 @@ prop_set_cnmac(device_t dev)
enaddr[3] = (mac_lo >> 16) & 0xff;
enaddr[4] = (mac_lo >> 8) & 0xff;
enaddr[5] = mac_lo & 0xff;
- pd = prop_data_create_data(enaddr, ETHER_ADDR_LEN);
+ pd = prop_data_create_copy(enaddr, ETHER_ADDR_LEN);
KASSERT(pd != NULL);
prop_dictionary_set_and_rel(dict, "mac-address", pd);
/* ethernet phy address */
switch (octeon_btinfo.obt_board_type) {
case BOARD_TYPE_UBIQUITI_E100:
- pn = prop_number_create_integer(0x07 - unit);
+ pn = prop_number_create_signed(0x07 - unit);
break;
default:
- pn = prop_number_create_integer(-1);
+ pn = prop_number_create_signed(-1);
break;
}
KASSERT(pn != NULL);
@@ -157,12 +157,12 @@ prop_set_octeon_gmx(device_t dev)
/* ethernet rgmii phy dependent timing parameter. */
switch (octeon_btinfo.obt_board_type) {
case BOARD_TYPE_UBIQUITI_E100:
- tx = prop_number_create_integer(16);
- rx = prop_number_create_integer(0);
+ tx = prop_number_create_signed(16);
+ rx = prop_number_create_signed(0);
break;
default:
- tx = prop_number_create_integer(0);
- rx = prop_number_create_integer(0);
+ tx = prop_number_create_signed(0);
+ rx = prop_number_create_signed(0);
break;
}
KASSERT(tx != NULL);
Index: src/sys/arch/mips/cavium/dev/if_cnmac.c
diff -u src/sys/arch/mips/cavium/dev/if_cnmac.c:1.20 src/sys/arch/mips/cavium/dev/if_cnmac.c:1.21
--- src/sys/arch/mips/cavium/dev/if_cnmac.c:1.20 Fri Jun 5 09:18:35 2020
+++ src/sys/arch/mips/cavium/dev/if_cnmac.c Wed Jun 10 07:34:19 2020
@@ -1,8 +1,8 @@
-/* $NetBSD: if_cnmac.c,v 1.20 2020/06/05 09:18:35 simonb Exp $ */
+/* $NetBSD: if_cnmac.c,v 1.21 2020/06/10 07:34:19 simonb Exp $ */
#include
#if 0
-__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.20 2020/06/05 09:18:35 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.21 2020/06/10 07:34:19 simonb Exp $");
#endif
#include "opt_octeon.h"
@@ -408,10 +408,10 @@ cnmac_attach(device_t parent, device_t s
clk = prop_dictionary_get(dict, "rgmii-tx");
KASSERT(clk != NULL);
- sc->sc_gmx_port->sc_clk_tx_setting = prop_number_integer_value(clk);
+ sc->sc_gmx_port->sc_clk_tx_setting = prop_number_signed_value(clk);
clk = prop_dictionary_get(dict, "rgmii-rx");
KASSERT(clk != NULL);
- sc->sc_gmx_port->sc_clk_rx_setting = prop_number_integer_value(clk);
+ sc->sc_gmx_port->sc_clk_rx_setting = prop_number_signed_value(clk);
}
/* submodules */
@@ -505,7 +505,7 @@ cnmac_board_mac_addr(uint8_t *enaddr, si
KASSERT(dict != NULL);
ea = prop_dictionary_get(dict, "mac-address");
KASSERT(ea != NULL);
- memcpy(enaddr, prop_data_data_nocopy(ea), size);
+ memcpy(enaddr, prop_data_value(ea), size);
}
/* media */
@@ -562,7 +562,7 @@ cnmac_mediainit(struct cnmac_softc *sc)
phy = prop_dictionary_get(device_properties(sc->sc_dev), "phy-addr");
KASSERT(phy != NULL);
- mii_attach(sc->sc_dev, mii, 0x, prop_number_integer_value(phy),
+ mii_attach(sc->sc_dev, mii, 0x, prop_number_signed_value(phy),
MII_OFFSET_ANY, MIIF_DOPAUSE);
/* XXX XXX XXX */
CVS commit: src/sys/arch
Module Name:src Committed By: simonb Date: Wed Jun 10 07:34:19 UTC 2020 Modified Files: src/sys/arch/evbmips/cavium: autoconf.c src/sys/arch/mips/cavium/dev: if_cnmac.c Log Message: Update for proplib(3) API changes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/cavium/autoconf.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/cavium/dev/if_cnmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
