From nobody Tue May 31 04:04:47 2022 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 386911B4D2D3; Tue, 31 May 2022 04:04:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBzFD15RDz3pwy; Tue, 31 May 2022 04:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653969888; 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=KU68plhmvo4q+hKGSZonvcgMVzj+Ht+aX4lZDYazcj0=; b=RP0GDFeJl+GAPks8mIkU+Egn4XllN8jNVb/M/lhQC/hlxpQMrSDf+jhPi3C5oROUkIG1sM OEEPZKb24cqlwN0BpN9n7eDIWLaeUYzRVjz/t5pA1P5GMjkeFLSMYqnOV724i2615NrQCn nFKiBRKbkribe0zGKKVUiGjnDhVCVSmaCj+AVSiBQEtj+FvDKTGgmJvTX/AarTI4vEzfKp PTfWfZ0NbCeYFcbv+GmB68KQK5eA7xaNNijXMqlWzLgNjhEIuY8x5E1iO2zJXN4E2yw31H QLgJTMK1Pr87jCUct3/4+5JDjQfLUBhRH6wAxO1PQHDBxMAz8fCtkVPJCg3oUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 063DC24740; Tue, 31 May 2022 04:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24V44lVk058791; Tue, 31 May 2022 04:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24V44lq4058790; Tue, 31 May 2022 04:04:47 GMT (envelope-from git) Date: Tue, 31 May 2022 04:04:47 GMT Message-Id: <202205310404.24V44lq4058790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 037dd0a96771 - main - libpmc: Fix INVERT flag mapping for both Intel and AMD. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 037dd0a9677144a870a381a1bbccbe61e34628dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653969888; 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=KU68plhmvo4q+hKGSZonvcgMVzj+Ht+aX4lZDYazcj0=; b=ncLk1hy4gMHOAudVrsi+RrH5A6LgoOZeDSoj1K33BdOFcllNXYG6xc30cIM+dx3iexvHsm 5BKhXmJPSuK/EsqPfXYrwBxY0y7rTxMuMM6U4nZS3bqU5FM1XZSPkoEOOrePKmY9J0Mx0k bx8A4ufJGJ0hyueL1YCem5ghHW9mD5YdKdcLvSOXYhyNwiiZSIIjaVCAIbhr69R3bw5v7W sh341fMZG9MAWwkALmIuJRrB7x7L0rAhLfaNqTJKOCa7j+SY6K1xq9IbvTMn8RFEbnwZlz j1cFqKCzF6GiUn3HJ5+r1MMOrMXpZ3UCNVmo4ODmtoVrpWcHS+GxMJJVNoFdsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653969888; a=rsa-sha256; cv=none; b=EAVq/zkQqT3Yk/iR4eJ1rY4AGz4gwHzUyH2RbsHSQwuMVxL4b6X3EQ+R4EbgwnYll6gWLK GZUtLTUZfwBQah9LsrnoaWE4bmXw8qvzIsZXlFonwHdw483P533fpEgL5eN7uwzln6SVuk 6Oc/eHPuCHnqTfoCNz5GtgQTIM8vmRnRkuMPJIOLeTX1Rbz+6WUURAbbyOA2Otmgearedj A6c052AxtEyLMS+0m2Nyn4jGwsJYuBN+YUc+shE+WL/8exvPrHCLGuOjGLste/CPIFTlea Vlon1qDLL1Yzd+bMkFG9MISxMg2uhtwhEXt63yYjHp/aiDleZ3+UEG5kkCwUSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=037dd0a9677144a870a381a1bbccbe61e34628dd commit 037dd0a9677144a870a381a1bbccbe61e34628dd Author: Alexander Motin AuthorDate: 2022-05-31 04:02:06 +0000 Commit: Alexander Motin CommitDate: 2022-05-31 04:04:43 +0000 libpmc: Fix INVERT flag mapping for both Intel and AMD. Looks like somebody's trivial copy/paste bug. MFC after: 1 month --- lib/libpmc/libpmc_pmu_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 765196ecc8ac..a7c090ceb4d3 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -510,7 +510,7 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, if (ped->ped_edge) amd->pm_amd_config |= AMD_PMC_EDGE; if (ped->ped_inv) - amd->pm_amd_config |= AMD_PMC_EDGE; + amd->pm_amd_config |= AMD_PMC_INVERT; if (pm->pm_caps & PMC_CAP_INTERRUPT) amd->pm_amd_config |= AMD_PMC_INT; } @@ -553,7 +553,7 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, if (ped->ped_any) iap->pm_iap_config |= IAP_ANY; if (ped->ped_inv) - iap->pm_iap_config |= IAP_EDGE; + iap->pm_iap_config |= IAP_INV; if (pm->pm_caps & PMC_CAP_INTERRUPT) iap->pm_iap_config |= IAP_INT; return (0);