From nobody Tue Aug 20 09:02:13 2024 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 4Wp3Pd4Qq2z5Shxc; Tue, 20 Aug 2024 09:02:13 +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 4Wp3Pd1kKFz4vPl; Tue, 20 Aug 2024 09:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724144533; 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=TR2i+SftWEvkGiJL5DYY8DgWRcAhtvz+tN86g9aej3w=; b=JynR6WSG0F+TphzVYCjlPp7AjTGzsZ51ghkqzJeQVe1SqKyTWAPPlUnN9YWLWInpTTmtXd ED96l6DkA3C1pHHMFrPyBNpE18GCpBGWHUGqTfMwS1SKvqnwpp01pltbykZsJEEL8CSR0a eF25gm0fqm5xpOtYwLaU3Igpw1AfR+AOIU/eNd7tHaN1nD1MwcTLW7RmK+7jAQiFX8Xw9U v3u+Sz4ChyeQ8VjOuftWlGx5YvkalsX59t+cGDfDbUXqTcVxfQhaa7oaQlK7+pjn48sWgb u09a8bvvX06UotMy2TGK8849mDI3MDg1xfeuQElHtReAUNw6vVssjssrCPBX3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724144533; a=rsa-sha256; cv=none; b=glnHZNDLJFCFQR7VYbYW8Try1vv0Ay9x1rmC91imJH65PrWKVhnYLTjeTI/wjrCG6XhXnr FV2djn6eXofNKSN6PlJnPJZtou5znRfYFoEIaJMK/iVahbgopYf3FotHA8ru7LCEEam7Vk pDgWv4ZFo0EWsQ7P7sR3xVU7dLQFf220+z3BjRbgyzwDJUUjg1e0UVyTt3I7UBR6sO2lY9 KkRS6NpEr/n1Dqx+FISvIMzrFVpB6/+PkySoyVAfxWvTCiVVGKUqHNebP/03cce5bZb/9i j3BDKaz1q5EAL5lnv6yc+mYnx2m7NpixhfWIWn+5if+Oagtz65pVIEXWz6SWQQ== 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=1724144533; 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=TR2i+SftWEvkGiJL5DYY8DgWRcAhtvz+tN86g9aej3w=; b=mHPC5LQzkjhyrAY20JXtidEeXbug7PyFRWXzsrDUkpowBfQaMWN2kihRZIYBEhMV8s9aRm K8aqgoed2niU0eX0zVctR1NgKlJIfn2CzYVg99otFlqz9RhszzdkRKUBq9xTCORuB9GEKV MgmT//FSI6zqnWx7HavnDHZSW3NPLvn96Ca3N2MoOUQN/EvuJDEFh21v8VIpzEaUa4qvJf 8dGQocUOhvgqLTO8DKetqpdAGf4EcRTVcZHWmJFOiEcrzy15E4shCrQb1Mta2Q7sDUiX4V tuLq7N1tztNqPDZ0Rzk+AHSwov6ZwiAxonwWgpAmfjpc8NgzUfu83b4W+9KydA== 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 4Wp3Pd13KFztys; Tue, 20 Aug 2024 09:02:13 +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 47K92Dtj078147; Tue, 20 Aug 2024 09:02:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K92Di3078144; Tue, 20 Aug 2024 09:02:13 GMT (envelope-from git) Date: Tue, 20 Aug 2024 09:02:13 GMT Message-Id: <202408200902.47K92Di3078144@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: 4db15ab2c65e - main - arm64: Add counter timer registers to armreg.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4db15ab2c65e60f4d49d40ad6922ca301b184510 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4db15ab2c65e60f4d49d40ad6922ca301b184510 commit 4db15ab2c65e60f4d49d40ad6922ca301b184510 Author: Andrew Turner AuthorDate: 2024-08-19 12:43:05 +0000 Commit: Andrew Turner CommitDate: 2024-08-20 08:49:15 +0000 arm64: Add counter timer registers to armreg.h Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46071 --- sys/arm64/include/armreg.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b2ab472dad0d..ce21bf4de0a9 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -231,6 +231,22 @@ #define CLIDR_CTYPE_ID 0x3 /* Split instruction and data */ #define CLIDR_CTYPE_UNIFIED 0x4 /* Unified */ +/* CNTKCTL_EL1 - Counter-timer Kernel Control Register */ +#define CNTKCTL_EL1 MRS_REG(CNTKCTL_EL0) +#define CNTKCTL_EL1_op0 3 +#define CNTKCTL_EL1_op1 0 +#define CNTKCTL_EL1_CRn 14 +#define CNTKCTL_EL1_CRm 1 +#define CNTKCTL_EL1_op2 0 + +/* CNTKCTL_EL12 - Counter-timer Kernel Control Register */ +#define CNTKCTL_EL12 MRS_REG(CNTKCTL_EL0) +#define CNTKCTL_EL12_op0 3 +#define CNTKCTL_EL12_op1 5 +#define CNTKCTL_EL12_CRn 14 +#define CNTKCTL_EL12_CRm 1 +#define CNTKCTL_EL12_op2 0 + /* CNTP_CTL_EL0 - Counter-timer Physical Timer Control register */ #define CNTP_CTL_EL0 MRS_REG(CNTP_CTL_EL0) #define CNTP_CTL_EL0_op0 3 @@ -266,6 +282,38 @@ #define CNTPCT_EL0_CRm 0 #define CNTPCT_EL0_op2 1 +/* CNTV_CTL_EL0 - Counter-timer Virtual Timer Control register */ +#define CNTV_CTL_EL0 MRS_REG(CNTV_CTL_EL0) +#define CNTV_CTL_EL0_op0 3 +#define CNTV_CTL_EL0_op1 3 +#define CNTV_CTL_EL0_CRn 14 +#define CNTV_CTL_EL0_CRm 3 +#define CNTV_CTL_EL0_op2 1 + +/* CNTV_CTL_EL02 - Counter-timer Virtual Timer Control register */ +#define CNTV_CTL_EL02 MRS_REG(CNTV_CTL_EL02) +#define CNTV_CTL_EL02_op0 3 +#define CNTV_CTL_EL02_op1 5 +#define CNTV_CTL_EL02_CRn 14 +#define CNTV_CTL_EL02_CRm 3 +#define CNTV_CTL_EL02_op2 1 + +/* CNTV_CVAL_EL0 - Counter-timer Virtual Timer CompareValue register */ +#define CNTV_CVAL_EL0 MRS_REG(CNTV_CVAL_EL0) +#define CNTV_CVAL_EL0_op0 3 +#define CNTV_CVAL_EL0_op1 3 +#define CNTV_CVAL_EL0_CRn 14 +#define CNTV_CVAL_EL0_CRm 3 +#define CNTV_CVAL_EL0_op2 2 + +/* CNTV_CVAL_EL02 - Counter-timer Virtual Timer CompareValue register */ +#define CNTV_CVAL_EL02 MRS_REG(CNTV_CVAL_EL02) +#define CNTV_CVAL_EL02_op0 3 +#define CNTV_CVAL_EL02_op1 5 +#define CNTV_CVAL_EL02_CRn 14 +#define CNTV_CVAL_EL02_CRm 3 +#define CNTV_CVAL_EL02_op2 2 + /* CONTEXTIDR_EL1 - Context ID register */ #define CONTEXTIDR_EL1 MRS_REG(CONTEXTIDR_EL1) #define CONTEXTIDR_EL1_REG MRS_REG_ALT_NAME(CONTEXTIDR_EL1)