From nobody Fri Nov 13 18:41:13 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 4jR5gY4QFDz714Gd for ; Fri, 13 Nov 2026 18:41:13 +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 4jR5gY2XF3z4PBD for ; Fri, 13 Nov 2026 18:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794595273; 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=5K6fOuS63d2R0rdyZ4Lt764zq8bLzvt8ZMdLPJTB3HE=; b=Hi3Hna15wfvRbThmfgpaYHLnJmW7jhy0gQpaxIPTLKqFkNEzGZCejj6dreqz8UDfX/QTxo Zv/HWxjebYJfhJ2LYwfH1SUF2C85989nUc1rhpnRyq2QGLnT33OipQozogsYM+YJ5J4PEr ArQJ/oL+Bu9Bz8RZOJcyVBC8xK9DrZ9JfXLx7h1+kgFq5fRxSC0r8Ns6w9enUzp6+C0AIv YS+B47w0tPBWtKtAVgc9n7U8R0moiMAO8TxCD2co7zusgo0faI/lN06dbsBSe95UjHGV12 FM/we7OiYxp4K41NrqXFZrw/eOyxalrz4Ja1xnfSvEx29GGCQth9luQPlvPa6w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794595273; b=AINHjPd+i6kjgxqO19iThtB4EINzMwb0LzwDZ35KijrpYFSpV+3CtLwr3vGYISv8g1Xc8S mLuwR9WPVvmsAS8pyIwE7M3/+JRfIqeF3SjzsICmpSGjmrU8Uo6nfCzUq3Svymj0mSfFIt S3yPIB3tIaxOaR9e2z18Wu3IHmM+r3DUT5e/M4affYgeGKBTt1jCumcQCC/yacd1Y4KorS pNbfsx3oI1SWnSf6LMe9x0r4BLt62FG08Dxi5BuWQbdZIlvn4hgM18aOvB57xCd/5/X24p euo4iCABgmXY7uhJHlTgzDuEM6EaboUmJkgoIHKVGcxcOdHk5guta/UWlYvusQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794595273; 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=5K6fOuS63d2R0rdyZ4Lt764zq8bLzvt8ZMdLPJTB3HE=; b=vIhSj8wno6bnqax5jXINIRYnrSONi7rv+bXc5VmlmzGkq+X0awmSAlg6VVEGuhprIBdYWi Xk8W2eiMbhVUTIed8l++gqVSQy/8KkPS8PFznFsGi2Qm0TvmVmrpT6yIskAIcLPT0BkBB8 EGDyiA8PSWy+ih5nqajN4o1a93xniKCPv2fASc/dg/ahiD4rv4vYsuacFj+cMi5EcDf8rk 1Le6terp7yjrj8IQ3+CgqgJJPk4Fv2mWy16ToC9tzGXppevkEpzz4b95+WdkuYDt3i5lad zOwT+lkPgTU5Ylg6KaoNp+1rx2xOwBlVQbf/OiJCg+1NgbDILND8K8yWGiC/VA== 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 4jR5gY2BlwznC0 for ; Fri, 13 Nov 2026 18:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ffb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 18:41:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 25a9d3cef33b - stable/14 - hwpmc_amd: simplify counter descriptor definitions List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the 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/14 X-Git-Reftype: branch X-Git-Commit: 25a9d3cef33b713db9f94827ae469c7cbe03d33a Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 18:41:13 +0000 Message-Id: <6af759c9.1ffb5.77f00304@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=25a9d3cef33b713db9f94827ae469c7cbe03d33a commit 25a9d3cef33b713db9f94827ae469c7cbe03d33a Author: Mitchell Horne AuthorDate: 2023-10-18 17:54:04 +0000 Commit: Mitchell Horne CommitDate: 2026-11-13 18:41:02 +0000 hwpmc_amd: simplify counter descriptor definitions No functional change intended. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41273 (cherry picked from commit 75780146d627ff4be978191a142da4d67be5aaa6) --- sys/dev/hwpmc/hwpmc_amd.c | 207 +++++++--------------------------------------- 1 file changed, 30 insertions(+), 177 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 03137293fa17..ec0925608b59 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -63,184 +63,37 @@ struct amd_descr { uint32_t pm_perfctr; /* address of PERFCTR register */ }; -static struct amd_descr amd_pmcdesc[AMD_NPMCS] = +/* Counter hardware. */ +#define PMCDESC(evsel, perfctr) \ + { \ + .pm_descr = { \ + .pd_name = "", \ + .pd_class = -1, \ + .pd_caps = AMD_PMC_CAPS, \ + .pd_width = 48 \ + }, \ + .pm_evsel = (evsel), \ + .pm_perfctr = (perfctr) \ + } + +static struct amd_descr amd_pmcdesc[AMD_NPMCS] = { - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_0, - .pm_perfctr = AMD_PMC_PERFCTR_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_1, - .pm_perfctr = AMD_PMC_PERFCTR_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_2, - .pm_perfctr = AMD_PMC_PERFCTR_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_3, - .pm_perfctr = AMD_PMC_PERFCTR_3 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_4, - .pm_perfctr = AMD_PMC_PERFCTR_4 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_5, - .pm_perfctr = AMD_PMC_PERFCTR_5 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_0, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_1, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_2, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_3, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_3 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_4, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_4 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_5, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_5 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_0, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_1, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_2, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_3, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_3 - } + PMCDESC(AMD_PMC_EVSEL_0, AMD_PMC_PERFCTR_0), + PMCDESC(AMD_PMC_EVSEL_1, AMD_PMC_PERFCTR_1), + PMCDESC(AMD_PMC_EVSEL_2, AMD_PMC_PERFCTR_2), + PMCDESC(AMD_PMC_EVSEL_3, AMD_PMC_PERFCTR_3), + PMCDESC(AMD_PMC_EVSEL_4, AMD_PMC_PERFCTR_4), + PMCDESC(AMD_PMC_EVSEL_5, AMD_PMC_PERFCTR_5), + PMCDESC(AMD_PMC_EVSEL_EP_L3_0, AMD_PMC_PERFCTR_EP_L3_0), + PMCDESC(AMD_PMC_EVSEL_EP_L3_1, AMD_PMC_PERFCTR_EP_L3_1), + PMCDESC(AMD_PMC_EVSEL_EP_L3_2, AMD_PMC_PERFCTR_EP_L3_2), + PMCDESC(AMD_PMC_EVSEL_EP_L3_3, AMD_PMC_PERFCTR_EP_L3_3), + PMCDESC(AMD_PMC_EVSEL_EP_L3_4, AMD_PMC_PERFCTR_EP_L3_4), + PMCDESC(AMD_PMC_EVSEL_EP_L3_5, AMD_PMC_PERFCTR_EP_L3_5), + PMCDESC(AMD_PMC_EVSEL_EP_DF_0, AMD_PMC_PERFCTR_EP_DF_0), + PMCDESC(AMD_PMC_EVSEL_EP_DF_1, AMD_PMC_PERFCTR_EP_DF_1), + PMCDESC(AMD_PMC_EVSEL_EP_DF_2, AMD_PMC_PERFCTR_EP_DF_2), + PMCDESC(AMD_PMC_EVSEL_EP_DF_3, AMD_PMC_PERFCTR_EP_DF_3) }; struct amd_event_code_map {