From nobody Sat Mar 16 15:16:16 2024 X-Original-To: dev-commits-src-branches@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 4Txl7h621Hz5F1Qv; Sat, 16 Mar 2024 15:16:16 +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 4Txl7h35F3z4Fyp; Sat, 16 Mar 2024 15:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710602176; 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=1c9Vsr56Ifzw0ezQ+oNp/aMXX3G8WYdOyMVRs7+J37E=; b=OrEVbRG1+TnKhHpUgGKvBN8IIAmXQapud3wT6XqgtJV50OM1qr1jmNQZMeNK7Z+kGy8O18 csZWkM2QwHisVLWc1VxiWlSLLZAGy5zfxgIRNU01rN4A4dnWPw7hELdGCTLQQMTgRlNIk6 gGZ+LRr18qZhMH9P3G4rx+++oxNhJnlfwIN4Vy9AXN75wQEKbvy3BkSJtdyq4TbfJZ2M4R RbaBn5GNbA5j9tUsp/7WvuRNF9Yi6NPo4GoA2lbihyX5tS2N3AcffajBeiVxnvNsRM1nrP T/JMszI35ZKwUrDOIThUrY/CdVK2yRYg1gWn1/1YAwMEQzQ853AteHawGAATyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710602176; a=rsa-sha256; cv=none; b=SwyTKAXQuH2DNicHiog/lt6/THOMHhg6IPivgZRfK29dzTFKWxTQTF8fnx/6wcB1sDYGw9 c646GIWRmQb2VpBhXYnOdHKY08QJO+Ut5lQT3Ia7XVaN/nhUBqp3VUgs95EXpyACspnBPh jCCsw29OSpRxvCRNeHskKAA/TtKD5wZZTvg13NwaCuSEJG41Cx/rlkD3BGPusQlHfOAHoL Kxkcw9EngmF4nm97wY7Kdct+euBSuBB5aNNr7F2Lk7b9Lh+OpLX8ySD6YhTUWCqdJmgFbJ OaMFq8PjZKiKqS4EhRjDo3l1JfCg/A5nZJsdjJZnZ6Feg6uD+ukH2Q9TsquqPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710602176; 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=1c9Vsr56Ifzw0ezQ+oNp/aMXX3G8WYdOyMVRs7+J37E=; b=USZ2AsDdKtdm4PgwZIdpHFcXZXQ44DHduiA38VsXn9rBpMx0no5/e/43+lTJnwSq2v+7iq QwK0jIXBa0GxR13wJEK+rirkH4+fHaAjfqJnW1LsxIwHGplg1sD52mHUtS36mLVFDT5lRl 1cLQPfLSjOuAftqhZhzbNOTtg3VwJ2E+u9BB8ODoKkfAL82kPWc2GiZ/iGBZSi02B9dlsl D4XSloqkRQhwsZzdLqIaOv4nHdVNwAhgKRJSUWlS4caX8VOqQHgTOWf4wD+t9v4FPTNen8 H/24hM0TdSVbAruNwuc06qSiGyhrBMcG+lnBbzSXEjHcfDS74LS2jkJFX4QFFw== 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 4Txl7h2cDrz10xk; Sat, 16 Mar 2024 15:16:16 +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 42GFGG7R062717; Sat, 16 Mar 2024 15:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42GFGGXQ062714; Sat, 16 Mar 2024 15:16:16 GMT (envelope-from git) Date: Sat, 16 Mar 2024 15:16:16 GMT Message-Id: <202403161516.42GFGGXQ062714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 721b91d1715e - stable/14 - syscon_power: do reboot after shutdown_panic is executed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 721b91d1715e3844b0372a2fc42c70853b91fa46 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=721b91d1715e3844b0372a2fc42c70853b91fa46 commit 721b91d1715e3844b0372a2fc42c70853b91fa46 Author: Andriy Gapon AuthorDate: 2021-07-09 15:00:21 +0000 Commit: Andriy Gapon CommitDate: 2024-03-16 15:14:09 +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. (cherry picked from commit 5f7312a0d70c607afa9ce24ccd757321d043e02c) --- sys/dev/extres/syscon/syscon_power.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/extres/syscon/syscon_power.c b/sys/dev/extres/syscon/syscon_power.c index 9626adb52890..201d140963d2 100644 --- a/sys/dev/extres/syscon/syscon_power.c +++ b/sys/dev/extres/syscon/syscon_power.c @@ -162,9 +162,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); }