svn commit: r365540 - in stable/12: . sbin/devd sys/kern

[Warner Losh]

Author: imp
Date: Wed Sep  9 22:59:47 2020
New Revision: 365540
URL: https://svnweb.freebsd.org/changeset/base/365540

Log:
  MFC r364725, r364726
  
  r364725 | imp | 2020-08-24 13:35:15 -0600 (Mon, 24 Aug 2020) | 9 lines
  
  Change the resume notification event from 'kern' to 'kernel'
  
  We have both a system of 'kern' and of 'kernel'. Prefer the latter and
  convert this notification to use 'kernel' instead of 'kern'. As a
  transition period, continue to also generate the 'kern' notification
  until sometime after FreeBSD 13 is branched.
  
  r364726 | imp | 2020-08-24 13:35:27 -0600 (Mon, 24 Aug 2020) | 4 lines
  
  Document the kern -> kernel name change for resume events.
  
  Relnotes:	YES

Modified:
  stable/12/UPDATING
  stable/12/sbin/devd/devd.conf.5
  stable/12/sys/kern/subr_bus.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/UPDATING
==============================================================================
--- stable/12/UPDATING	Wed Sep  9 22:54:09 2020	(r365539)
+++ stable/12/UPDATING	Wed Sep  9 22:59:47 2020	(r365540)
@@ -16,6 +16,12 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20200909:
+	The resume code now notifies devd with the 'kernel' system
+	rather than the old 'kern' subsystem to be consistent with
+	other use. The old notification will be created as well, but
+	will be removed prior to FreeBSD 14.0.
+
 20200722:
 	Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
 	been upgraded to 10.0.1.  Please see the 20141231 entry below for

Modified: stable/12/sbin/devd/devd.conf.5
==============================================================================
--- stable/12/sbin/devd/devd.conf.5	Wed Sep  9 22:54:09 2020	(r365539)
+++ stable/12/sbin/devd/devd.conf.5	Wed Sep  9 22:59:47 2020	(r365540)
@@ -466,6 +466,8 @@ provider size has changed.
 .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description"
 .It Li kern Ta Li power Ta Li resume Ta
 Notification that the system has woken from the suspended state.
+Note: this notification is deprecated and will be removed in
+.Fx 14.0 .
 .El
 .Pp
 .Pp
@@ -473,6 +475,8 @@ Notification that the system has woken from the suspen
 .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description"
 .It Li kernel Ta Li signal Ta Li coredump Ta
 Notification that a process has crashed and dumped core.
+.It Li kernel Ta Li power Ta Li resume Ta
+Notification that the system has woken from the suspended state.
 .El
 .Pp
 .Bl -column "System" "Subsystem" "1234567" -compact

Modified: stable/12/sys/kern/subr_bus.c
==============================================================================
--- stable/12/sys/kern/subr_bus.c	Wed Sep  9 22:54:09 2020	(r365539)
+++ stable/12/sys/kern/subr_bus.c	Wed Sep  9 22:59:47 2020	(r365540)
@@ -5024,8 +5024,10 @@ root_resume(device_t dev)
 	int error;
 
 	error = bus_generic_resume(dev);
-	if (error == 0)
-		devctl_notify("kern", "power", "resume", NULL);
+	if (error == 0) {
+		devctl_notify("kern", "power", "resume", NULL); /* Deprecated gone in 14 */
+		devctl_notify("kernel", "power", "resume", NULL);
+	}
 	return (error);
 }