From patchwork Wed May 1 14:29:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13650785 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 C437FC4345F for ; Wed, 1 May 2024 14:29:39 +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:Date:Message-Id:MIME-Version:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=R3ksvHRMrb9CLMiYUUctnaZ4eBc/nxMBjlSv4uCnRBs=; b=qDyInHO4wtB4xH BoxRPudtIu+3mIIUJVHIrk6ZEiaH3u6YWuU+lZGUC0sGxYTgQPPqGDQf/CzF2Q8kA3Jg+GLNRhF83 QAl1Al/qKE0gj0Mac+70t3uyESXa3U6PWZ9MXdFV2YUL0HpBIWkmBu3IEw6sPpUNrOR8dJbs6zSpP VjksfAEjSvNFoWBhJG80co6jJnMDehWkc1zMcg4KQQNP4yksmSRk7q6bZ1lcuTnyi4z+WFO1CvAxX /bWsmml5xxFlBujj06iQo0Ea4Xh9HkdHkOOzD9TuGJ7IHijUeiA2qC60UGy9IXyNYTEYD4DZDNDcC +FjJ7/Ev4qHqS1K5qC/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2Axa-00000009oIy-4ABU; Wed, 01 May 2024 14:29:26 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2AxX-00000009oHG-3kVs for linux-arm-kernel@lists.infradead.org; Wed, 01 May 2024 14:29:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:Reply-To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=flHhJZtmUWrbgiq2IRb/yn3nOSgZGp8qfx6LBezbmgo=; b=jxtjXiI2xKKvuMZ1Ck4uTcR7RZ 8Vo41x5yX6zqYsHr9liqQ5rik9zXhpZ0XxmhlgYEEi/W6T166IBPud+XYiO5FjXrCUpbRW03dnRpd jvquieJpwMMyhdoKxssD54fJDCkj+0qjtiiDYIim0ZsqM/QzCu/bE4Qq1b1Hh38oMQXzEQr+Ei3Bw Bblkn+PnbZpZoGG/xveFDHbqUFf8LbKKtE5xdx0I3rWet2PVzt+SO1nMb4foVap/8Y9Ojhe7lx0+h wY+oiUx++yLS8HodS0zSVfDpg6eXFzCNDzg0msVQlMT154r+pNi1kOnHpBDB38UDe+6RIi6E61EqQ OyIIt8cw==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:43310 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1s2AxD-0006HJ-1P; Wed, 01 May 2024 15:29:03 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1s2AxF-00AWLv-03; Wed, 01 May 2024 15:29:05 +0100 From: "Russell King (Oracle)" To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon Cc: James Morse , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Subject: [PATCH] KVM: arm64: remove duplicated AA64MMFR1_EL1 XNX MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Wed, 01 May 2024 15:29:05 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240501_072924_249679_06321598 X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. 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 Commit d5a32b60dc18 ("KVM: arm64: Allow userspace to change ID_AA64MMFR{0-2}_EL1") made certain fields in these registers writable, but in doing so, ID_AA64MMFR1_EL1_XNX was listed twice. Remove the duplication. Signed-off-by: Russell King (Oracle) Reviewed-by: Zenghui Yu --- arch/arm64/kvm/sys_regs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 3aa2cedb283a..0cc289b17665 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2338,7 +2338,6 @@ static const struct sys_reg_desc sys_reg_descs[] = { ID_AA64MMFR0_EL1_TGRAN16_2)), ID_WRITABLE(ID_AA64MMFR1_EL1, ~(ID_AA64MMFR1_EL1_RES0 | ID_AA64MMFR1_EL1_HCX | - ID_AA64MMFR1_EL1_XNX | ID_AA64MMFR1_EL1_TWED | ID_AA64MMFR1_EL1_XNX | ID_AA64MMFR1_EL1_VH |