From nobody Wed May 28 13:35:05 2025 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 4b6r8p541Vz5xVC7; Wed, 28 May 2025 13:35:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8n5FLPz3M5X; Wed, 28 May 2025 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439305; 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=H16FPNe6zJ44+EbZLdT9KrYN+inRGmkEqWbM+ImvSs0=; b=KUEL2d5JJ3F+i1JCVGaF9ASu5eTS0sgx7KP6cRY2xcn8cVZOkgerWjAoxJL19gvE3iVrBs 2+TlfTkk7sNHNA9igFkgA77XIJWSUXwoHnuK3JJPT8puNJtIefT3vAmY7Uj5ssqzBQTMNo QhdsJDuJFBY/Fipm+16dhsfLNvegSXseXzr6wYdE2laIWcIVa/Nj05UHfPM+q4T7AonyE7 K0M+wSGuuy+AUa8r2ZuctrPC+ZtW3OxcySoz7Ke6/lnEU8ac+HBNZfAZFhybj38xy3FBlw dBjaAMYgQn46r+j156OWBlnCLPQg01yXwjWsZWtrmVrbxWbfji7RFhzCw6tF9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439305; a=rsa-sha256; cv=none; b=DTVZfZOSbqIFK7KNUHWdRm2y0rq9eCjRkwaeAT8Eutj29kdI/mm7PDOs6PgJG1hiWnOLHN b4+uFwojZ/ha7uGZXmZaAsRHzOpildZK4D2uwKcr9LX6TXWAexiA1zcpoD7xZCXsC+2Doi UKEQlYFYhNFBraXvh3rIINEPw2wtMxljgjuvmJP6zM+DW791wLIZ6YKCv8k6gNCZcTNTPM nvZOlZeV002FxHVeGMHjLITfK4VylGXni5kI7DRdG3oavBUoZkRzYIX3tI9+/tHAg8O/nH XT2VbPD+vjhTDltcp3IuAwIaLmoP7bzrXfJpdGlL84c9LXS+Nz0eLUiWpiaxWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439305; 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=H16FPNe6zJ44+EbZLdT9KrYN+inRGmkEqWbM+ImvSs0=; b=TK19xGvxsWZs7+IwE+KDysN71cletvRvfDO1IdFPDZXH9rUB/Ilc0A5odl69EYqova2a7Q jgkWKhPbsGu9xx3U2omUAZ40wcPdIPh4n/tCjmPSy5yd5mQVaoY6HSP6NE5F47rvls5wT/ SJCpcOqTMMjvbr63zv2AUvVigLIjZHa6OlwYbjsSm9TlbwCw0Rb9LvAZDSIyAY2joFXfZT 8F1lg1fq+gHFLG67KCIar6GJ35X+UwMCsne6Syk3jgZXXuM0f2uyjnI5iceQpmtCPIF+Yz rhx2FvfAME/csoaA76f+HKYX1OHu6cwb/5mTBNvBWZYenJLP5yYnK4caxIyeaA== 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 4b6r8n4nr7zg4K; Wed, 28 May 2025 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SDZ5O4017630; Wed, 28 May 2025 13:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ5jn017627; Wed, 28 May 2025 13:35:05 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:05 GMT Message-Id: <202505281335.54SDZ5jn017627@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: 8cad445495a1 - main - arm64: Sort the PMCR_EL0 fields 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 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: 8cad445495a159cb3a15a1ecdb057474ee9af7d8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8cad445495a159cb3a15a1ecdb057474ee9af7d8 commit 8cad445495a159cb3a15a1ecdb057474ee9af7d8 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:07 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:07 +0000 arm64: Sort the PMCR_EL0 fields Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50428 --- sys/arm64/include/armreg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index a7950092048d..df6f7bb7f47b 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2377,9 +2377,8 @@ #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_IMP_SHIFT 24 /* Implementer code */ -#define PMCR_IMP_MASK (0xff << PMCR_IMP_SHIFT) -#define PMCR_IMP_ARM 0x41 +#define PMCR_N_SHIFT 11 /* Number of counters implemented */ +#define PMCR_N_MASK (0x1f << PMCR_N_SHIFT) #define PMCR_IDCODE_SHIFT 16 /* Identification code */ #define PMCR_IDCODE_MASK (0xff << PMCR_IDCODE_SHIFT) #define PMCR_IDCODE_CORTEX_A57 0x01 @@ -2393,8 +2392,9 @@ #define PMCR_IDCODE_CORTEX_A55 0x45 #define PMCR_IDCODE_NEOVERSE_E1 0x46 #define PMCR_IDCODE_CORTEX_A75 0x4a -#define PMCR_N_SHIFT 11 /* Number of counters implemented */ -#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 /* PMEVCNTR_EL0 */ #define PMEVCNTR_EL0_op0 3