From mboxrd@z Thu Jan 1 00:00:00 1970 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 1A6D7C433FE for ; Fri, 4 Nov 2022 23:57:25 +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=+5Fk2grSwrocdvMN+d++XUZ0zqYX6lowMIskiA4MELc=; b=jyMCbzUF8GMfou DXtONO2l4Z0z5caQT6jeWgCesxjY4OfYLApMQ7XVSF5fX5bI13JgBQKj3t8qCwpWRsioBMQk/AdzO bHlOI1/B3cf+LcEPjJfMu8ShlVVWUAyKbN3lxE4tHzccyQZ8FE5rcEkl8D5P5etTtXZzXjibvq2oJ Z/PaRDaSB9R8twSOqFFt0dp2sLsbPVQiVTRh2NQF679upGmXA6eXj7rHqWta5wS/dHyNhULgx9Cm9 RRF7wWIkMVSSy6ZjGa8J26HhVrwMnUd0Jnzvc1SqAuwE3gJwYK/gseIDA5YvLw85l/4mjXWn19Ql6 EnGGJ+P+L1c0xucodygg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1or6Y0-005XBQ-G9; Fri, 04 Nov 2022 23:56:28 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1or6Ws-005WfC-Nr for linux-arm-kernel@lists.infradead.org; Fri, 04 Nov 2022 23:55:21 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5884F62399; Fri, 4 Nov 2022 23:55:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C20E3C4347C; Fri, 4 Nov 2022 23:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667606117; bh=dBv/8WFqvl+x92t2p/3qrkiszszzeY2izSKz5+WDkYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E55VqwA3qz3gN+BCRXuId4H254rA4D7pnx0y7nkel6/vYvsEWCyKCXEKUm+SQw9Gc f1NL/N2UVO0OcFHMYT2o0EMDcM2Tc1UptqXdLf1iw9h5eYvvpKw4pIy1Rx1/CeAq2u 2hvpx1Y8QJtLvSe3ceHKIgEstM6EfO56FbgykPYuUf7pyNwK9YNiIXmpmTdEGQdVLi FMvrU7OW2L8sBxbVXSXmIg2XTIbXi3M1/SUfvRVFn24BJCMTxYzJQkoZhabsxIE2mc FtA/FtgpqwaOIjO8rHFEThSMVmQLvy5EfPKAdqyM6dQolUoFxRoc4njbG4EFcHXEKE hBaATF7x4HXUw== From: Mark Brown To: Catalin Marinas , Will Deacon , Marc Zyngier Cc: Lorenzo Pieralisi , Mark Rutland , Sami Mujawar , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 07/18] arm64/idreg: Add an override for FEAT_NMI Date: Fri, 4 Nov 2022 23:54:42 +0000 Message-Id: <20221104235453.870573-8-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221104235453.870573-1-broonie@kernel.org> References: <20221104235453.870573-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=771; i=broonie@kernel.org; h=from:subject; bh=dBv/8WFqvl+x92t2p/3qrkiszszzeY2izSKz5+WDkYI=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBjZaZB4wn/tRtJYWD2X3MrJ+T/x3CUScp8v13vu4q3 sSp5eluJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY2WmQQAKCRAk1otyXVSH0EXvB/ kBNvaLmSZp7quXl40XGOyRVGR3cTrTvEayKtoLAoELbIdC7e/s/JRRztaS5KScKiz9UXjQROJ1/vY2 8dTKqTc7HHi/I8h5NM2r5Nh+oFHMYF9m94OgbtiQxqeWmcGR5dnE/Z0kA4NsGUHi9B/5OfN+DQVu+M LhtnDkRY8Tsxco8WzwzWXASiHAESgLywPEAllI6SAp603vIx0MpbQ75EcsSboUwyHvqokZzRk7d6E6 fsYrcW3V4VRxHez579lZ+OE+SihZtyDMtl8r+GacW6yjkF7yDctrH4OreTuBC/GsKmRVL3EHSzqED5 5Nc2huASyBaTsJ08wP5vngp6IwD62a X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221104_165518_837828_0AF74DC9 X-CRM114-Status: GOOD ( 11.77 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a named override for FEAT_NMI, allowing it to be explicitly disabled in case of problems. Signed-off-by: Mark Brown --- arch/arm64/kernel/idreg-override.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 95133765ed29..bb25aa3a414b 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -100,6 +100,7 @@ static const struct ftr_set_desc pfr1 __initconst = { .fields = { FIELD("bt", ID_AA64PFR1_EL1_BT_SHIFT, NULL ), FIELD("mte", ID_AA64PFR1_EL1_MTE_SHIFT, NULL), + FIELD("nmi", ID_AA64PFR1_EL1_NMI_SHIFT, NULL), FIELD("sme", ID_AA64PFR1_EL1_SME_SHIFT, pfr1_sme_filter), {} }, -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel