From nobody Wed Feb 21 11:27:52 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 4TfvCD5cp6z5C1Wh; Wed, 21 Feb 2024 11:27:52 +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 4TfvCD2jWKz4N41; Wed, 21 Feb 2024 11:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514872; 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=yVjdrBsG0rmAwmGuTF4GDAPW92dzP7rsiHJHo2/80r0=; b=UE0BWxnTomsk7/pRc3A63jZhDwxWdYN4U+jev+Ir0h7rJHeDGdjyDl46jtx3e80KtSPjke c6SECZcz1JhG4OnCdczYQwZGTPsmXCYyjv1/Vwwng5OrPuI6fxsQcZgat9Xj/GBBe7mEY1 XNfShI5x436OsX63KYFnRVMDZrWHb4fjLez7LvQhA5CcOCOQZsasS/2hX2X8R+3Z9dZCXm L5Sd9q+hfRgvEXZXMvMx+oe0hSHFiwlwNad7SEbjPHTPM92fX2ZhVz5ZzqOuzUpcEuJweU 51EFqV758W1sDcTrqurT48GokLUvjR4AgBgcrPtf03aW/aWBfd9tsEbhC6nnRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514872; 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=yVjdrBsG0rmAwmGuTF4GDAPW92dzP7rsiHJHo2/80r0=; b=ibG7nLxct3+NC6tDgko6CQahcoH9y9na12CJZspOxyW1NAGmDVuAHJW4444kaI5WgvrDap lNUSEP8Zz5hGRKotHXo0wJn5jKBrpcvOkKYAcpWnp2IyKT6dLP6gCk/K8LWJXOh8FXYvyH EaKIwCvcCJQq1Xco5tQ/KtdO0xFfuHIziXeDsj3DI2v9/wsU4S0JikMH3Z79l1e2LfDRWh eP2aG43e392R3aBXd7ZpQBnElJPmNfoY5iZlAOSsBtMYo7bnPNiTWL/Uhx21Vl8T+dp80C 7zrQo4+mbDmWrHCoc6KD9Xc2pQcQjUUPulBDGs7A8DtLFk3gyiFqXZTYWBPeOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708514872; a=rsa-sha256; cv=none; b=Jm+gzaGU7gYJ2PHT6ZLE/rZGNnkG0iAunkbttH3fPo37HSC/xLEDgJp/qZ5xzDvtvGBIEM 8Wpiy+2dsJWbrJVLMBs4LU/yp2LA4l/qAR8meB/rLQTcJW2yD+jOq2J3DhKtpRXw3+TxaV xQkEKg9BcCXa2XJNciX6LNy35LfHLAfx0x/vqQAXyO1zl16fdph2riqXrbJtX6rGcG97dm K82vmsC4qZNebCvOieDDRvc3LZ9xe9k6wP4rZBaapn/F4MxJ1lSZRWN6ZgpkO7h+NyVqys pa8kDHFPIUOmRaZ1URzJK8JonuWNEPB7HPRiRvjrrtqG3dgRqD8WrSRy/HtxtA== 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 4TfvCD1nW4z10bS; Wed, 21 Feb 2024 11:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LBRqPE013374; Wed, 21 Feb 2024 11:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LBRq4E013371; Wed, 21 Feb 2024 11:27:52 GMT (envelope-from git) Date: Wed, 21 Feb 2024 11:27:52 GMT Message-Id: <202402211127.41LBRq4E013371@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: 353b6a5bcb5a - main - arm64: Add in_vhe() to find if the kernel is in VHE 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: 353b6a5bcb5ae6943903b38ebcc0922b059ff8b8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=353b6a5bcb5ae6943903b38ebcc0922b059ff8b8 commit 353b6a5bcb5ae6943903b38ebcc0922b059ff8b8 Author: Andrew Turner AuthorDate: 2024-01-11 17:01:52 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 11:26:29 +0000 arm64: Add in_vhe() to find if the kernel is in VHE Add a function to support devices that may need to know if the kernel has enabled the Armv8.1 Virtulization Host Extensions (FEAT_VHE). Some devices, e.g. the generic timer, will need to know, e.g. use a different interrupt. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43973 --- sys/arm64/arm64/machdep.c | 8 ++++++++ sys/arm64/include/machdep.h | 1 + 2 files changed, 9 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 9ce1c40b674c..c7f451543687 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -215,6 +215,14 @@ has_hyp(void) return (boot_el == 2 && (hcr_el2 & HCR_E2H) == 0); } +bool +in_vhe(void) +{ + /* If we are currently in EL2 then must be in VHE */ + return ((READ_SPECIALREG(CurrentEL) & CURRENTEL_EL_MASK) == + CURRENTEL_EL_EL2); +} + static void cpu_startup(void *dummy) { diff --git a/sys/arm64/include/machdep.h b/sys/arm64/include/machdep.h index 80cb28bcfbeb..2f2960ae39f2 100644 --- a/sys/arm64/include/machdep.h +++ b/sys/arm64/include/machdep.h @@ -48,6 +48,7 @@ extern enum arm64_bus arm64_bus_method; void dbg_init(void); bool has_hyp(void); +bool in_vhe(void); void initarm(struct arm64_bootparams *); vm_offset_t parse_boot_param(struct arm64_bootparams *abp); #ifdef FDT