From nobody Tue Jul 28 15:01:25 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 4h8dvp3N7Wz6msqv for ; Tue, 28 Jul 2026 15:01:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8dvp1831z3L2T for ; Tue, 28 Jul 2026 15:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785250886; 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=nKxNan9AoUEVF8ql1Ino4jDWx92Q/o+a+oBbw48KN5w=; b=UtReCVFVax5xt/lrhb5frX42lRoVvEWtHCFSjWBBCCSw2+0Z8Kcdh1dAmPz5jxlZ9hwHfJ 5vmgkVo2SGUGT4Pf9gRgoQxNZSpxcnIk642nq61nr2f9sjifrkct61XtJOPrv22GyVhkZT XrPkjHX9j63yDNVUrZcC48kVJLOz/F6RvXEzehzVzd+wORMwSEgPeLVIilBVYRhdmVY6Wm qIGUkXKdqAsnrOg/zDFYJSuV6cK2dtoXt1kaxUdmGfiUc3Og6Btxw5Q0vX2AraFEQzGw48 cPegKHY4r47Qjd2COuEfjhdTPHEmLB9XCdBhaoTjw0BiCs4Y7oG0z0avVJrKwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785250886; a=rsa-sha256; cv=none; b=pBmocqCv1iziGFyMmS/UrKNnPiWB5HB3RrpRhEQylaQFaQGjVW15IjUDwxGrMqlSl92ix7 hoMYCxHAVL/7MCjlWmp6Z8m1HS+ce4okag1HHF3amWlpBmx2tZvEQw+g6IljTUCU6dcsJy 3KAAtoSTbIS7HWIeNcdKeGUbFwJz2iCepzNWhZvcho/Geh8Csa/oXa8/TL85uVkOyBz7bZ m4tKlSp9flAjVOjH9LexCMOKgZceXRmnywkTnUfffWQfcVtcZnLThqQSgVzShOZ31zRqXz lqzoQP9A7/ZrjlAhZl522ZztcUmMPdLIXLoSeOywYAf2qcHBmzH4a7Ri2Spf7Q== 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=1785250886; 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=nKxNan9AoUEVF8ql1Ino4jDWx92Q/o+a+oBbw48KN5w=; b=dNmlYTBAd9AVz3XkViB1TU6AWHbKYnntOm/SUQLJbLqbtp+GBLKUeV18aqQ3ZTgHVoQS1V WHp+zlrYtpBRo4cSZujUQlUSqP4dgW4DVdjkLf5HrGf5Czh6Km6kPS9mR8pVQrHypnEjea aTU8Ning3QFCM7zmE3V0jCsS/YduLGAhCDBwliT5CQ/JpgYOIEJqVDcqdbGin6S2pRuTyj cLcJV0dZ8OiekNcIdZsgwW7SQ4tj3snYenplE9v6r9amQCAKGlsyJ/emzglE/cU3n4K/bS KuPUXJWYi2ipxEWIrHW5IZKx9HybOOcljUcZsiCYkrm34EIi2dRvmt+tv+bwZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8dvp01PTzlS8 for ; Tue, 28 Jul 2026 15:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20391 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 15:01:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Andre Silva From: Mitchell Horne Subject: git: 77404ee1e99d - main - x86: add AMD RAPL MSR definitions to specialreg.h 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 77404ee1e99d502345a1f9356b05c09abfbde831 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 15:01:25 +0000 Message-Id: <6a68c445.20391.785e0c14@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=77404ee1e99d502345a1f9356b05c09abfbde831 commit 77404ee1e99d502345a1f9356b05c09abfbde831 Author: Andre Silva AuthorDate: 2026-07-28 14:48:37 +0000 Commit: Mitchell Horne CommitDate: 2026-07-28 14:53:33 +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 --- 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 f5ca0b8415bb..f201725920bd 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -1272,6 +1272,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_AMD_CPUID01 0xc0011004 /* CPUID 01 %ecx override */ #define MSR_EXTFEATURES 0xc0011005 /* Extended CPUID Features override */