From nobody Sun Feb 18 14:38:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Td7Zx5MKMz59qsV; Sun, 18 Feb 2024 14:38:49 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Td7Zx4Zqlz3xgp; Sun, 18 Feb 2024 14:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxT/x8xQwLqK5xyt1yvtN1x+8G+QCNz7fE5BNgJ4Up4=; b=WuTIgtnk8tlcyZlqz5vxPzsAYxg0Udg1sbtVSpHGQangCf50BkMRV7oSGE8ERjPyG1n/GH QOUCmzFjBnS9iYiAu/2hEBtsdul9vx2YNqgjx9rt/grc4RO8HbSNsAaulY0ILcNpyCzBUR S7PtdmCc+n41YIY8uSMKuGS31yCwAHYfw/3pP3ah9hl4Jpxy/dVKo1rO6BGhVusaOmHTfa x4Wv8myeXr9pyOE0eAt8yQE4x/nIiimb3vPTu5e8vFs4xIvZ+yBaXIRRwri68nJSncRTp8 l8P1jC3e1ocXnqdTtia/FUYYMeK1ceoIbnQ0ZFbe0nQ/6o6/SzxN7xet+fMc+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxT/x8xQwLqK5xyt1yvtN1x+8G+QCNz7fE5BNgJ4Up4=; b=VBVSe05nyz+Bj9Fl7uA+YAtQr4mEbtapOp758bOxesqR6MEnOs/aeA0223RkY+/pSo14+Z zTy5ZOEiRy2FMQxpv+d/LQn9L7NIRT7j2A15zVF48A8ixmZFaPWiiHWVOFfF6hCOOmBIDZ 7AkkOxFV9sXXn2/zWHM3oIAVjkgviXDXVYcMoFbAHioIQSuWLrjBtk42h647qXoHdD0CoE 3pQsZYX3jas2sh5RZ5KHlfZsx7+3k6FreQb3TOvsOIqCcd/L46zQpMATGjpO4KVcR7huov 9SBljxTkS7x8txzXLBQfPXn7XxeVIUAFidFbiY6QIEC4l5lDzgtAGzmRIfKbBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708267129; a=rsa-sha256; cv=none; b=PTwB+A0PemiWr9lfwRh0/YbbFn3WwfTnghQ3zuEKcggzXiusHXHcX+W+I7ruiNtdEyxKah UestoHy3ZGWusOSIcJipDfV9VR6yuGFmGJzCuM2y2l1i2tcmJlimy++U2D+5QmfBchLpF8 KvSCATVp3mkGAo8Gd2SMy6edYW/RdDPr+OI1VT+1Xr7JC3N4XYpugSskEgSMDvPVKExm0q 9FVtAhWkaxwzq2wruxaA+qLUzxXmSYzJ9g1g4IsvuAptgqml3zzJ91SRxUo6VOagkfj9LC tUYj+8lwzkUi319yQ/mxblZTIbj4FMaY+RGZ9a3+GFPCMsBeM3OcAo6Q1b76Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td7Zx3flQzvTF; Sun, 18 Feb 2024 14:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41IEcnbd040902; Sun, 18 Feb 2024 14:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IEcnCx040899; Sun, 18 Feb 2024 14:38:49 GMT (envelope-from git) Date: Sun, 18 Feb 2024 14:38:49 GMT Message-Id: <202402181438.41IEcnCx040899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 5f7312a0d70c - main - syscon_power: do reboot after shutdown_panic is executed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f7312a0d70c607afa9ce24ccd757321d043e02c Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7312a0d70c607afa9ce24ccd757321d043e02c commit 5f7312a0d70c607afa9ce24ccd757321d043e02c Author: Andriy Gapon AuthorDate: 2021-07-09 15:00:21 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 14:38:27 +0000 syscon_power: do reboot after shutdown_panic is executed A syscon_power instance can handle either poweroff or reboot, but not both. If the instance handles reboot then set its priority to be after shutdown_panic. This is to provide uniform experience with other platforms. MFC after: 3 weeks --- sys/dev/syscon/syscon_power.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/syscon/syscon_power.c b/sys/dev/syscon/syscon_power.c index 365dc0252417..6897cf3df422 100644 --- a/sys/dev/syscon/syscon_power.c +++ b/sys/dev/syscon/syscon_power.c @@ -161,9 +161,11 @@ syscon_power_attach(device_t dev) OF_getencprop(node, "value", &sc->value, sizeof(sc->value)); } + /* Handle reboot after shutdown_panic. */ sc->reboot = ofw_bus_is_compatible(dev, "syscon-reboot"); sc->shutdown_tag = EVENTHANDLER_REGISTER(shutdown_final, - syscon_power_shutdown_final, dev, SHUTDOWN_PRI_LAST); + syscon_power_shutdown_final, dev, + sc->reboot ? SHUTDOWN_PRI_LAST + 150 : SHUTDOWN_PRI_LAST); return (0); }