From nobody Sun Feb 18 14:38:48 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 4Td7Zw3yPrz59qpt; Sun, 18 Feb 2024 14:38:48 +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 4Td7Zw3RZnz3xxn; Sun, 18 Feb 2024 14:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267128; 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=mJnHAX2VihfzE+8sejHts1tsdFRyLaLn2Eo2vsxchus=; b=DuRqIoanhW7II4COxd43Q6yZxdXzJ+bTNe4jsYsJd65Xb7jNlm6agXVjkuhpoHtc4B1HYE bxLEiXx6213Lfi9sXCdKbdHBgfcrkejy53WIou0V1EjZDV6amSv+UdhEfHqPrb55mtdwR0 m6tDGa4e8HroEzc0XQjWKDju3DP6HdYqAqUaHR4cx4o/meRvTFCFy4mtWIynHT6/42vOVD f4CrQ7ZDJ6HGHaxLSwe3XdlubGDZUT8Eelx1yUPgFC6pPUnhKotlDoMwjnhLXEzgg0JTzy AJ0L3Yjhe/5kWiQPB29OxQAZiN+qq6OLJ23bAcX5lD5JXG7Fw6oZiK8YofWbOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267128; 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=mJnHAX2VihfzE+8sejHts1tsdFRyLaLn2Eo2vsxchus=; b=lfzLnD0fmEeRhPlkWnDbGqDLfr5zdrZthvWFmmbOepD4SbLUN9UiAIzalroxLRFdd11JT+ p5O3kiyqypoSNT/6d6PLRctgY6wojuAvmXFCUKnWj6eNTRCKFpmK6OgkL0og8cqicVE2SD 0gzmi5ZhrooEF3gFsTu7fKSEYU9DchQ3FyH3TUPJYt5Chv7ykrJCmQLznmldz/UR06H2FW N4+Hl2/713/vu53/dRj/yyDjYRR/U2iwsTetCdW5RcRxSlxq9MkzX6UDDIPWzyJl3RLt4v y2Gbc0GhQcvw19l/NKA8mHKAzcpk41ALPF8Fo9qXG3lJ/ef/GKj9aUfz4KbDew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708267128; a=rsa-sha256; cv=none; b=GV6TPK98kBa+rTn6x11BuNVFUZ3+Lo46U94E0BPCjnIAG1uLPaf3lhSt/DsSH+x1DZYbN7 hEFtQ+Et040WsjhKD2XA1WatAn48Xk7nUo4q+V3ShRQ5gamdu/0XvQfQWwMv6lM3Ynq76G sZ9PiQkRd3mrrdnl8+pPsLq0Mzb9Bo1FyYQdxowsrTW63+tki/+EGuf4WMfKofPTx4twzZ w8AYAgPiMtDuXjBke25gMh9U5I+4tZUrLWoxDAQ4Xm/p7lxgSXFeLBIxzjGEBGJ147WjZF ycidfmcJJ584bQ3eS5DolPHRowvKHrDZAoSh8rmWERS4RrqHmK6ramF6ipsogw== 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 4Td7Zw2SKZzvQp; Sun, 18 Feb 2024 14:38:48 +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 41IEcmoC040847; Sun, 18 Feb 2024 14:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IEcm9Z040844; Sun, 18 Feb 2024 14:38:48 GMT (envelope-from git) Date: Sun, 18 Feb 2024 14:38:48 GMT Message-Id: <202402181438.41IEcm9Z040844@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: 0f354b2b588b - main - psci: split off psci_reboot from psci_shutdown 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: 0f354b2b588b60e2ef119ff2f480f7905c5db587 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=0f354b2b588b60e2ef119ff2f480f7905c5db587 commit 0f354b2b588b60e2ef119ff2f480f7905c5db587 Author: Andriy Gapon AuthorDate: 2021-07-09 15:01:57 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 14:38:27 +0000 psci: split off psci_reboot from psci_shutdown Priority of psci_reboot set so that it is run after shutdown_panic is executed. This is to provide uniform experience with other platforms. MFC after: 3 weeks --- sys/dev/psci/psci.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index 0c8f094e0037..e1e9c1880b54 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -124,7 +124,6 @@ static struct ofw_compat_data compat_data[] = { #endif static int psci_attach(device_t, psci_initfn_t, int); -static void psci_shutdown(void *, int); static int psci_find_callfn(psci_callfn_t *); static int psci_def_callfn(register_t, register_t, register_t, register_t, @@ -471,12 +470,24 @@ psci_shutdown(void *xsc, int howto) if (psci_softc == NULL) return; - /* PSCI system_off and system_reset werent't supported in v0.1. */ if ((howto & RB_POWEROFF) != 0) fn = psci_softc->psci_fnids[PSCI_FN_SYSTEM_OFF]; - else if ((howto & RB_HALT) == 0) - fn = psci_softc->psci_fnids[PSCI_FN_SYSTEM_RESET]; + if (fn) + psci_call(fn, 0, 0, 0); + + /* System reset and off do not return. */ +} +static void +psci_reboot(void *xsc, int howto) +{ + uint32_t fn = 0; + + if (psci_softc == NULL) + return; + + if ((howto & RB_HALT) == 0) + fn = psci_softc->psci_fnids[PSCI_FN_SYSTEM_RESET]; if (fn) psci_call(fn, 0, 0, 0); @@ -487,7 +498,7 @@ void psci_reset(void) { - psci_shutdown(NULL, 0); + psci_reboot(NULL, 0); } #ifdef FDT @@ -585,6 +596,10 @@ psci_v0_2_init(device_t dev, int default_version) EVENTHANDLER_REGISTER(shutdown_final, psci_shutdown, sc, SHUTDOWN_PRI_LAST); + /* Handle reboot after shutdown_panic. */ + EVENTHANDLER_REGISTER(shutdown_final, psci_reboot, sc, + SHUTDOWN_PRI_LAST + 150); + return (0); }