From nobody Mon Jul 04 18:09:23 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 EC7E21C3EFE1; Mon, 4 Jul 2022 18:09:24 +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 4LcDN432bvz4kHZ; Mon, 4 Jul 2022 18:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958164; 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=ja3aPjXrrw+c83q9mhPNG99yNlTZg0tL22fac/723Lg=; b=aEiId5Nv2A6U7Uh8FNpERk4XRV94Fr8z6I3ZXo05Ue0TXZJVLMr83C3/c9BIUmM0RbpjDk X3ftHNQjjq14nCo9uU1Cl+ppSAFxrAVm5qMN2tj8iWsgnSfFmUFcmU5ESkN2DEjYZ+7JJF P9Htn1e93dBYQX0OkZhYoOS3ZKbdY9ibwawpU8zbKxuCUK3RfaYBJ8Pdras2QKnv4lz9va wbPg/8XJndwcs728txG0/734eyxtyGvXQjCpbadyq+9dvYGiuL94gmZTVlzuWe6RyFTk1U yahWtHgiXiuLX+o6+bGM6x74jQalBuReQS2ergzfgRrkZqpPPfXSrWigv9g9yg== 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 111481619E; Mon, 4 Jul 2022 18:09:24 +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 264I9Nm7064433; Mon, 4 Jul 2022 18:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I9NE1064432; Mon, 4 Jul 2022 18:09:23 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:23 GMT Message-Id: <202207041809.264I9NE1064432@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 0cd1f9831c65 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0cd1f9831c658628a191fc511bb62682dfcf3bba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958164; 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=ja3aPjXrrw+c83q9mhPNG99yNlTZg0tL22fac/723Lg=; b=Dj/Otg5CSzP8BTYOLd84R+W3kgBRgHs3Iy3RCf93Wpa9JERNwYG8AIoBjp6Sjowcgq4x5Z UeX00nUhqBMLRvzQ9SQxtGuAZlJZkjZUNejQXvIjyBL+ZNBD7lH2raDNRApEJqugM1oqt8 fUIS0oPjq0P+Ql3ENQ+yevqEWRb/hL79WfxH1r17rGMUTf3djjr8OReQKXXlWbBHB6fceG jRZ9JyqYmnoanoe6nGQHJjoqAD67lM3wOCJ9tSF8aS+J66kQioMuAEMWDsHKez6GCCAq6u sqHu0irBOEuPu/CXL9KOqbCw4vw2yCICAvsUEL5VAgfBAQYsXQafGvyfAN6rvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958164; a=rsa-sha256; cv=none; b=bHCQfzAzMQg7l8W66RkmHfsl2ScfTs/TtHNdvsxA5vMRAGHnaPnyIJtioBqWVhBZbG5Z6y 2XKR5wvpTZgj7685RJFab0eck4slQiWlIAr2eV7+6xUCCWZd03EqktwnhWNSZIwRj4xG2g fe6Hf4s5CeiS97eTk4ubm2rVm9GkAP3QpNasccDaGPFSrjSz6nBoT/WQ9lA6iINgIHnhuo gcXVYXjKlXjLrEGMkxsMeqTdnkC9zlVrlqZwc8dukSNv9ViISmsMq6AnP89NTNqmDerAZc aDbGPOWlCNe4GkH7aPsIHRU8v4UTYgiICjfyw9n5UAAryeh/A4Jb4+IOexbwMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd1f9831c658628a191fc511bb62682dfcf3bba commit 0cd1f9831c658628a191fc511bb62682dfcf3bba Author: Alexander Motin AuthorDate: 2022-05-31 04:02:06 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:09 +0000 libpmc: Fix INVERT flag mapping for both Intel and AMD. Looks like somebody's trivial copy/paste bug. MFC after: 1 month (cherry picked from commit 037dd0a9677144a870a381a1bbccbe61e34628dd) --- 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 44487924c7d6..6830a2457364 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -503,7 +503,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; } @@ -546,7 +546,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);