From nobody Tue Jan 24 22:11:04 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 4P1h4m3TNTz3bfFx; Tue, 24 Jan 2023 22:11:04 +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 4P1h4m2R6Pz4MBB; Tue, 24 Jan 2023 22:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598264; 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=70n4ghoKckkZWi0N168ZQAZpUBQh307njnX3bELHENk=; b=dlzg39msWtzEkPUnP36S94aqu3sAyU/sVXyw7bbOiw/JQ0vch+BmhXnvXx+5Wnd5W4GSOd TAFK9wzemGUS0YGFxlS1XhU0JFjdk11kL1YEeL34omQSFddV/ZMhkcMFVJ8d1lYBPZCbnB Sj7EAhCqbDuBpfeJFzm551TYRIGTHWt+59AN0ngZn0kZsYuF9VajT1VzTyh/qxz9rmERtF xaFKbLCriYmSGGqV7Qj0uk7HT+e/G1bnIiEJHcChDQjT8mfJww6L+gAz7V3r64fYTDXNF4 fT9F69CGGpIM3Vepm5/Wbx36OnsqX5DGKJlOnEuDDw0yk4Whjctdjqu0r46IvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598264; 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=70n4ghoKckkZWi0N168ZQAZpUBQh307njnX3bELHENk=; b=mL9XjmGMJFzS8nVBJJYvxH2nOL4ShuK0wn3xHpwcF3CUwPFQt8QVrYGAeQS58AYqrElR4F K+rvJxiyWmcQqU41jzHIHcFH6YbdA56yLqxkRaDFe6iHiTNsSumJiGQWe5T845Qi84q8fk PSslD5nQdHXYCNEzVXspDJ3e0s+7WZWsidiktbJKy1vBb9dLZBpeKIUCM7TtXdMVzq5ZZO p9HHoPvXBjlKRsZOsBfGzuXr6IkYCBnhKvvIOgNS8cJiNu9WJiuHbpk+gQFFk7A3t1QPZx pji0r6f455friTSHvJo/HpNuSouRZlrSW/GIChIdxgqwyMF+tjkGjsy5K4FZyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598264; a=rsa-sha256; cv=none; b=jiXwDP0AOIKLqb7WHKOL7u25oNBIIKanmsqrw6ECBQWrcEXohbDq91oBRLpsExEKinnx3G cVarLsHqHkuY9wn9wbS7Aw6lVfmqw4PyuJEHLDOG91tjw03RoqU/M4Pn0BKrQOJggbrMH0 8c/ooJq2wSlgYj9eWKcU86uAlnfMv/f+0AhvFvqCqC3R9iQubx2cPVr5IzeE2wyE3YKzX0 V6DZ6unl4U8VNo2G/6eGlpjYb/PWfdeywZvbW0iaiZBwb4rv7XaIx0bCBksAClwO+Z/uWe GF7npG9Su/jTASl62gY+m4xnjH01e+J3iPxdzPctkclimpiMfjyEdF6uunyz1g== 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 4P1h4m1YNvzQ1V; Tue, 24 Jan 2023 22:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMB4nN083416; Tue, 24 Jan 2023 22:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMB4ej083415; Tue, 24 Jan 2023 22:11:04 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:04 GMT Message-Id: <202301242211.30OMB4ej083415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 067fa78a99d6 - stable/13 - kboot: Use #defines for magic reboot constants 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 067fa78a99d61f099a0f522798b1b0fe0e121915 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=067fa78a99d61f099a0f522798b1b0fe0e121915 commit 067fa78a99d61f099a0f522798b1b0fe0e121915 Author: Warner Losh AuthorDate: 2022-06-28 14:44:16 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:24 +0000 kboot: Use #defines for magic reboot constants Sponsored by: Netflix (cherry picked from commit 8fa9263f67eb78c8ded9bd3d94c9c841cd0b6ba3) --- stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 4 ++-- stand/kboot/host_syscall.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c index 7de963d4e211..94f27d13f1b9 100644 --- a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -157,8 +157,8 @@ ppc64_elf_exec(struct preloaded_file *fp) if (error != 0) panic("kexec_load returned error: %d", error); - error = host_reboot(0xfee1dead, 672274793, - 0x45584543 /* LINUX_REBOOT_CMD_KEXEC */, (uintptr_t)NULL); + error = host_reboot(HOST_REBOOT_MAGIC1, HOST_REBOOT_MAGIC2, HOST_REBOOT_CMD_KEXEC, + (uintptr_t)NULL); if (error != 0) panic("reboot returned error: %d", error); diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 1ce74d3f393d..1b12ffc3d4e6 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -91,6 +91,10 @@ struct host_timeval { /* Mount flags from uapi */ #define MS_RELATIME (1 << 21) +#define HOST_REBOOT_MAGIC1 0xfee1dead +#define HOST_REBOOT_MAGIC2 672274793 +#define HOST_REBOOT_CMD_KEXEC 0x45584543 + /* * System Calls */