From nobody Wed May 24 16:20:17 2023 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 4QRGcf0hKtz4TDs8; Wed, 24 May 2023 16:20:18 +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 4QRGcf06xhz43hq; Wed, 24 May 2023 16:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945218; 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=pv9/KV563JUDm6Js727AlEcXItGuVozvg4ja6Z2qiXw=; b=r79VDNZOMvYBYmZpY4xMfMOQW5+xVIjCUnypRfK366+7U4S/bEV/q1zkiYIgp0mHlohmhs Q3/HXNiG21xyv74mjQDZoGaZRtZ0wqgb/1snF+waaLzOT1U+lgMjDx7MaC3dQfUudD+hSs nRIag5mzCal+ilyf+SAdDOVQBwXQBNFGcz/zjXGBLLoC5wTOSGf5cmFbYVpiKW5VOQFuso MnLhm92miumgiMDV2bM/v5tySlbeYUJ9HsbW5iDYFh9PVAFdnGwBKWD0Z9T2kJvsPMEukp bo6SRFmhSopgBFnXGgcvzG/oL28HP9bmK0xLJD9zSPA6XiTcF/j800jozy+zEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945218; 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=pv9/KV563JUDm6Js727AlEcXItGuVozvg4ja6Z2qiXw=; b=tT4fX2+l0SDl8NozYu74bS91hzom+H7mbJp69eIL/u1OHiT0NVJseNvkoVbYxyUoZV7jgf 4+uIRbtpZVnb0CO8UXVDxAd8hWYsulZhAWd5PAC9ht86BQjvekRz+d67HQgu257xnTreYg 1vHcSAn2rYEX5tPhHvcFXthImPCPFXrTQiXZhulOOE7vCZlko6N66TU878EFO6gdwNC627 lu/CPpccuynl9vzEhOCfcGVGmaScLPkmW8ZnCFHRON5K8uI7Kh6tkcR3xxiSwKUqZvaP3l 3TG3u9KQko2zu+/xbgzwiNjJqOCHJMeqc5LEIWY1R2VHBYW497pG5Z1A4EVB/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684945218; a=rsa-sha256; cv=none; b=mFOadbPlVbgAT4CK+JkNe6s84dvVvsp+hEdgSGk9OM4LS+V7TItyEik18SyZf3JxXVkHV4 PQE4LQLJvbjr3O/a3VwzjsjAJp6A6Ek7byh1VwLQh23EVS5kd/webK5f8EpY+pE6Kj/5Ju BBdQlr1X0P87VY58SHYAj6lC2CSUAakBGfZDNAAY38zsg8ONGC8LuWcOylXBziNmxK0p0F gsEYiLnCUOS4RkNLeVMU3IOkxT9JZYw1sSnQRIt4jNGiaG/sqUUNGwe5LEpaSpDvAN0A9M uJd6Svk50/Zdjskz3vdXq9uuHWKwUfOnvmbFXgf139a+qpj5yaGLautz0mmvZw== 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 4QRGcd6JKBzpFt; Wed, 24 May 2023 16:20:17 +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 34OGKHYd078793; Wed, 24 May 2023 16:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OGKHaQ078792; Wed, 24 May 2023 16:20:17 GMT (envelope-from git) Date: Wed, 24 May 2023 16:20:17 GMT Message-Id: <202305241620.34OGKHaQ078792@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: 800b39cf99b2 - main - arm64: Remove CNTHCTL_EL2 from arm64.h 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 800b39cf99b22614c17a5e12156acbb3df66156a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=800b39cf99b22614c17a5e12156acbb3df66156a commit 800b39cf99b22614c17a5e12156acbb3df66156a Author: Andrew Turner AuthorDate: 2023-05-24 14:22:41 +0000 Commit: Andrew Turner CommitDate: 2023-05-24 16:20:05 +0000 arm64: Remove CNTHCTL_EL2 from arm64.h It is also in hypervisor.h where it belongs. Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 5c174bcbc838..cd5e7b8e1db8 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -101,13 +101,6 @@ #define CLIDR_CTYPE_ID 0x3 /* Split instruction and data */ #define CLIDR_CTYPE_UNIFIED 0x4 /* Unified */ -/* CNTHCTL_EL2 - Counter-timer Hypervisor Control register */ -#define CNTHCTL_EVNTI_MASK (0xf << 4) /* Bit to trigger event stream */ -#define CNTHCTL_EVNTDIR (1 << 3) /* Control transition trigger bit */ -#define CNTHCTL_EVNTEN (1 << 2) /* Enable event stream */ -#define CNTHCTL_EL1PCEN (1 << 1) /* Allow EL0/1 physical timer access */ -#define CNTHCTL_EL1PCTEN (1 << 0) /*Allow EL0/1 physical counter access*/ - /* CNTP_CTL_EL0 - Counter-timer Physical Timer Control register */ #define CNTP_CTL_EL0 MRS_REG(CNTP_CTL_EL0) #define CNTP_CTL_EL0_op0 3