From nobody Wed Sep 11 10:42:03 2024 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 4X3cZg5ch3z5WNC9; Wed, 11 Sep 2024 10:42:03 +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 4X3cZg2WsCz4Qg9; Wed, 11 Sep 2024 10:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726051323; 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=dMc5oZbxOV0/yBnH8t50EJSXTJYuQXE/If0N6k7v30E=; b=aG5yneKC799bKTJtiyMowCrGeDdpZFx6lUvlHN7JeER/Da9RDW37EVOlonDjEFSQMwW2Lc bzwqWWN5DrtHp3Nn45OxLjQjAO8wNZ2k3pbs4rfCyVP1uO+NRkVMFsXrNAkNPnYlJElES+ XRsn0CDFnuk7BvvnedYGMmvcefUKJa0CKFW2Thn1VN74MK4WXllJ7lmU4SncSB0HZoRfKx /4h1kFwW1aKEMm9hRf6M3Pw/65iiZWyvOtTvcL2Q18bgHejPR9UPt84S2jvQlzyFqNU0Xv IuosoPzSJjdVWn2KAVKB1RGfqtqZzJMZQ+HiIaQw/R65O8bFLlMiIg4Hem+dMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726051323; a=rsa-sha256; cv=none; b=tGHAPkjQIPYWchSLux494ixML7LSEfxiM/dytqVLVEUe68v1qaGU5S2+ed45HZ6hB/SHul VTbYMKzyOaZs0Oc+bhd8AtMqoQ3YB2j3uzpUE5pawW6Ox4360FeFMqt2JETyWqnO4zhbFF /iH9kAku4Ryr0iBBTYwCPSC1hUE9AO1KYqQA/FKunBGIfAy8iyUkq9Iqt5gI3pwIuNdFaq kZEAo1b3PUTWefaFHDE7w/CgQvDX58e55vPJ16sCPqgDPYNFDhbVf0P8fsDU44dB0P4j24 h2EPO07JHl2/U+x1CTkpioZWiIc7JN334+VJvg9X46U9QczM+EA4Qfip/nldXA== 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=1726051323; 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=dMc5oZbxOV0/yBnH8t50EJSXTJYuQXE/If0N6k7v30E=; b=o645bmYapVEmolHVWbcm3yzF7D7nKZO/qo+fMDmEHoME8/F7QaarqT3dV6rXFWsug7K40s PEI6mQijJiaGN0lLDSmUaPB1zv+tsWYzO/jE054g6Z0r6wpyNlX5yC9zCR24FYru4J0QPm CviNbiJc4t2B+ObxVYGAWZkQLx0nVj8TUU+bEn8pA7iUtQoeiWlWY6EmSgQEqkBeO0+9PO nYW6mXmMBa6h6Cgelf8GnZFYBDdQbaDbQqH3d56ob8ajb0gSRJ8S3ZIpSgMuUX20tVFA40 LIxP3R3g9tK42IMTW0cHiJ1pQT+7uzsGumpX8Ys1wFlMevT7kHa7DIKCTCT7dg== 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 4X3cZg27vtzSSH; Wed, 11 Sep 2024 10:42:03 +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 48BAg3ZK007629; Wed, 11 Sep 2024 10:42:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48BAg389007626; Wed, 11 Sep 2024 10:42:03 GMT (envelope-from git) Date: Wed, 11 Sep 2024 10:42:03 GMT Message-Id: <202409111042.48BAg389007626@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: 7a488d83b3af - main - arm64: Adjust the indentation of CPTR_EL2 values 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: 7a488d83b3af4d59946319b251a3a2060f18df40 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7a488d83b3af4d59946319b251a3a2060f18df40 commit 7a488d83b3af4d59946319b251a3a2060f18df40 Author: Andrew Turner AuthorDate: 2024-09-11 09:38:08 +0000 Commit: Andrew Turner CommitDate: 2024-09-11 10:25:08 +0000 arm64: Adjust the indentation of CPTR_EL2 values Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46513 --- sys/arm64/include/hypervisor.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 499dba9092fc..9f53c8255e49 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -53,14 +53,14 @@ /* CPTR_EL2 - Architecture feature trap register */ /* Valid if HCR_EL2.E2H == 0 */ -#define CPTR_RES0 0x7fefc800 -#define CPTR_RES1 0x000033ff -#define CPTR_TFP 0x00000400 +#define CPTR_RES0 0x7fefc800 +#define CPTR_RES1 0x000033ff +#define CPTR_TFP 0x00000400 /* Valid if HCR_EL2.E2H == 1 */ -#define CPTR_FPEN 0x00300000 +#define CPTR_FPEN 0x00300000 /* Unconditionally valid */ -#define CPTR_TTA 0x00100000 -#define CPTR_TCPAC 0x80000000 +#define CPTR_TTA 0x00100000 +#define CPTR_TCPAC 0x80000000 /* HCR_EL2 - Hypervisor Config Register */ #define HCR_VM (UL(0x1) << 0)