From nobody Fri Oct 30 14:05:47 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 4jGNDC5gPbz6wwSw for ; Fri, 30 Oct 2026 14:05:47 +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 4jGNDC4bW1z4pNR for ; Fri, 30 Oct 2026 14:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369147; 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=sE8NxgIqJUGprGrFPCB2oagI28dDI0nByCFpZeluNKY=; b=os/GjGPi9VJ/qW8PLIWtff5lTgqBiabDwW4uEhrLlefIQ0+0EXCm0JkYyglZuspaPdi+om lxu62HOE2TpGY874xUSGdhP3facJDPdBwlnQhLalF1Ywzrs+UVpqHMTCnJYvenNQXx3w5e ERsWrAQ5g6IOaeC2xhtnbk9/mlcsFfVbGJGctLW8bWzuVD9HQk9UB2hsNgDae1djrpiu/b E78MwwCFzE/ihnjyXCdfDLCeXXOt7emh7B2wvsvCtiNCKrdA7u6ywz3ymRDOxe87Lk72Cr nCGmmf3FBB8NNvXDzCUJ/ET/qjqxEOCyycugbpNT/KH+uxd2stUsAEcezi8Pow== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793369147; b=F4DCkUwZNG1737ywpYgXw6YBl8Zei8BWN2Fj2JWJW2hMJHZWEFVgxxsuzKfVeTZOHie7NF mwNTXQJNCFOTigblHJqjk7rHTJ0yTGhffFaCL4lA24C8QLyI93RWFs5bhiAo4tBim8vjn1 FOvKExDmQQGQPBriaGnefNnaFY0Ydv7FRKzDFvFA2VCXLkbk8UOlTbSgN00eTY7cFCoiBv 6bki3xLJmawpCSHS3Dn8RxtWHleYQT7RFRLcV3D2vFRJ0eb7+TB45AxYAfYqpDIzqhTDkW qGq1V4q4e9QmopqscCjxWaRXMe6i0o9HL4kjcNnnqTRu2Hbdb0PXq2w+MLyihQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369147; 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=sE8NxgIqJUGprGrFPCB2oagI28dDI0nByCFpZeluNKY=; b=Z49IsmctntzuNyrH4xuDBgGrxINZPRkKkx3mlSBJuoy5LFZxQTX+YBRtZON1mloqXZNFKy R3DK7TnD3GD7utJ/hEkr1Htj2Nc6LCou4nLTf3w+e//JjZrmrC1NQm/KJanJr/OWCKi3mB 7zcAZ3H2cmbZGhZUtWv7NQwiIGsB/3u1nrtIf6GPQaVjJqQKG3+KQo278Lt+vlaMKjVoCY NoGGkv3Ae56B32X2xcnMdH+voAwFb736y7eJI7KSVESY8+geDHnoKgMzvrc8zvskBZ8XLY IxqqxQAPB/2mAGKTvXR6Dl3I7pcb+dgbOXSqXWxOiTRXMNWBQ2kptDgF7gI4Gg== 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 4jGNDC3s1XzT4d for ; Fri, 30 Oct 2026 14:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 14:05:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mitchell Horne Subject: git: 466b286ba22d - stable/15 - libpmc: fix the family check for the AMD DF event encoding List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 466b286ba22d582fec2f48cf3a585fdf70445a61 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 14:05:47 +0000 Message-Id: <6ae4a43b.20e64.4731d645@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=466b286ba22d582fec2f48cf3a585fdf70445a61 commit 466b286ba22d582fec2f48cf3a585fdf70445a61 Author: Osvaldo Janeri Filho AuthorDate: 2026-10-08 09:43:59 +0000 Commit: Mitchell Horne CommitDate: 2026-10-30 14:04:47 +0000 libpmc: fix the family check for the AMD DF event encoding The check compares cpu_family with decimal 19 instead of 0x19, so Families 17h and 19h get the Family 1Ah DF encoding. Signed-off-by: Osvaldo Janeri Filho Reviewed by: mhorne Fixes: 00c0a1f0bf6c ("hwpmc: Fix PMC flags for AMD Zen cores") MFC after: 3 days Sponsored by: AMD Pull Request: https://github.com/freebsd/freebsd-src/pull/2461 (cherry picked from commit ca9c5718017fc34d34f2dfe90020644aad3588d3) --- lib/libpmc/libpmc_pmu_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 0832ab32e2f1..46c028e8cd8d 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -573,7 +573,7 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, } } else if (strcmp("amd_df", pe->pmu) == 0) { amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; - if (cpu_family <= 19) { + if (cpu_family <= 0x19) { amd->pm_amd_config |= AMD_PMC_DF1_TO_EVENTMASK(ped->ped_event); amd->pm_amd_config |=