From nobody Fri Mar 11 17:52:29 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 9C1331A05122; Fri, 11 Mar 2022 17:52:29 +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 4KFYRd3r2vz4q0S; Fri, 11 Mar 2022 17:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647021149; 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=cVxD1RJ08svj9vPq3t6uCdLAl3zhXgi26opqk6DJJnc=; b=XmahArzkOM+Rd1zsr4Tj/PTkjgb9wb1WOMphNMKM4af8Hrh20U89OzEKEfE5NmVhHlZudV 4zbFQrt7lp3kpITAo6LCLVoY07qXlvMq81vtJnHAuHSqboOuF3jjeelCsOxfm0Q/3gCRrN iL7DRymHKnbkLpQStlVUqXcC6XsVwDHo5XsUCwH7qQKr0qI6oFvCtlAvGePt/PpdvfW6Kc r3WQHrsQP63CamkUjDY1XzuCNuwdsDJHxJPIoPWvLOKunqpEhZy9Id3ZB9SsryTl4kiaW4 XwOT6jbOh55EOLQibroQZaV6IycMizBgXrDHS1Rk/gob31EiiVnYQ3A7gPOEbg== 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 6405F1D9ED; Fri, 11 Mar 2022 17:52:29 +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 22BHqThr092113; Fri, 11 Mar 2022 17:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BHqTk1092112; Fri, 11 Mar 2022 17:52:29 GMT (envelope-from git) Date: Fri, 11 Mar 2022 17:52:29 GMT Message-Id: <202203111752.22BHqTk1092112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7e35f7834cea - main - Revert "Add the PMCR_EL0.N arm64 register field" 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e35f7834cea4539a3562150f7ddc7d017cf630d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647021149; 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=cVxD1RJ08svj9vPq3t6uCdLAl3zhXgi26opqk6DJJnc=; b=fWpuqIxQgSycV/0cqsi8TJAvhPf4f0QBKTvVRwzMzy54SHCcOeiKog60O2AQ7F799cK0mM hJT2fYZNohXR4J0yW7r/Ydc7g+AMWyEYOlLiXYIWiQQrPhbcUWg2Z/Fcku3mR47IqArmg4 6d2vQrwbtKDNnm0aokFqgJaBSxJFi4up+jjmI4Cv9/kbAHTaR0tHXAyYSRjevccA9eJdmT iPqbTn+0uobv7RYRh+VxdUZXIgxaRdBB8wgXv1P1g+Pj/Vx0bpht8VIKCaarO8lsQ+Dv3x 5Iz0//SA4RBX2Xr6w/VSqt+/5nrh5PSuIjxH8SLa6D0Uv2fNbP3DnVnzoUzG8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647021149; a=rsa-sha256; cv=none; b=ydEWHBJ7uBVrM9Rs51NOoKDggMfHl1XoNXQ9CIo/cNcPOe3XxniNTfPwos+H825fmsH1HH GJbW1DPNuVLIyAj9exYKSHexzQ5XkoVc+TQv1SJcTykP0DRybTrDujiterBOmceIo7eXuh SomUFG4uy5emH9RDVHGc+r7ePA1sOdnK+DJan+43+3Qc8etRGGgKTcRH7sj3+dzKiNnZ1g ND6PEOLEjT5Bpydy2dX1cCzE1D6nPgg4Qc4nDUPA7R6w2y4zNCe1Wtvlm7zkXa6xboXDEP utHL9dP12BvEspRgJxv2yqyUFx3s9KyMSvA8e3d2phMMdgYmThmD33Csgfazvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7e35f7834cea4539a3562150f7ddc7d017cf630d commit 7e35f7834cea4539a3562150f7ddc7d017cf630d Author: Andrew Turner AuthorDate: 2022-03-11 17:51:27 +0000 Commit: Andrew Turner CommitDate: 2022-03-11 17:52:08 +0000 Revert "Add the PMCR_EL0.N arm64 register field" This reverts commit b6fd96ed0b40e5a42eaea662b5461070c93a1c6c. --- sys/arm64/include/armreg.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 2e34d037a524..361dcc2cc737 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1311,8 +1311,6 @@ #define PMCR_X (1 << 4) /* Export to ext. monitoring (ETM) */ #define PMCR_DP (1 << 5) /* Disable CCNT if non-invasive debug*/ #define PMCR_LC (1 << 6) /* Long cycle count enable */ -#define PMCR_N_SHIFT 11 -#define PMCR_N_MASK (0x1f << PMCR_N_SHIFT) #define PMCR_IMP_SHIFT 24 /* Implementer code */ #define PMCR_IMP_MASK (0xff << PMCR_IMP_SHIFT) #define PMCR_IMP_ARM 0x41