From nobody Fri Oct 30 14:28:38 2026 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 4jGNkZ1Cgyz6wy3X for ; Fri, 30 Oct 2026 14:28:38 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGNkZ0bHwz3GfJ for ; Fri, 30 Oct 2026 14:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793370518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vmsCXz/I9JJXnkKMnJLJZKBC+eSKyAEY5gyZzkiuHxU=; b=lUjQnGYCum5gV4URN/AsUMXEg4In2UecmzUCeeMAEpwoEW40BMYefhk1NxcVksLF3d1MZN SLr1kZu6JTzYBY9l1IsnFolEX78vhv1AA2jf0KKNE60iXvQuR8WqXbqoj1RnJGypKDbsv2 CzxyfPqDLJsqqrITjfsvVzT24XzmRv28B1mzUpmQAOoR7hMQV1i7qs5o5m1X4E6eOjUogU wGdfEk+TT6ApbF5ksk+D9Yemgp9xir+mzwpOd6ZP5jBBITSBEkAabMaGSL5bvTpAyqEg1I IpfG4UuTUxTvcTLUVlScoE8HSqn2uzgloaFtbSgp3fG6x7IF8JbfubHp3SRdsA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793370518; b=DGxr7TYEM0VPOGoHgivyLBA0krg50P7ZevNTQ30IoYaGRyEuhv1qu6+eB4cbYlVOahFgPD ND7iC08JOUoIv0AVwinGYdBczn/b0+1oY26mG9D5d88f4edF8d/1R2SLzJh8v+ty2fuUz0 gHdom9Lf+Q8t9XQqhCjJdcaZz0Wp8+fcCFIGOCAwWgPuVeKhvZSs4NE38M32ZRSWVcAwF6 62PWwm2Xb+N0UbPjuvP1JIyRz/iekkVjNlJv8wA1YBzZKtrGElJjXu1QIiKWgdWmjwYTGB 1kjO2vEO/YPhWexQoPPmg80/iNhaDZ45YpVwtzwKPbsexCvwjQiU2D0lBdePcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793370518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vmsCXz/I9JJXnkKMnJLJZKBC+eSKyAEY5gyZzkiuHxU=; b=h+4SApKoY63VPZDrJ3i3AdMA7dWJyeXZE2m2O+OhJvz9lD9NMkQlKs/xF46UdrGUakbyyH HJBsWXyh6wDx3efRmAKK05QOmpSkN98bN3rBs9QnrfRO0mLYczs8SYF2zcZa+MlWypM5h/ Ne1z+HJ5/xDdIU04CwJypM0NE3tMxOtw3eojoGgGyYa+Qn2VPUHIEaVK9bxN7zSSF/ikeY kFbkIlR1bsLnRm0zmo2pCPOpUG4fnYoCb33sF3WoCBID0TENpixULtMoTZnW91ySKIsyv+ HmHmX4e9ejrPJ4W8M9LEbl5bgzezFmFwofRGjoDQRPkYMn0LNwbgD/r+j9x5Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGNkZ09cLzVPS for ; Fri, 30 Oct 2026 14:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 14:28:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andre Silva From: Mitchell Horne Subject: git: c56963b0fa67 - stable/15 - x86: add AMD RAPL MSR definitions to specialreg.h List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c56963b0fa67035b2bdf3096284ce3248c7ee65b Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 14:28:38 +0000 Message-Id: <6ae4a996.21f72.3d7f1f1f@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c56963b0fa67035b2bdf3096284ce3248c7ee65b commit c56963b0fa67035b2bdf3096284ce3248c7ee65b Author: Andre Silva AuthorDate: 2026-07-28 14:48:37 +0000 Commit: Mitchell Horne CommitDate: 2026-10-30 14:28:10 +0000 x86: add AMD RAPL MSR definitions to specialreg.h specialreg.h is the tree's MSR registry and already carries the Intel RAPL group. Add the AMD RAPL package/core energy and unit MSRs here so the hwpmc RAPL class can reference them without a private driver copy. Use the names Linux's msr-index.h gives these registers. Reviewed by: mhorne, adrian, Ali Mashtizadeh MFC after: 3 days Sponsored by: AMD Differential Revision: https://reviews.freebsd.org/D58027 (cherry picked from commit 77404ee1e99d502345a1f9356b05c09abfbde831) --- sys/x86/include/specialreg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index f32faec25e45..35bdf6a2e32f 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -1284,6 +1284,9 @@ #define MSR_SMM_MASK 0xc0010113 /* SMM TSEG address mask */ #define MSR_VM_CR 0xc0010114 /* SVM: feature control */ #define MSR_VM_HSAVE_PA 0xc0010117 /* SVM: host save area address */ +#define MSR_AMD_RAPL_POWER_UNIT 0xc0010299 /* RAPL unit shifts */ +#define MSR_AMD_CORE_ENERGY_STATUS 0xc001029a /* RAPL per-core energy */ +#define MSR_AMD_PKG_ENERGY_STATUS 0xc001029b /* RAPL package energy */ #define MSR_AMD_CPUID07 0xc0011002 /* CPUID 07 %ebx override */ #define MSR_EXTFEATURES 0xc0011005 /* Extended CPUID Features override */ #define MSR_LS_CFG 0xc0011020