From patchwork Mon Dec 4 14:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13478567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56834C4167B for ; Mon, 4 Dec 2023 14:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u0l895fZHdYtqPFQUiqSHgdMOHE50t8VzXzQOTuyHCk=; b=dLGWDikoH3hK7K XQQvqb1MCHj7ktPCRID8uDctaAnGX1dvbeoFTWN5gxwZZQw7qZ+BHaqxCZ0fOMoPwdGQK2uyKt2VX JpNEK41VFfkInnUe+KMfg97Zm1+IjxBT0p4fFesr5Ea5jQAwkXjGfaUjmEtcr6wyfVg7/hZV1S7y1 vMOY8DtfwiNUT0wPpY3RZiC//0nks1rYWPsYs1xhI+1Bh0jDGJ7xm633lUJlQdTnEz2q+ob1mCt2s jfyuU0OT7k/T+I8ZtrggeqUKsEg/ghqzkofWstA2G0sFUBKfvVb3JWmsr/tB8GhpLkfWsGyBCVzm6 9MZy2KXZo0PQVQdIP7QA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAA3j-004nPf-0b; Mon, 04 Dec 2023 14:36:31 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAA3Z-004nJ4-1n for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2023 14:36:23 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id D7446B81018; Mon, 4 Dec 2023 14:36:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73D2EC433D9; Mon, 4 Dec 2023 14:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701700579; bh=FZ+C+EnF3vOVUHA+MrHs3acC5vLhu/lGMjJjrpw9QJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScMQMzZKP8/OjkFjjv4Z0k1wxHg4T5fVTvM492DJz721iOKteKom6s+I9q9RF/cW2 9VlusoUXX5MexfgoHC7T8+sM8ASSnmNSaK9f3M9A2pwuZVPASly5gp6mXawqhn2EJ/ vhjdggrYacgDqDbHAvKaRbJJxbQ3ito/BHuRytslfdzlXflMId+CHtY1pSqwMcZ0qo bYcwMHdlcz6NxbV0GmqOErXgNct9TTn1KCHX68MWgHYL+3evO/YbXLtlbhSk1cPijA vChQxn329IY5hAfWHfnZhR1zRVIQPhs79lNslIn4cNeWvZzM/A3WD8YD8P4tNzXoXW 64Pn5lgNHEZog== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rAA3V-001GN2-Gp; Mon, 04 Dec 2023 14:36:17 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Will Deacon , Catalin Marinas , Mark Rutland , Ard Biesheuvel , Anshuman Khandual , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu Subject: [PATCH v3 3/3] arm64: Rename reserved values for CTR_EL0.L1Ip Date: Mon, 4 Dec 2023 14:36:06 +0000 Message-Id: <20231204143606.1806432-4-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231204143606.1806432-1-maz@kernel.org> References: <20231204143606.1806432-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, ardb@kernel.org, anshuman.khandual@arm.com, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231204_063621_931556_D49112CD X-CRM114-Status: GOOD ( 11.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We now have *two* values for CTR_EL0.L1Ip that are reserved. Which makes things a bit awkward. In order to lift the ambiguity, rename RESERVED (0b01) to RESERVED_AIVIVT, and VPIPT (0b00) to RESERVED_VPIPT. This makes it clear which of these meant what, and I'm sure archeologists will find it useful... Reviewed-by: Zenghui Yu Signed-off-by: Marc Zyngier Reviewed-by: Anshuman Khandual --- arch/arm64/tools/sysreg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg index 96cbeeab4eec..c5af75b23187 100644 --- a/arch/arm64/tools/sysreg +++ b/arch/arm64/tools/sysreg @@ -2004,9 +2004,10 @@ Field 27:24 CWG Field 23:20 ERG Field 19:16 DminLine Enum 15:14 L1Ip - 0b00 VPIPT + # This was named as VPIPT in the ARM but now documented as reserved + 0b00 RESERVED_VPIPT # This is named as AIVIVT in the ARM but documented as reserved - 0b01 RESERVED + 0b01 RESERVED_AIVIVT 0b10 VIPT 0b11 PIPT EndEnum