CVS commit: src/share/man/man9

2022-03-04 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Mar  5 06:55:58 UTC 2022

Modified Files:
src/share/man/man9: usbnet.9

Log Message:
usbnet(9): Clarify uno_stop contract in man page.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/usbnet.9

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



CVS commit: src/share/man/man9

2022-03-04 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Mar  5 06:55:58 UTC 2022

Modified Files:
src/share/man/man9: usbnet.9

Log Message:
usbnet(9): Clarify uno_stop contract in man page.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/usbnet.9

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

Modified files:

Index: src/share/man/man9/usbnet.9
diff -u src/share/man/man9/usbnet.9:1.16 src/share/man/man9/usbnet.9:1.17
--- src/share/man/man9/usbnet.9:1.16	Sat Mar  5 06:55:49 2022
+++ src/share/man/man9/usbnet.9	Sat Mar  5 06:55:58 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: usbnet.9,v 1.16 2022/03/05 06:55:49 riastradh Exp $
+.\"	$NetBSD: usbnet.9,v 1.17 2022/03/05 06:55:58 riastradh Exp $
 .\"
 .\" Copyright (c) 2019 Matthew R. Green
 .\" All rights reserved.
@@ -355,7 +355,8 @@ Stop hardware activity
 .Pq optional .
 Called under
 .Xr IFNET_LOCK 9
-when bringing the interface down, except when the device is detaching.
+when bringing the interface down, but skipped when the device is
+detaching.
 .It Ft int Fn (*uno_ioctl) "struct ifnet *ifp" "u_long cmd" "void *data"
 Handle driver-specific ioctls
 .Pq optional .



CVS commit: src

2022-03-04 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Mar  5 06:55:49 UTC 2022

Modified Files:
src/share/man/man9: usbnet.9
src/sys/dev/usb: usbnet.c

Log Message:
usbnet(9): uno_init is now optional.

Update assertion and man page accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man9/usbnet.9
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/usbnet.c

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



CVS commit: src

2022-03-04 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Mar  5 06:55:49 UTC 2022

Modified Files:
src/share/man/man9: usbnet.9
src/sys/dev/usb: usbnet.c

Log Message:
usbnet(9): uno_init is now optional.

Update assertion and man page accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man9/usbnet.9
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/usbnet.c

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

Modified files:

Index: src/share/man/man9/usbnet.9
diff -u src/share/man/man9/usbnet.9:1.15 src/share/man/man9/usbnet.9:1.16
--- src/share/man/man9/usbnet.9:1.15	Thu Mar  3 05:57:05 2022
+++ src/share/man/man9/usbnet.9	Sat Mar  5 06:55:49 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: usbnet.9,v 1.15 2022/03/03 05:57:05 riastradh Exp $
+.\"	$NetBSD: usbnet.9,v 1.16 2022/03/05 06:55:49 riastradh Exp $
 .\"
 .\" Copyright (c) 2019 Matthew R. Green
 .\" All rights reserved.
@@ -378,8 +378,8 @@ internally by
 May or may not be called under
 .Xr IFNET_LOCK 9 .
 .It Ft int Fn (*uno_init) "struct ifnet *ifp"
-Initialize hardware activity.
-Required.
+Initialize hardware activity
+.Pq optional .
 Called under
 .Xr IFNET_LOCK 9
 when bringing the interface up.

Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.93 src/sys/dev/usb/usbnet.c:1.94
--- src/sys/dev/usb/usbnet.c:1.93	Thu Mar  3 06:06:52 2022
+++ src/sys/dev/usb/usbnet.c	Sat Mar  5 06:55:49 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbnet.c,v 1.93 2022/03/03 06:06:52 riastradh Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.94 2022/03/05 06:55:49 riastradh Exp $	*/
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.93 2022/03/03 06:06:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.94 2022/03/05 06:55:49 riastradh Exp $");
 
 #include 
 #include 
@@ -1385,7 +1385,6 @@ usbnet_attach(struct usbnet *un)
 	/* Required inputs.  */
 	KASSERT(un->un_ops->uno_tx_prepare);
 	KASSERT(un->un_ops->uno_rx_loop);
-	KASSERT(un->un_ops->uno_init);
 	KASSERT(un->un_rx_bufsz);
 	KASSERT(un->un_tx_bufsz);
 	KASSERT(un->un_rx_list_cnt);



CVS commit: src/usr.bin/make

2022-03-04 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Fri Mar  4 23:17:16 UTC 2022

Modified Files:
src/usr.bin/make: meta.c suff.c
src/usr.bin/make/filemon: filemon_dev.c

Log Message:
Fix some unused warnings


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/usr.bin/make/meta.c
cvs rdiff -u -r1.365 -r1.366 src/usr.bin/make/suff.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/filemon/filemon_dev.c

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



CVS commit: src/usr.bin/make

2022-03-04 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Fri Mar  4 23:17:16 UTC 2022

Modified Files:
src/usr.bin/make: meta.c suff.c
src/usr.bin/make/filemon: filemon_dev.c

Log Message:
Fix some unused warnings


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/usr.bin/make/meta.c
cvs rdiff -u -r1.365 -r1.366 src/usr.bin/make/suff.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/filemon/filemon_dev.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.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.198 src/usr.bin/make/meta.c:1.199
--- src/usr.bin/make/meta.c:1.198	Wed Feb  9 21:28:57 2022
+++ src/usr.bin/make/meta.c	Fri Mar  4 23:17:16 2022
@@ -1,4 +1,4 @@
-/*  $NetBSD: meta.c,v 1.198 2022/02/09 21:28:57 rillig Exp $ */
+/*  $NetBSD: meta.c,v 1.199 2022/03/04 23:17:16 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -668,7 +668,7 @@ meta_job_start(Job *job, GNode *gn)
  * It does not disturb our state.
  */
 void
-meta_job_child(Job *job)
+meta_job_child(Job *job MAKE_ATTR_UNUSED)
 {
 #ifdef USE_FILEMON
 BuildMon *pbm;
@@ -693,7 +693,7 @@ meta_job_child(Job *job)
 }
 
 void
-meta_job_parent(Job *job, pid_t pid)
+meta_job_parent(Job *job MAKE_ATTR_UNUSED, pid_t pid MAKE_ATTR_UNUSED)
 {
 #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV)
 BuildMon *pbm;
@@ -710,7 +710,7 @@ meta_job_parent(Job *job, pid_t pid)
 }
 
 int
-meta_job_fd(Job *job)
+meta_job_fd(Job *job MAKE_ATTR_UNUSED)
 {
 #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV)
 BuildMon *pbm;
@@ -728,7 +728,7 @@ meta_job_fd(Job *job)
 }
 
 int
-meta_job_event(Job *job)
+meta_job_event(Job *job MAKE_ATTR_UNUSED)
 {
 #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV)
 BuildMon *pbm;

Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.365 src/usr.bin/make/suff.c:1.366
--- src/usr.bin/make/suff.c:1.365	Thu Mar  3 19:55:27 2022
+++ src/usr.bin/make/suff.c	Fri Mar  4 23:17:16 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.365 2022/03/03 19:55:27 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.366 2022/03/04 23:17:16 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
 #include "dir.h"
 
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.365 2022/03/03 19:55:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.366 2022/03/04 23:17:16 sjg Exp $");
 
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
@@ -1019,7 +1019,7 @@ Candidate_New(char *name, char *prefix, 
 /*ARGSUSED*/
 static void
 CandidateList_Add(CandidateList *list, char *srcName, Candidate *targ,
-		  Suffix *suff, const char *debug_tag)
+		  Suffix *suff, const char *debug_tag MAKE_ATTR_UNUSED)
 {
 	Candidate *cand = Candidate_New(srcName, targ->prefix, suff, targ,
 	NULL);

Index: src/usr.bin/make/filemon/filemon_dev.c
diff -u src/usr.bin/make/filemon/filemon_dev.c:1.8 src/usr.bin/make/filemon/filemon_dev.c:1.9
--- src/usr.bin/make/filemon/filemon_dev.c:1.8	Mon Feb  1 21:09:25 2021
+++ src/usr.bin/make/filemon/filemon_dev.c	Fri Mar  4 23:17:16 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: filemon_dev.c,v 1.8 2021/02/01 21:09:25 rillig Exp $	*/
+/*	$NetBSD: filemon_dev.c,v 1.9 2022/03/04 23:17:16 sjg Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -46,6 +46,10 @@
 #define _PATH_FILEMON	"/dev/filemon"
 #endif
 
+#ifndef MAKE_ATTR_UNUSED
+#define MAKE_ATTR_UNUSED__attribute__((__unused__))
+#endif
+
 struct filemon {
 	int	fd;
 };
@@ -101,7 +105,7 @@ filemon_setfd(struct filemon *F, int fd)
 }
 
 void
-filemon_setpid_parent(struct filemon *F, pid_t pid)
+filemon_setpid_parent(struct filemon *F MAKE_ATTR_UNUSED, pid_t pid MAKE_ATTR_UNUSED)
 {
 	/* Nothing to do!  */
 }
@@ -137,14 +141,14 @@ filemon_close(struct filemon *F)
 }
 
 int
-filemon_readfd(const struct filemon *F)
+filemon_readfd(const struct filemon *F MAKE_ATTR_UNUSED)
 {
 
 	return -1;
 }
 
 int
-filemon_process(struct filemon *F)
+filemon_process(struct filemon *F MAKE_ATTR_UNUSED)
 {
 
 	return 0;



CVS commit: src

2022-03-04 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Fri Mar  4 21:12:04 UTC 2022

Modified Files:
src/sys/arch/evbmips/conf: files.sbmips
src/sys/arch/sbmips/conf: files.sbmips
src/sys/kern: kern_entropy.c
src/usr.bin/rpcgen: rpc_main.c

Log Message:
fix few typos in comments for word "because".


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/files.sbmips
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sbmips/conf/files.sbmips
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_entropy.c
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/rpcgen/rpc_main.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/conf/files.sbmips
diff -u src/sys/arch/evbmips/conf/files.sbmips:1.4 src/sys/arch/evbmips/conf/files.sbmips:1.5
--- src/sys/arch/evbmips/conf/files.sbmips:1.4	Wed Aug 21 04:17:40 2019
+++ src/sys/arch/evbmips/conf/files.sbmips	Fri Mar  4 21:12:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbmips,v 1.4 2019/08/21 04:17:40 msaitoh Exp $
+# $NetBSD: files.sbmips,v 1.5 2022/03/04 21:12:03 andvar Exp $
 
 maxpartitions 8
 
@@ -89,7 +89,7 @@ file	dev/isa/i82365_isasubr.c	pcic_isa |
 #
 # Machine-independent PCMCIA drivers
 #
-#XXXCGD can't yet becaue needs fdc include "dev/pcmcia/files.pcmcia"
+#XXXCGD can't yet because needs fdc include "dev/pcmcia/files.pcmcia"
 #
 # Machine-independent USB device support
 #

Index: src/sys/arch/sbmips/conf/files.sbmips
diff -u src/sys/arch/sbmips/conf/files.sbmips:1.17 src/sys/arch/sbmips/conf/files.sbmips:1.18
--- src/sys/arch/sbmips/conf/files.sbmips:1.17	Wed Aug 21 04:17:41 2019
+++ src/sys/arch/sbmips/conf/files.sbmips	Fri Mar  4 21:12:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbmips,v 1.17 2019/08/21 04:17:41 msaitoh Exp $
+# $NetBSD: files.sbmips,v 1.18 2022/03/04 21:12:03 andvar Exp $
 
 maxpartitions 8
 
@@ -90,7 +90,7 @@ file	dev/isa/i82365_isasubr.c	pcic_isa |
 #
 # Machine-independent PCMCIA drivers
 #
-#XXXCGD can't yet becaue needs fdc include "dev/pcmcia/files.pcmcia"
+#XXXCGD can't yet because needs fdc include "dev/pcmcia/files.pcmcia"
 #
 # Machine-independent USB device support
 #

Index: src/sys/kern/kern_entropy.c
diff -u src/sys/kern/kern_entropy.c:1.33 src/sys/kern/kern_entropy.c:1.34
--- src/sys/kern/kern_entropy.c:1.33	Sun Sep 26 15:10:51 2021
+++ src/sys/kern/kern_entropy.c	Fri Mar  4 21:12:03 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_entropy.c,v 1.33 2021/09/26 15:10:51 thorpej Exp $	*/
+/*	$NetBSD: kern_entropy.c,v 1.34 2022/03/04 21:12:03 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.33 2021/09/26 15:10:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.34 2022/03/04 21:12:03 andvar Exp $");
 
 #include 
 #include 
@@ -126,7 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_entropy
  *	Per-CPU entropy state.  The pool is allocated separately
  *	because percpu(9) sometimes moves per-CPU objects around
  *	without zeroing them, which would lead to unwanted copies of
- *	sensitive secrets.  The evcnt is allocated separately becuase
+ *	sensitive secrets.  The evcnt is allocated separately because
  *	evcnt(9) assumes it stays put in memory.
  */
 struct entropy_cpu {

Index: src/usr.bin/rpcgen/rpc_main.c
diff -u src/usr.bin/rpcgen/rpc_main.c:1.44 src/usr.bin/rpcgen/rpc_main.c:1.45
--- src/usr.bin/rpcgen/rpc_main.c:1.44	Sun Sep 20 16:57:13 2015
+++ src/usr.bin/rpcgen/rpc_main.c	Fri Mar  4 21:12:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_main.c,v 1.44 2015/09/20 16:57:13 kamil Exp $	*/
+/*	$NetBSD: rpc_main.c,v 1.45 2022/03/04 21:12:04 andvar Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_main.c,v 1.44 2015/09/20 16:57:13 kamil Exp $");
+__RCSID("$NetBSD: rpc_main.c,v 1.45 2022/03/04 21:12:04 andvar Exp $");
 #endif
 #endif
 
@@ -527,7 +527,7 @@ generate_guard(const char *pathname)
 	}
 
 	/*
-	 * Can't have a '_' or '.' at the front of a symbol name, beacuse it
+	 * Can't have a '_' or '.' at the front of a symbol name, because it
 	 * will end up as "__".
 	 *
 	 * Prefix it with "RPCGEN_".



CVS commit: src

2022-03-04 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Fri Mar  4 21:12:04 UTC 2022

Modified Files:
src/sys/arch/evbmips/conf: files.sbmips
src/sys/arch/sbmips/conf: files.sbmips
src/sys/kern: kern_entropy.c
src/usr.bin/rpcgen: rpc_main.c

Log Message:
fix few typos in comments for word "because".


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/files.sbmips
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sbmips/conf/files.sbmips
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_entropy.c
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/rpcgen/rpc_main.c

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



CVS commit: src/sys/dev/fdt

2022-03-04 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Mar  4 08:19:07 UTC 2022

Modified Files:
src/sys/dev/fdt: fdtbus.c fdtvar.h files.fdt
Added Files:
src/sys/dev/fdt: fdt_mbox.c fdt_powerdomain.c

Log Message:
Add mailbox and power-domain support.

power-domain support is very rudimentary.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/fdt_mbox.c \
src/sys/dev/fdt/fdt_powerdomain.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/fdt/files.fdt

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



CVS commit: src/sys/dev/fdt

2022-03-04 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Mar  4 08:19:07 UTC 2022

Modified Files:
src/sys/dev/fdt: fdtbus.c fdtvar.h files.fdt
Added Files:
src/sys/dev/fdt: fdt_mbox.c fdt_powerdomain.c

Log Message:
Add mailbox and power-domain support.

power-domain support is very rudimentary.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/fdt_mbox.c \
src/sys/dev/fdt/fdt_powerdomain.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/fdt/files.fdt

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/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.45 src/sys/dev/fdt/fdtbus.c:1.46
--- src/sys/dev/fdt/fdtbus.c:1.45	Sat Jan 22 11:49:17 2022
+++ src/sys/dev/fdt/fdtbus.c	Fri Mar  4 08:19:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.45 2022/01/22 11:49:17 thorpej Exp $ */
+/* $NetBSD: fdtbus.c,v 1.46 2022/03/04 08:19:06 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.45 2022/01/22 11:49:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.46 2022/03/04 08:19:06 skrll Exp $");
 
 #include 
 #include 
@@ -468,6 +468,8 @@ fdt_pre_attach(struct fdt_node *node)
 		aprint_debug_dev(node->n_bus,
 		"failed to set %s config on %s: %d\n",
 		cfgname, node->n_name, error);
+
+	fdtbus_powerdomain_enable(node->n_phandle);
 }
 
 static void

Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.76 src/sys/dev/fdt/fdtvar.h:1.77
--- src/sys/dev/fdt/fdtvar.h:1.76	Wed Feb 23 08:56:11 2022
+++ src/sys/dev/fdt/fdtvar.h	Fri Mar  4 08:19:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.76 2022/02/23 08:56:11 skrll Exp $ */
+/* $NetBSD: fdtvar.h,v 1.77 2022/03/04 08:19:06 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -157,6 +157,20 @@ struct fdtbus_iommu_func {
 };
 
 
+struct fdtbus_mbox_channel {
+	struct fdtbus_mbox_controller *mb_ctlr;
+	void *mb_priv;
+};
+
+struct fdtbus_mbox_controller_func {
+	void *	(*mc_acquire)(device_t, const void *, size_t, void (*)(void *),
+			  void *);
+	void	(*mc_release)(device_t, void *);
+	int	(*mc_recv)(device_t, void *, void *, size_t);
+	int	(*mc_send)(device_t, void *, const void *, size_t);
+};
+
+
 struct fdtbus_mmc_pwrseq;
 
 struct fdtbus_mmc_pwrseq_func {
@@ -201,6 +215,13 @@ struct fdtbus_power_controller_func {
 };
 
 
+struct fdtbus_powerdomain_controller;
+
+struct fdtbus_powerdomain_controller_func {
+	void 	(*pdc_enable)(device_t, const uint32_t *, bool);
+};
+
+
 struct fdtbus_pwm_controller_func {
 	pwm_tag_t (*get_tag)(device_t, const void *, size_t);
 };
@@ -306,12 +327,16 @@ int		fdtbus_register_interrupt_controlle
 		const struct fdtbus_interrupt_controller_func *);
 int		fdtbus_register_iommu(device_t, int,
 		const struct fdtbus_iommu_func *);
+int		fdtbus_register_mbox_controller(device_t, int,
+		const struct fdtbus_mbox_controller_func *);
 int		fdtbus_register_mmc_pwrseq(device_t, int,
 		const struct fdtbus_mmc_pwrseq_func *);
 int		fdtbus_register_pinctrl_config(device_t, int,
 		const struct fdtbus_pinctrl_controller_func *);
 int		fdtbus_register_power_controller(device_t, int,
 		const struct fdtbus_power_controller_func *);
+int		fdtbus_register_powerdomain_controller(device_t, int,
+		const struct fdtbus_powerdomain_controller_func *);
 int		fdtbus_register_phy_controller(device_t, int,
 		const struct fdtbus_phy_controller_func *);
 int		fdtbus_register_pwm_controller(device_t, int,
@@ -392,6 +417,15 @@ int		fdtbus_intr_parent(int);
 bus_dma_tag_t	fdtbus_iommu_map(int, u_int, bus_dma_tag_t);
 bus_dma_tag_t	fdtbus_iommu_map_pci(int, uint32_t, bus_dma_tag_t);
 
+struct fdtbus_mbox_channel *
+		fdtbus_mbox_get(int, const char *, void (*)(void *), void *);
+struct fdtbus_mbox_channel *
+		fdtbus_mbox_get_index(int, u_int, void (*)(void *),
+		void *);
+int		fdtbus_mbox_send(struct fdtbus_mbox_channel *, const void *, size_t);
+int		fdtbus_mbox_recv(struct fdtbus_mbox_channel *, void *, size_t);
+void		fdtbus_mbox_put(struct fdtbus_mbox_channel *);
+
 struct fdtbus_mmc_pwrseq *
 		fdtbus_mmc_pwrseq_get(int);
 void		fdtbus_mmc_pwrseq_pre_power_on(struct fdtbus_mmc_pwrseq *);
@@ -447,6 +481,11 @@ int		fdtbus_todr_attach(device_t, int, t
 void		fdtbus_power_reset(void);
 void		fdtbus_power_poweroff(void);
 
+int		fdtbus_powerdomain_enable(int);
+int		fdtbus_powerdomain_enable_index(int, int);
+int		fdtbus_powerdomain_disable(int);
+int		fdtbus_powerdomain_disable_index(int, int);
+
 struct syscon *	fdtbus_syscon_acquire(int, const char *);
 struct syscon *	fdtbus_syscon_lookup(int);
 

Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.62 src/sys/dev/fdt/files.fdt:1.63
--- src/sys/dev/fdt/files.fdt:1.62	Sat Sep  4 12:34:39 

CVS commit: src/sys/uvm/pmap

2022-03-04 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Mar  4 08:11:48 UTC 2022

Modified Files:
src/sys/uvm/pmap: pmap_tlb.c

Log Message:
Rmmove an incorrect KASSERT.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/uvm/pmap/pmap_tlb.c

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



CVS commit: src/sys/uvm/pmap

2022-03-04 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Mar  4 08:11:48 UTC 2022

Modified Files:
src/sys/uvm/pmap: pmap_tlb.c

Log Message:
Rmmove an incorrect KASSERT.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/uvm/pmap/pmap_tlb.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/uvm/pmap/pmap_tlb.c
diff -u src/sys/uvm/pmap/pmap_tlb.c:1.51 src/sys/uvm/pmap/pmap_tlb.c:1.52
--- src/sys/uvm/pmap/pmap_tlb.c:1.51	Sun Jan  2 16:03:30 2022
+++ src/sys/uvm/pmap/pmap_tlb.c	Fri Mar  4 08:11:48 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_tlb.c,v 1.51 2022/01/02 16:03:30 christos Exp $	*/
+/*	$NetBSD: pmap_tlb.c,v 1.52 2022/03/04 08:11:48 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.51 2022/01/02 16:03:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.52 2022/03/04 08:11:48 skrll Exp $");
 
 /*
  * Manages address spaces in a TLB.
@@ -547,9 +547,6 @@ pmap_tlb_shootdown_process(void)
 {
 	struct cpu_info * const ci = curcpu();
 	struct pmap_tlb_info * const ti = cpu_tlb_info(ci);
-#ifdef DIAGNOSTIC
-	struct pmap * const pm = curlwp->l_proc->p_vmspace->vm_map.pmap;
-#endif
 
 	KASSERT(cpu_intr_p());
 	KASSERTMSG(ci->ci_cpl >= IPL_SCHED, "%s: cpl (%d) < IPL_SCHED (%d)",
@@ -580,7 +577,6 @@ pmap_tlb_shootdown_process(void)
 			 * next called for this pmap, it will allocate a new
 			 * ASID.
 			 */
-			KASSERT(!pmap_tlb_intersecting_onproc_p(pm, ti));
 			pmap_tlb_pai_reset(ti, pai, PAI_PMAP(pai, ti));
 		}
 		break;