From nobody Thu Oct 08 14:58:01 2026 X-Original-To: dev-commits-src-main@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 4j0tQl0Qwyz6vlv3 for ; Thu, 08 Oct 2026 14:58:07 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0tQk6BKfz4jcV for ; Thu, 08 Oct 2026 14:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791471486; 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=1aWxNF9EixWB30Ar1PWL2HKnms1/g3RGS+QT9qJO+bg=; b=MuhpF/+XW/OnfeaQH3xTrF+b4YaUnzYFoxIjqO69lHcoQ541bsnxu+BwFbxJmSz5n6DxT0 VC5quIs5UlxXXI4uGwmnCybMzTDLMq3GGnB0p8RUgV62oEldIPKaVLSeRQLkvAWAeBk4WR ObWtWSJd2TYhB4TlHKH1PIA5GjB1kcz0bYV5as6Qj/6jXZQ3pcqd2Vo2NOIpBGyvFD7FAN 8TQgn1ZHCBUof4Y23oFODFz8gi+Bz6H+bDp+WBfSfOCBNJOzP3NoUZW8nLU0tI504aYXaN gyoJkp3aPOsez+wEZDlpO3/CdMYeCdxMY1GB1KJx3sry8ux9qA9v6deMQIO+IQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791471486; b=wJR2iP4mmI2UaOM7y4SnN9VyfzbjZwZcW/4/WVUa/x0xn1zPqoKkpOG2ZnoGZ0/FDxBXH0 eiI62rjh5slbEerfCG+0r4AkhwL1VOqr1VkNnHuEpkje6F/rtIVcrCtHyfxBuGqTqxlZ+o 5pgYjoqZSdMYJIK2rvgTBiu04SQZAkz8VdrdrKsP9H6uvZ9hNjOBRI7RnDisq4Zi85TH7F ywj4qrlkFi4Om1eFjdQPkzQ8CPHAkwp2cuaUOa8w89o7u5C2vqSa1hjlnzLRVODdrCF6M0 Xl1c8QXCwa8oUjzycuPVbnE0CH9JxRurHk8F+e1I9T3gcOPSLo0w3U7bMZWMAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791471486; 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=1aWxNF9EixWB30Ar1PWL2HKnms1/g3RGS+QT9qJO+bg=; b=L9pNwn0txP4GU6Q5Gxy4EcyplnoG3DAIwTPey5QiaoZl1QyP6+weZE72Fd7+VSTe2TiCA9 WyULYI7QLLKQGF2C1gwEW4U3T1zh8jQAUsGs0Yg2vOLmM6mi4ihKsG5xQ70UgeP0PM8CNf yyhEsFYzI9I2sC+HpRFELDWW3ur/o8MfrEg4oa8RGfn3ppavkiChu78wc9w5XtDiZr06/k nlqy+vzwV5cyCS2fDflUmxsKV1ny1reArRdqe9EXDJEvbEgFPnpQZnzucaZOFVOFELCoVZ zW3y2w2wOr/clhuvc6PrYKBgUVZ5MhexMXNmyLEha23LL05mbhvff9zpl5bXlw== 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 4j0tQk57CjzlWM for ; Thu, 08 Oct 2026 14:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36151 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 14:58:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Osvaldo Janeri Filho From: Mitchell Horne Subject: git: ca9c5718017f - main - libpmc: fix the family check for the AMD DF event encoding List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ca9c5718017fc34d34f2dfe90020644aad3588d3 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 14:58:01 +0000 Message-Id: <6ac7af79.36151.2946becb@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ca9c5718017fc34d34f2dfe90020644aad3588d3 commit ca9c5718017fc34d34f2dfe90020644aad3588d3 Author: Osvaldo Janeri Filho AuthorDate: 2026-10-08 09:43:59 +0000 Commit: Mitchell Horne CommitDate: 2026-10-08 14:57:35 +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 --- 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 647fceabb05d..e0fac9884b77 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -581,7 +581,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 |=