From nobody Fri Jul 15 18:04:05 2022 X-Original-To: dev-commits-src-all@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 4Lkzks2PFLz4TGmV; Fri, 15 Jul 2022 18:04:05 +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 4Lkzks1hS7z3RqC; Fri, 15 Jul 2022 18:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908245; 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=RMB6E8r2XumRe2Qm5N+leMtnwkuy+Rjhv5HNYOU/AGk=; b=Y/X5VSRrpRTWfg/OyT1pHbIC0mS3lI2CutcQYG1OoHIKGL4yA1zEzMqH8zc3irvT2w+kSZ 9SZwVjQExkTfdHDN6wUCxkjUqXLD0zrMBuNS8GWFyw9W8hzRnXrSFvVNBg69m+rfIumWWE P7ppMe3qIZbG1lnWrUJIbdi2gLkLkv9MuB2MYzZGcau5o5XV1F9QZ8w3CLFbm3ZA6athv8 z88YD1Ggq1igcy8xnZTR7zRhfQ/No/ft7ki9uffQh/Scbr1fL09+aKmccavwcvImfh/J38 UIxg57nxvYe97G2wq69M6e9k5j2tQw0bJzlY4V7wSydz1mW4d6GDmMHVOPiACg== 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 4Lkzks0nyXzrNl; Fri, 15 Jul 2022 18:04:05 +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 26FI45Tm060360; Fri, 15 Jul 2022 18:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FI45Fl060359; Fri, 15 Jul 2022 18:04:05 GMT (envelope-from git) Date: Fri, 15 Jul 2022 18:04:05 GMT Message-Id: <202207151804.26FI45Fl060359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8fa9263f67eb - main - kboot: Use #defines for magic reboot constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 8fa9263f67eb78c8ded9bd3d94c9c841cd0b6ba3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908245; 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=RMB6E8r2XumRe2Qm5N+leMtnwkuy+Rjhv5HNYOU/AGk=; b=eigadm8DKipWY2Z9IEJkuy+Wq2PVyqotjVptm4+fzV2uaFYZZUT6ZxRdYoGaE2epk99+78 EzRcvkNZaSXvTIs6RnuRSRG765+ivBwctXfgFBl5iQA2BwOZ4YCOcHbpk/rjsSzfBMvEOJ Hyf53Ep718ZKZYDNcWF0dn0YrTT3xjCxAkl8V0UkZYCi7cglE7pjZiWDa0q2p3++CeugFh +er+0sd1EWhbLbRYEiy3egnF6SndGu0t+Sj9feJdklhPt+kDksO6/vtUfaXvPnB/uxKYcQ /c5kmpueVBbRT1pyQYf8hQfdXDWZDpSbAWMYDlnSNWInwTbJKBxrwCDGftWIZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657908245; a=rsa-sha256; cv=none; b=k13ZE6HO+hOo9ZanjTN9UwXrK+MY2R9pnplVk/4imDdd7dHWA0ZLVOEHlzWn3Yb1JD+zFy CDYY5Lc/NTTCAmoJr8dky27QAnIWIDNfMEE/pzXpdRQpc76kIBBz6S2T9QDrIsVVR/9emT C5Z3jfprERDhlLWslylyB9zhTItq0gSgeFzwy4UaBc/0uwHOWudUH7FGKh8etVFt1WyE8P OeDOCupGM3MI2lkXIiCCTlT/nu6H8BC2dERFfkHIpAR6Q1ri3oWhKb+WlCqZ2EsTXWn/z3 WMEMAc+fmEuVkupcgDvr7tFXuY8dU9bOwUanFP7QwDw1NAylu9cN8d8kfon6WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8fa9263f67eb78c8ded9bd3d94c9c841cd0b6ba3 commit 8fa9263f67eb78c8ded9bd3d94c9c841cd0b6ba3 Author: Warner Losh AuthorDate: 2022-06-28 14:44:16 +0000 Commit: Warner Losh CommitDate: 2022-07-15 18:00:51 +0000 kboot: Use #defines for magic reboot constants Sponsored by: Netflix --- 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 */