From nobody Mon Jul 29 16:38:34 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 4WXkZL5bZvz5RYXD; Mon, 29 Jul 2024 16:38:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WXkZL1yl1z4FbM; Mon, 29 Jul 2024 16:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722271114; 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=j14PA3h1WO3jpmyD8QcVi00XocECzyFaoT5hBKRJUeE=; b=uOZ2Ub8sTsXFAEMuhl1n2S/Ry6QkuALLurH0PEJ1u2jTnMIAsNSTCkrUt10p+TS12HCXal WkrJHkhfRTCZTq87BaMl5sn7cYtFDs4s4pmGqDM5JeIFE9aIH4TBrdcXLgZqT3mxgJonZV eS5zCG6D2Bvkl6pDECflFv1cJwhl58gXNTYPircrV5ylT4aVZb+HhwADJzMGKX+M1aOcuY BJkxKYvO/YKfHRBI0TbWpjsYoHesdMGXO1eFX/9lR3m/knvIKxuC43KVPbtFMcbAAg4ddy Hc7Ba4qbXLgznulqRsRdu81SLdRFp+Wna+Awke0ZWtz7QIgOsu9UY9ZGB8eQ9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722271114; a=rsa-sha256; cv=none; b=Wm8rBOY0UJ4ZaOlcLj5SwvqIfmTxWb8wFiIo+KB4YY/ny0QSiq72e171PFB12xMX73uqwT wtSQDxvpASy5rRgav1cVyVEFGqZqf2KB42GNrSTl7LxBDXR39sKQtuFVDshR3C/zuKpFpC T9IB3JbY3nrzxzptl3aCvckST0rKADL3faBe6RKvL0Tg3GK52olTD1FC8Co1XO+Qv2fZQw BOVcHQh17pe+rZllMfvYE/W00dcz6GiUnbWpYpk7ti7LScy8PpPpbOHH5ganSfyIDcIp/6 fCOoBUHvbSMBEDiAXsPipYqv74dstEAmGyjThNVvVb+6SXzTYuCG9jss6ci4Sw== 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=1722271114; 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=j14PA3h1WO3jpmyD8QcVi00XocECzyFaoT5hBKRJUeE=; b=jPkfYaF3EVphV9Z3F7IwTQDrzB1bcQ1pLSSYFbx6rrVU12wVXXOBq7rAf85lW+nydzUDzM ydZbhHjZeiD9l57Q0kfeXcrMuucRBApicBcx5LfqyPXpVyZkAsn4/tp8x1GFubkt6AKAd9 YReuSdPyfvnOXUFG1IccVgvksPlj+qyt1/u6mHDILuTFCE27Kv7GlGyGlKB/JARxbYG9Pq IWDxlovGTAyvdBsrzkq0uboFm61YEppYk1EEhcc3WcmScIN4EtAzMdttIT/ufFM2taUJIM pMI2391eJzV0cUNLUOoGxEhd7Ez31+XQwrjv3SYyfN6lXYn9YyY7oC764cGtTA== 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 4WXkZL1JfKzj2w; Mon, 29 Jul 2024 16:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46TGcYwu005023; Mon, 29 Jul 2024 16:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46TGcYDU005020; Mon, 29 Jul 2024 16:38:34 GMT (envelope-from git) Date: Mon, 29 Jul 2024 16:38:34 GMT Message-Id: <202407291638.46TGcYDU005020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 014edaa360ce - stable/14 - linker: Add MODINFOMD_SPLASH type 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 014edaa360ce7c4f28371e167b2ec33a9f2773b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=014edaa360ce7c4f28371e167b2ec33a9f2773b2 commit 014edaa360ce7c4f28371e167b2ec33a9f2773b2 Author: Emmanuel Vadot AuthorDate: 2024-07-09 12:37:08 +0000 Commit: Emmanuel Vadot CommitDate: 2024-07-29 16:37:42 +0000 linker: Add MODINFOMD_SPLASH type This mod type and structure holds the splash screen data and metadata. Differential Revision: https://reviews.freebsd.org/D45930 Reviewed by: tsoome Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 966e53a4e563da36d62edf57c2b0007921fec8dd) splash: Add sys/types.h To fix make test-includes Fixes: 966e53a4e563 ("linker: Add MODINFOMD_SPLASH type") Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit e4fc2fd62a5e4afebfc466868eb3b17f9ba0ad57) --- sys/kern/subr_module.c | 9 +++++++++ sys/sys/linker.h | 1 + sys/sys/splash.h | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index 5ab41809aa89..66bf3334b771 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -294,6 +294,7 @@ preload_bootstrap_relocate(vm_offset_t offset) switch (hdr[0]) { case MODINFO_ADDR: case MODINFO_METADATA|MODINFOMD_FONT: + case MODINFO_METADATA|MODINFOMD_SPLASH: case MODINFO_METADATA|MODINFOMD_SSYM: case MODINFO_METADATA|MODINFOMD_ESYM: ptr = (vm_offset_t *)(curp + (sizeof(uint32_t) * 2)); @@ -424,6 +425,11 @@ preload_modinfo_type(struct sbuf *sbp, int type) case MODINFOMD_FONT: sbuf_cat(sbp, "MODINFOMD_FONT"); break; +#endif +#ifdef MODINFOMD_SPLASH + case MODINFOMD_SPLASH: + sbuf_cat(sbp, "MODINFOMD_SPLASH"); + break; #endif default: sbuf_cat(sbp, "unrecognized metadata type"); @@ -476,6 +482,9 @@ preload_modinfo_value(struct sbuf *sbp, uint32_t *bptr, int type, int len) #endif #ifdef MODINFOMD_FONT case MODINFO_METADATA | MODINFOMD_FONT: +#endif +#ifdef MODINFOMD_SPLASH + case MODINFO_METADATA | MODINFOMD_SPLASH: #endif sbuf_print_vmoffset(sbp, *(vm_offset_t *)bptr); break; diff --git a/sys/sys/linker.h b/sys/sys/linker.h index 461a32d5529b..be127e6ded48 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -242,6 +242,7 @@ void linker_kldload_unbusy(int flags); #define MODINFOMD_FW_HANDLE 0x000c /* Firmware dependent handle */ #define MODINFOMD_KEYBUF 0x000d /* Crypto key intake buffer */ #define MODINFOMD_FONT 0x000e /* Console font */ +#define MODINFOMD_SPLASH 0x000f /* Console splash screen */ #define MODINFOMD_NOCOPY 0x8000 /* don't copy this metadata to the kernel */ #define MODINFOMD_DEPLIST (0x4001 | MODINFOMD_NOCOPY) /* depends on */ diff --git a/sys/sys/splash.h b/sys/sys/splash.h new file mode 100644 index 000000000000..0bbc5a2bd574 --- /dev/null +++ b/sys/sys/splash.h @@ -0,0 +1,19 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Beckhoff Automation GmbH & Co. KG + * + */ + +#ifndef _SYS_SPLASH_H_ +#define _SYS_SPLASH_H_ + +#include + +struct splash_info { + uint32_t si_width; + uint32_t si_height; + uint32_t si_depth; +}; + +#endif /* _SYS_SPLASH_H_ */