From nobody Mon Jul 4 18:09:14 2022 X-Original-To: dev-commits-src-branches@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 B1F131C3ECB1; Mon, 4 Jul 2022 18:09:15 +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 4LcDMv2Jx4z4kMC; Mon, 4 Jul 2022 18:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958155; 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=ewoNgjSIkd3Fsa7QCO0EWaFZ4ikujHmQs5iksJLLiGU=; b=s8Ugch6Zz/M51ewdDCmWtRcLVrpN2XXZhLfbonwXzup0Xthih0PRoIVLjytr3x4ITsekmy ToIEHp89PwIX4VTayw4/WdXPwLF7BPTiZu60qxFSiAxRbv1fqwvInUgfDjJlQSBCTyS9C8 2XFDazUJea99PI6M7vFmNmjRP5fvk9pXJ/2k3IS32w8Ifaue7CeHR5tJH7CqN1GotkILUU QCGZXxueAygMfdKX6R3Kq0K8gA5cUN/NNR/iSIZGloeT+66yykqfTVLCEIeSrpiIV0GPei CVW1lknYtRnIZG6dcJ85MeYWoX8iaV8X8gFOTXK2YQglsCW+MPQjXKKEHlmYew== 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 E44A115DE8; Mon, 4 Jul 2022 18:09:14 +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 264I9EeY064229; Mon, 4 Jul 2022 18:09:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264I9ELH064228; Mon, 4 Jul 2022 18:09:14 GMT (envelope-from git) Date: Mon, 4 Jul 2022 18:09:14 GMT Message-Id: <202207041809.264I9ELH064228@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: 698c67184ae3 - stable/13 - hwpmc: Add Intel Core register defines up to version 5. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 698c67184ae3b95593889bc3a69752b2d74ab99e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656958155; 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=ewoNgjSIkd3Fsa7QCO0EWaFZ4ikujHmQs5iksJLLiGU=; b=XLGJewnTY5AqA36InKVAhW9EVXiwCHTqP1nvO9hJyGNFpssOkGPQe9fOYLTk/ZnzYg8P51 ll2zs8xqQzYuuffmP91idm58dTNBWCoEfPP0GB91dyejkuo/sGxAYNi02QH8DLztQbz2h8 VBOEdoi1Gbmsf/yZiZb3ophFEVpkeMz4kSjf90LwKJfEM86/7ePq2RPS7kZIoNOyWJYkwe nZ/N+5lHFp52jSQfhdNM1FyzGttJIIoMhdSy4sqVrVtaIFbVMwH1zoSkYESTZUtepVpe7S LctArVfPV1EcZP9qt0n7yazLhptiRjAi8DqsDgqUK2cSrtpS/GnAfJb2TyYpJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656958155; a=rsa-sha256; cv=none; b=P1y3ETZtEUAhv/54pt6F5ud7WFIL8t/ekGn48xaP4j/wRmNzU4+ZOJM3s20hJ+cAZVvSXe 6JsKmubYf2hZuOGcCgD+j8O6csJvvF5i3yZevpb25TKBxjta6gfNvf6GMKcXZWPnh9xfk3 d5S4RACXoWxucnlHFHiPqWX/TMV5HL5tpFJFI7VDKjNj7WasJ7yhPooi5T6Z7b8yDBOQ+E Ba/iXl5R5sr++d7DDhiMn6gV8QGjhHVczBVD7DkFYedzYqNL17sRKC2R1uTcJ9EfhpPzy3 lCQAg2QJNhRQeSf/SfdywP9tyRL/No/c2Kd5jNc1tifB1S38+k9Ilcpx+2zqGw== 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=698c67184ae3b95593889bc3a69752b2d74ab99e commit 698c67184ae3b95593889bc3a69752b2d74ab99e Author: Alexander Motin AuthorDate: 2022-05-29 02:11:59 +0000 Commit: Alexander Motin CommitDate: 2022-07-04 17:48:08 +0000 hwpmc: Add Intel Core register defines up to version 5. MFC after: 1 month (cherry picked from commit 245b056556e61792ae3cb21fd61e9b2ce362f4b9) --- sys/dev/hwpmc/hwpmc_core.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_core.h b/sys/dev/hwpmc/hwpmc_core.h index 09e657eca113..5b42182a876c 100644 --- a/sys/dev/hwpmc/hwpmc_core.h +++ b/sys/dev/hwpmc/hwpmc_core.h @@ -88,19 +88,19 @@ struct pmc_md_iap_op_pmcallocate { * Bit Position Use * 63 - 12 Reserved (do not touch) * 11 Ctr 2 PMI - * 10 Reserved (do not touch) + * 10 Ctr 2 Any Thread (v3) * 9-8 Ctr 2 Enable * 7 Ctr 1 PMI - * 6 Reserved (do not touch) + * 6 Ctr 1 Any Thread (v3) * 5-4 Ctr 1 Enable * 3 Ctr 0 PMI - * 2 Reserved (do not touch) + * 2 Ctr 0 Any Thread (v3) * 1-0 Ctr 0 Enable (3: All Levels, 2: User, 1: OS, 0: Disable) */ #define IAF_OFFSET 32 #define IAF_CTRL 0x38D -#define IAF_CTRL_MASK 0x0000000000000bbb +#define IAF_CTRL_MASK 0x0000000000000fff /* * Programmable counters. @@ -117,7 +117,7 @@ struct pmc_md_iap_op_pmcallocate { * 31-24 Counter Mask * 23 Invert * 22 Enable - * 21 Reserved (do not touch) + * 21 Any Thread (v3) * 20 APIC Interrupt Enable * 19 Pin Control * 18 Edge Detect @@ -127,7 +127,7 @@ struct pmc_md_iap_op_pmcallocate { * 7-0 Event Select */ -#define IAP_EVSEL_MASK 0x00000000ffdfffff +#define IAP_EVSEL_MASK 0x00000000ffffffff #define IAP_EVSEL0 0x186 /* @@ -159,9 +159,18 @@ struct pmc_md_iap_op_pmcallocate { #define IA_GLOBAL_CTRL_MASK 0x00000007ffffffff #define IA_GLOBAL_OVF_CTRL 0x390 +#define IA_GLOBAL_STATUS_RESET 0x390 +#define IA_GLOBAL_STATUS_SET 0x391 /* v4 */ #define IA_GLOBAL_STATUS_FLAG_CONDCHG (1ULL << 63) #define IA_GLOBAL_STATUS_FLAG_OVFBUF (1ULL << 62) +#define IA_GLOBAL_STATUS_FLAG_OVFUNCORE (1ULL << 61) /* v3 */ +#define IA_GLOBAL_STATUS_FLAG_ASCI (1ULL << 60) /* v4 */ +#define IA_GLOBAL_STATUS_FLAG_CTR_FRZ (1ULL << 59) /* v4 */ +#define IA_GLOBAL_STATUS_FLAG_LBP_FRZ (1ULL << 58) /* v4 */ +#define IA_GLOBAL_STATUS_FLAG_TRACETOPAPMI (1ULL << 55) /* v4 */ + +#define IA_GLOBAL_INUSE 0x392 /* v4 */ /* * Offcore response configuration.