From nobody Thu Apr 30 11:40:24 2026 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 4g5sfw3jJtz6bhwb for ; Thu, 30 Apr 2026 11:40:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5sfw2397z3SyC for ; Thu, 30 Apr 2026 11:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777549224; 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=gcoXmjHENDdvypksxTxJNaWia3fKBjkB0c5wCH2S7Yo=; b=N09YXgyEbWvw3gY13YjTE4Un3fGwzCXnJ/99F5sMi+S756nXrjZHB8MCVAV3c6T9FmnYi2 O7gF0YJorTaRVniPJXSWyfP0KDJhnuYMUUZ5/lDuGfUmvvsYx+svlaO8SlXMOYtMG5ROja EWJPwMHj3aoHf7g1aRMrcbf3N7ftbpwqUqRuSu5X/kPWARwpqEqzRmtvVAHWQfz0p6/F9/ ykVnpI8LmIeLLQwF8WOFuhXOr4pTZBTD7R44X1hga3m3uYiC7U5sCLOdCbYcU3duwm2QIE ge0Bh50BkzBwehaUvHWF4vpuZvDBCXIaaMGxJGE2HD/iEXFjPN4SdZ2zfZ9NyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777549224; a=rsa-sha256; cv=none; b=FPoGJ1vY22gCbj71f3cAEV6QFm1VL4hPatXaGh1d2AOgelSkjE9wcBtMjo9WPN4Wt13YfP sNSgFLDDIPjXTm0wpB+sOxEt5CSnsHbnjB0g+9NAYR6ezecRpCequx2WSDhfDtFk9/VVuI AHD/0iaK5lSPD1nsBlK9U9R9yPt2zS8MqkA0bhig7AKuQ6E2nJQzTtooaiewmlpXBsMmdS H0mXpY7fD1MiWrYCK7KRUzb45rNLAxOBkFyzU9zi93sBhhJGTuOmXmwvFFWMuUnDXaCr5Y lr3/HnKoJ9QsMuiPOuqHYXbarg/xdr/E5umXkxuUp1/LZ/O1dX7WMwIsBdCbUw== 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=1777549224; 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=gcoXmjHENDdvypksxTxJNaWia3fKBjkB0c5wCH2S7Yo=; b=TnjYyz/H/FdlcO/15h3Ub/pU1NHQRubaDvO1umvsAXv8/UjbK1nkeLnM7CuzxhVngxNTQk /xC/CPr01E8PbD9Oqw+wCscHhzOTG1CgTuOEBI23t94Gcx8ysYOAwtDIhxA5FCQhUmtjSE MGKXudLJkg1JtRYM2BQiHJ0ltCa80KgHguxUjd1aO78VQgJiOVJDU93cxL0Iqi1RZXA5ec R02c5btVImAtia4Q+OllVyYkyOPJUTyittWbdbg6YZgUJ/3rrZzHQ1yCs4IAatwdOzq4hm 0Yjm3djWZHJULZOCvFNCgBtDNhd57SnGWUib/iC7oo3PZMD7k4q9Y+lREdIkXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5sfw1LZqz1PH0 for ; Thu, 30 Apr 2026 11:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d35 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 11:40:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 65dc0e9071a5 - main - linuxkpi: Define `VFM_*()` macros in 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65dc0e9071a5ea206d6fbf070c974ebcfdea3680 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 11:40:24 +0000 Message-Id: <69f33fa8.22d35.1a24e7df@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=65dc0e9071a5ea206d6fbf070c974ebcfdea3680 commit 65dc0e9071a5ea206d6fbf070c974ebcfdea3680 Author: Jean-Sébastien Pédron AuthorDate: 2026-04-22 16:23:16 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-30 11:40:01 +0000 linuxkpi: Define `VFM_*()` macros in They use another set of constants and macros in . All these macros are defined regardless of the architecture, even though they are specific to x86. Perhaps we should restrict them using #ifdefs. The amdgpu DRM driver started to used `VFM_MODEL()` and the `INTEL_*LAKE*` constants in Linux 6.12.x. Reviewed by: bz, olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56585 --- .../linuxkpi/common/include/asm/cpu_device_id.h | 33 ++++++++++++++++++++++ .../linuxkpi/common/include/asm/intel-family.h | 9 ++++++ 2 files changed, 42 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h b/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h new file mode 100644 index 000000000000..a01d63a75a7e --- /dev/null +++ b/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h @@ -0,0 +1,33 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 The FreeBSD Foundation + */ + +#ifndef _LINUXKPI_ASM_CPU_DEVICE_ID_H_ +#define _LINUXKPI_ASM_CPU_DEVICE_ID_H_ + +#define VFM_MODEL_BIT 0 +#define VFM_FAMILY_BIT 8 +#define VFM_VENDOR_BIT 16 +#define VFM_RSVD_BIT 24 + +#define VFM_MODEL_MASK GENMASK(VFM_FAMILY_BIT - 1, VFM_MODEL_BIT) +#define VFM_FAMILY_MASK GENMASK(VFM_VENDOR_BIT - 1, VFM_FAMILY_BIT) +#define VFM_VENDOR_MASK GENMASK(VFM_RSVD_BIT - 1, VFM_VENDOR_BIT) + +#define VFM_MODEL(vfm) (((vfm) & VFM_MODEL_MASK) >> VFM_MODEL_BIT) +#define VFM_FAMILY(vfm) (((vfm) & VFM_FAMILY_MASK) >> VFM_FAMILY_BIT) +#define VFM_VENDOR(vfm) (((vfm) & VFM_VENDOR_MASK) >> VFM_VENDOR_BIT) + +#define VFM_MAKE(_vendor, _family, _model) ( \ + ((_model) << VFM_MODEL_BIT) | \ + ((_family) << VFM_FAMILY_BIT) | \ + ((_vendor) << VFM_VENDOR_BIT) \ +) + +#include +#include +#include + +#endif /* _LINUXKPI_ASM_CPU_DEVICE_ID_H_ */ diff --git a/sys/compat/linuxkpi/common/include/asm/intel-family.h b/sys/compat/linuxkpi/common/include/asm/intel-family.h index 91ad1d1a8ff3..db815e0c012d 100644 --- a/sys/compat/linuxkpi/common/include/asm/intel-family.h +++ b/sys/compat/linuxkpi/common/include/asm/intel-family.h @@ -1,5 +1,14 @@ /* Public domain. */ +#define IFM(_fam, _model) VFM_MAKE(X86_VENDOR_INTEL, _fam, _model) + +#define INTEL_ALDERLAKE IFM(6, 0x97) +#define INTEL_ALDERLAKE_L IFM(6, 0x9A) + +#define INTEL_RAPTORLAKE IFM(6, 0xB7) +#define INTEL_RAPTORLAKE_P IFM(6, 0xBA) +#define INTEL_RAPTORLAKE_S IFM(6, 0xBF) + #define INTEL_FAM6_ALDERLAKE 0x97 #define INTEL_FAM6_ALDERLAKE_L 0x9A