From nobody Thu Jul 11 06:50:41 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 4WKQNK5gPLz5QQtR; Thu, 11 Jul 2024 06:50:41 +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 4WKQNK34hHz4C9D; Thu, 11 Jul 2024 06:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720680641; 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=ECvzpFO8GGBtCyOPUXMMGFHekxtez4O7tF8lXxdaYr4=; b=ntmkB6P4MbxW6cbuCqYiz7OxioxHnOYIt59qqoqLr9VrHIKVqEmoUeoK04s1kfWi/JmHWz H1vSFeMqXWQzC8wLSDL4PxNxgi9vtU7WuhIHWBGOhSg8Ilr56BsmCTFULRRI90AHltiFHN zRedZoB7dl3BYEIVrl/y60x1WXEYELjQaeYPRjk0u7DfTW8WDVbsJ3MbSUbOLm4symhCpg k/r4lVXvkFFfl6JdMRn+2Ck161fMm0FIYZyGi84LxbDXoJaqUws/a/TWLh9P0O5dPCPY+Z gOlUB9RfedRRKWFFqIW+n/0LnwK3tv4BRYuAsAzz6cVVd0320XwOgLvY9rUyfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720680641; a=rsa-sha256; cv=none; b=uz00g9oweAJWxS/UTQ9YTAXrYH3ZiXsZSl+DQx4V9UuIGpxFpI7lg8fh8+R4ZCi5L2zO34 zJDLIuW5hzXxJLwVOv5DZNiXqw73qUAXZbgSrt4uM3i0oYhZ1gNjAk1OyUOMlG/FxY5u7X 7E+1PZnx77khmByvpGSMidGMSW0XfDfEQMe4Hb8tNqt/MF+4s4P6KR+mBO0OX/D7HuEzpw IT6kTpeHORSai3Vjw4RYi77M5cu/Qzxq+EbV1k1vC1bY6mI6SWIq5KW0dDE5lj8Hl5uJGq N8k5TFliFnTLJ/RTciUtrhAH0IbO2pWXa2rSary78UN21a2SppjWhvrki7rs4w== 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=1720680641; 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=ECvzpFO8GGBtCyOPUXMMGFHekxtez4O7tF8lXxdaYr4=; b=ohDfHEuwxufyQ4741c0kD7qH/MaiZHBi7GLLJQGn7+i9F55j1RbpBY5yxkohJSSi5GnanI WyPZYwbv20tPt5YIG5Ub+OQ8BauNXCfPz2Z9pT3TPEIZokHFKNyfibw4SewaQYofXiCpvq zZ1xELIg4GvCyC7JTxpEGjHXnE8UEUXsuSk8RJoSbCx7oLfdOySFqoM8npXH0T89NTBECr Ft08LvyWH5Y+v0jqlUyo9Ad+gNF9bpbfG7hHDU0EJcs8ZMAdLz85x45pyOL6lMT2Ba5gyG zpTeDbIvM7buweLD6PN46HS+Piu/G2nXaDSICBPAPkIxWtjYVUSl5qR/+q/dOg== 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 4WKQNK2hp4zqwP; Thu, 11 Jul 2024 06:50:41 +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 46B6of17073384; Thu, 11 Jul 2024 06:50:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46B6off0073381; Thu, 11 Jul 2024 06:50:41 GMT (envelope-from git) Date: Thu, 11 Jul 2024 06:50:41 GMT Message-Id: <202407110650.46B6off0073381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 966e53a4e563 - main - linker: Add MODINFOMD_SPLASH type 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 966e53a4e563da36d62edf57c2b0007921fec8dd Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=966e53a4e563da36d62edf57c2b0007921fec8dd commit 966e53a4e563da36d62edf57c2b0007921fec8dd Author: Emmanuel Vadot AuthorDate: 2024-07-09 12:37:08 +0000 Commit: Emmanuel Vadot CommitDate: 2024-07-11 06:47:21 +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 --- sys/kern/subr_module.c | 9 +++++++++ sys/sys/linker.h | 1 + sys/sys/splash.h | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index 829655ed4fb0..7f56ed72e1ac 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -293,6 +293,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)); @@ -423,6 +424,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"); @@ -475,6 +481,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 06e950f7affe..a316aa26d0eb 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -248,6 +248,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..ec1e140b88bd --- /dev/null +++ b/sys/sys/splash.h @@ -0,0 +1,17 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Beckhoff Automation GmbH & Co. KG + * + */ + +#ifndef _SYS_SPLASH_H_ +#define _SYS_SPLASH_H_ + +struct splash_info { + uint32_t si_width; + uint32_t si_height; + uint32_t si_depth; +}; + +#endif /* _SYS_SPLASH_H_ */