From owner-svn-src-stable-12@freebsd.org Wed Sep 9 22:59:48 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 595C53E00B2; Wed, 9 Sep 2020 22:59:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BmyC81mCBz43V9; Wed, 9 Sep 2020 22:59:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F7A68E6D; Wed, 9 Sep 2020 22:59:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 089MxmcP039618; Wed, 9 Sep 2020 22:59:48 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 089Mxldo039615; Wed, 9 Sep 2020 22:59:47 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009092259.089Mxldo039615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 9 Sep 2020 22:59:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365540 - in stable/12: . sbin/devd sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in stable/12: . sbin/devd sys/kern X-SVN-Commit-Revision: 365540 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2020 22:59:48 -0000 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); }