From nobody Fri Dec 08 22:03:06 2023 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 4Sn4rq15cMz53V0m; Fri, 8 Dec 2023 22:03:07 +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 4Sn4rq0WTSz4Srx; Fri, 8 Dec 2023 22:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702072987; 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=9joOvh9nzUZzYS/minJpFtFEJvb7+pO740QSK5vhvsw=; b=vQSuRRtyrZfUHpxy8TpcZ1WnZiLk9X7X/gMnzYcqCQTN8FTYLm59ExS+hHCYQm5pODIc/U 2BAWhMy2h4OEMv5k2zu95zQWWKb63cbKzKFO41PRGraQw+ioXQ0CJg8or9I3xuY5kptjtZ 07wGpJmrNLgIyhoJyI1yoGZI1RN4VCIyN4pJZuhWbQ0UpM8DyAnWbsBP1upsb5yk2gqE29 kCliOxB0V8Nl+Z7+gnVbEIreGuCjLwF1U5698RRSJk8OIq+lOxqhWjEaPuuvOG6riL9DES jipF3HNQmjz4H7ZF785Sx0Qnd+gfq9PDSJTpnQs3sUR57tSoJu/2ZfS09pSXsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702072987; a=rsa-sha256; cv=none; b=OiuTzPDD3dFG50IaalrdlGsL0oQ4Zw4EYPXp79uarQ5OD9qWfwu30n/TBK6H3TG/4e6VOf SYyAsB/PO3IT4yQ4+v5fbBO5mdv0anvt/3wjb63i2puruoI5CacX5Eht9G3c2yYDEWwoLU 1HRgGNdvvxDQMJ2grb1kd8H0z3ShzUDVEsGa4FCQjx/vZn9V8cq7ehtnzq5SwB/8OKMP7O CihiIbDwX7ZD/7CHxVX809V6MHnXPjDqmCTiJxeeJcT0R089aOeuMamgwg4/uGAKXVRNOr pWishuOPbkRzpegEX2yu4bT/3OE1wIFgSsFPzE61DaVHBStbrDGkz5lmIdXCxQ== 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=1702072987; 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=9joOvh9nzUZzYS/minJpFtFEJvb7+pO740QSK5vhvsw=; b=gFTvn0r8WqbjVDHdl6qIevgn2bibHOtXXkHzCgxfdMG63qkDT6WwDdoO5UJJEbp7fDfru/ yH6ccLi2tR3CyJfII+jLaWJ1ef/5v/CP3ZmCbh4roO9Z1SlHY7QCIkNItaZd1SwKGMoou5 YRM8W1YL7qY5vOweMdk7D/a3XVXP3L7cuoi+36dht3uXaBrGrNXDj882yRW6N/k92N1gBr hqpaivIPV5d4EB8AYK24N0yAEv+dgmzeEU/3JQ0kT8hgACXo7xM7WnLx+4b7WO+5JlQJVp cSm5rwt5MB726EnwqjaQ09X0mMrKWO8cvyYuOxTb+eQqRj3sSyOsqOHx6zDhHA== 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 4Sn4rp6lFhzf2k; Fri, 8 Dec 2023 22:03:06 +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 3B8M3698020932; Fri, 8 Dec 2023 22:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8M36fv020929; Fri, 8 Dec 2023 22:03:06 GMT (envelope-from git) Date: Fri, 8 Dec 2023 22:03:06 GMT Message-Id: <202312082203.3B8M36fv020929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: aaebd6d069f5 - stable/14 - powerpc: better handling of shutdown flags 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aaebd6d069f50d5524157fcac5253280ce3a8156 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=aaebd6d069f50d5524157fcac5253280ce3a8156 commit aaebd6d069f50d5524157fcac5253280ce3a8156 Author: Mitchell Horne AuthorDate: 2023-11-23 15:25:05 +0000 Commit: Mitchell Horne CommitDate: 2023-12-08 22:02:44 +0000 powerpc: better handling of shutdown flags RB_HALT does not mean poweroff, RB_POWEROFF does. Reviewed by: jhibbits MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42339 (cherry picked from commit 41e26e8288f1743c8584e5f9c461d36dce1cccc6) --- sys/powerpc/powermac/cuda.c | 8 +++++++- sys/powerpc/powermac/pmu.c | 6 ++++-- sys/powerpc/powermac/smu.c | 6 ++++-- sys/powerpc/powernv/opal_dev.c | 6 ++++-- sys/powerpc/pseries/rtas_dev.c | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c index 974ad585b543..97f60f269559 100644 --- a/sys/powerpc/powermac/cuda.c +++ b/sys/powerpc/powermac/cuda.c @@ -748,7 +748,13 @@ cuda_shutdown(void *xsc, int howto) struct cuda_softc *sc = xsc; uint8_t cmd[] = {CUDA_PSEUDO, 0}; - cmd[1] = (howto & RB_HALT) ? CMD_POWEROFF : CMD_RESET; + if ((howto & RB_POWEROFF) != 0) + cmd[1] = CMD_POWEROFF; + else if ((howto & RB_HALT) == 0) + cmd[1] = CMD_RESET; + else + return; + cuda_poll(sc->sc_dev); cuda_send(sc, 1, 2, cmd); diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c index 67ef57bf6be8..f9d9d4d40c72 100644 --- a/sys/powerpc/powermac/pmu.c +++ b/sys/powerpc/powermac/pmu.c @@ -812,10 +812,12 @@ pmu_shutdown(void *xsc, int howto) struct pmu_softc *sc = xsc; uint8_t cmd[] = {'M', 'A', 'T', 'T'}; - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) pmu_send(sc, PMU_POWER_OFF, 4, cmd, 0, NULL); - else + else if ((howto & RB_HALT) == 0) pmu_send(sc, PMU_RESET_CPU, 0, NULL, 0, NULL); + else + return; for (;;); } diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c index 5aed7b87d3c2..af00599e6b54 100644 --- a/sys/powerpc/powermac/smu.c +++ b/sys/powerpc/powermac/smu.c @@ -1317,10 +1317,12 @@ smu_shutdown(void *xdev, int howto) struct smu_cmd cmd; cmd.cmd = SMU_POWER; - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) strcpy(cmd.data, "SHUTDOWN"); - else + else if ((howto & RB_HALT) == 0) strcpy(cmd.data, "RESTART"); + else + return; cmd.len = strlen(cmd.data); diff --git a/sys/powerpc/powernv/opal_dev.c b/sys/powerpc/powernv/opal_dev.c index edb8f6d435ad..ab1a1fbb731c 100644 --- a/sys/powerpc/powernv/opal_dev.c +++ b/sys/powerpc/powernv/opal_dev.c @@ -344,10 +344,12 @@ static void opal_shutdown(void *arg, int howto) { - if (howto & RB_HALT) + if ((howto & RB_POWEROFF) != 0) opal_call(OPAL_CEC_POWER_DOWN, 0 /* Normal power off */); - else + else if ((howto & RB_HALT) == 0) opal_call(OPAL_CEC_REBOOT); + else + return; opal_call(OPAL_RETURN_CPU); } diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c index ef9522f5495d..f8198ef27417 100644 --- a/sys/powerpc/pseries/rtas_dev.c +++ b/sys/powerpc/pseries/rtas_dev.c @@ -155,13 +155,13 @@ rtas_shutdown(void *arg, int howto) { cell_t token, status; - if (howto & RB_HALT) { + if ((howto & RB_POWEROFF) != 0) { token = rtas_token_lookup("power-off"); if (token == -1) return; rtas_call_method(token, 2, 1, 0, 0, &status); - } else { + } else if ((howto & RB_HALT) == 0) { token = rtas_token_lookup("system-reboot"); if (token == -1) return;