From nobody Wed May 28 13:35:06 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 4b6r8q2ZX9z5xVC8; Wed, 28 May 2025 13:35:07 +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 4b6r8p5s19z3M1g; Wed, 28 May 2025 13:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439306; 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=892xrQUbspBS8OrhinM3TEHlaBWI62vbgfIMq1F1Amw=; b=OeLydSPwMY6C2DoaHyPeqWcHrCwFfDGzjSprCMJFy91oqbf0JF0tl/FRn5LocoADbjP+nY Ly8iF23x6a00Ht0chRjQvjvy0UL4hCWxjM1MmkuWCg5K4spP6eJa/OYG+UgISlNWasBG+S bhyBp3qA6kTGSXQ8mdplTOiXQphMY/kopLrVeIEbk1u6t1lCL/BKKuUDVTJCeCwlU63Gc/ CWRphJLfZc6ibfV3PIE0RjBy7DiJnEXcatGvjWRuUAWgtha0FQMC/UAtaey08R2nMSk94u YlYwoHa+V4DgLEu368/4wUUOC0IeWbS7EF8N0ic6KFn3QkeT+zVHJsAlmr/mBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439306; a=rsa-sha256; cv=none; b=wxibjdviDgm32aB1Lhte74x2K697ZXxMM9udOkq3778cA/Lkit77kfPxymJMXcbzuw6VnR CIU6OxnJ/nUYuqbB3DRmlW/UagKt7eK5lO91+L1KcoxKoJnRMQzo7WbB8R2zsPZUB+RpME KSGydknHx2BHyyVmRojwgO+G+XqIvetP5qENsa1IE4gJWiwIiiXuaW52Dx0So4a5iCRgtc SObAEFL/7WvBlEDBcllyUAQb2plgrwQE+39vHVr8fxG7ILGM6v+IJsGf9hlGBTQgI/bXT/ Aq5UvAvRWe16AaUFZqNlBy0v48/+ncPONE4bcutuqsyUYZvwNU7pk4V5DjPTGQ== 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=1748439306; 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=892xrQUbspBS8OrhinM3TEHlaBWI62vbgfIMq1F1Amw=; b=wtEB8Q598gT0I6VDtvNW1zpY26HrPvDuCvbwlbO5FEItWghUKfrBmoYXDWhUDaQP8wbOGU 1dcf8x5OpOuGG/Bz9QfqBmD7QSdnZX9NGgPL6RNqifzBQS6U6sCM/qoIAjXasj6fvYUqN8 4fW3SP6VHDeCwjeTov6M3rP/uo1I37fuF95DqsCQ+JBVLP13DGUfxlu7TMUSMDvavCeZKX ZZA0PLAICymFSIOBIfpcdt8fJgBA/DZcLhXsGpi8JbnwIZZevuIdvMaXUX5cJDVEASAoKo I9nO/KRYScvVRrtzzLbDm0ZELYWUVzPrsEaQmQdCx6yzOhtyygBWcjNPL2rHgw== 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 4b6r8p5Ll4zg6W; Wed, 28 May 2025 13:35:06 +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 54SDZ6UD017663; Wed, 28 May 2025 13:35:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ6kJ017660; Wed, 28 May 2025 13:35:06 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:06 GMT Message-Id: <202505281335.54SDZ6kJ017660@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: 18db17f5ec86 - main - arm64: Make all the PMCR_EL0 fields 64-bit 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: 18db17f5ec86f6473f40eb496739773f4c053ab2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=18db17f5ec86f6473f40eb496739773f4c053ab2 commit 18db17f5ec86f6473f40eb496739773f4c053ab2 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:15 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:15 +0000 arm64: Make all the PMCR_EL0 fields 64-bit The register is 64-bit so make sure the fields are too. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50429 --- sys/arm64/include/armreg.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index df6f7bb7f47b..1571fe273e16 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2370,17 +2370,17 @@ #define PMCR_EL0_CRn 9 #define PMCR_EL0_CRm 12 #define PMCR_EL0_op2 0 -#define PMCR_E (1 << 0) /* Enable all counters */ -#define PMCR_P (1 << 1) /* Reset all counters */ -#define PMCR_C (1 << 2) /* Clock counter reset */ -#define PMCR_D (1 << 3) /* CNTR counts every 64 clk cycles */ -#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_E (1ul << 0) /* Enable all counters */ +#define PMCR_P (1ul << 1) /* Reset all counters */ +#define PMCR_C (1ul << 2) /* Clock counter reset */ +#define PMCR_D (1ul << 3) /* CNTR counts every 64 clk cycles */ +#define PMCR_X (1ul << 4) /* Export to ext. monitoring (ETM) */ +#define PMCR_DP (1ul << 5) /* Disable CCNT if non-invasive debug*/ +#define PMCR_LC (1ul << 6) /* Long cycle count enable */ #define PMCR_N_SHIFT 11 /* Number of counters implemented */ -#define PMCR_N_MASK (0x1f << PMCR_N_SHIFT) +#define PMCR_N_MASK (0x1ful << PMCR_N_SHIFT) #define PMCR_IDCODE_SHIFT 16 /* Identification code */ -#define PMCR_IDCODE_MASK (0xff << PMCR_IDCODE_SHIFT) +#define PMCR_IDCODE_MASK (0xfful << PMCR_IDCODE_SHIFT) #define PMCR_IDCODE_CORTEX_A57 0x01 #define PMCR_IDCODE_CORTEX_A72 0x02 #define PMCR_IDCODE_CORTEX_A53 0x03 @@ -2393,7 +2393,7 @@ #define PMCR_IDCODE_NEOVERSE_E1 0x46 #define PMCR_IDCODE_CORTEX_A75 0x4a #define PMCR_IMP_SHIFT 24 /* Implementer code */ -#define PMCR_IMP_MASK (0xff << PMCR_IMP_SHIFT) +#define PMCR_IMP_MASK (0xfful << PMCR_IMP_SHIFT) #define PMCR_IMP_ARM 0x41 /* PMEVCNTR_EL0 */