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 7CAE4C4332F for ; Sat, 12 Nov 2022 15:19: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=+5Fk2grSwrocdvMN+d++XUZ0zqYX6lowMIskiA4MELc=; b=ufxxYC+d5QWZzL OMUAfyJD41jspiHV2pWfyDTVAM9a76YgX1cpyW2gddvklIb5vGFhCKWgALyCWbqur6yCx5AqAS9Ez LSGbc7zYwXPhytsB0FLoi1euUeH8/3we5GeIV4DiKHtBfHLCO1W1nMIzEy4ea3vuWEvEHhm1Vgrja 5CF5ecGA7ZzRvf5X0SjW9hR0Pm/Vjo8DLgdky+v7ad2akw2Ogd1PHDqYS8COtrzeqxt2iBqXZF/vF 1Br6HJQ590CLsRVaBLXO7MynIU945u/Dz0U1rs/8iEWYbP4DKr9niXG5H5U4YdNt7jEgZWjlfsWgY n/l2l6haKCGX+8FQwE1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1otsHV-006Jh2-Vp; Sat, 12 Nov 2022 15:18:54 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1otsGh-006J7d-F4 for linux-arm-kernel@lists.infradead.org; Sat, 12 Nov 2022 15:18:07 +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 ams.source.kernel.org (Postfix) with ESMTPS id 2A555B8093C; Sat, 12 Nov 2022 15:18:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9558C4347C; Sat, 12 Nov 2022 15:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668266280; bh=dBv/8WFqvl+x92t2p/3qrkiszszzeY2izSKz5+WDkYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LEKj8U6cAFWqexEy3HcZ0bJPLppy9iba3p2uGOJmdLIbIYhOwpUm+ZIUQfUytVHDl jUmeGTuyjwk6CoKcWvAaBRAGj6SQuqPXyvyMAb5Ys1fyY1wqafh0hXWaOQou9k80Sh SG/3LHzkwoNmlTQudA9bw4WxQ9vLkcCC2/WEYmfbwbWAvM+pZpsZ3tP/FhenqzEcQF +N2yABMSRQbDBjgVeCbdctWkiBmZYs85juhlIxdoVyXPMu87PwZNj6rmlulZk+mzTo /kzxgmIWV9fmH7F5zAQt9XAgzvtc/psK4gNKiW4S/jmLnChBMUlA6fWJDi1jwkJ1sR rcXsmHaWyn2Gg== 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, kvmarm@lists.linux.dev, Mark Brown Subject: [PATCH v2 07/14] arm64/idreg: Add an override for FEAT_NMI Date: Sat, 12 Nov 2022 15:17:01 +0000 Message-Id: <20221112151708.175147-8-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221112151708.175147-1-broonie@kernel.org> References: <20221112151708.175147-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/pANAwAKASTWi3JdVIfQAcsmYgBjb7js4wn/tRtJYWD2X3MrJ+T/x3CUScp8v13vu4q3 sSp5eluJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY2+47AAKCRAk1otyXVSH0OEdB/ 9ka05c1+0P1AxiR+1hBpPv6/Mx3568FYfn7eCysUoccydYREkWPXhMns4P2SshLs9+bLYHi+epxwRQ hjtRh3dBhRH4rgW6LspU26kHzSSw/O+/s9eBV/rDvfcaLU42M0cl98DHaTnDWAbQ06LesQk0BKSo4y ocT+n6tF9n/DeP526bEGAZzXiCq99coAgvF1L+D3CYcbLY8cWx2GQKk+eTnbltFYoqtqLg5emSpRRY VqbqlEHwqYXNGdY3MQbF+LznFBEvzgvUOTs8nCaQ2ETLpIhvhwWDdsT1DtyzjqkSQ0OqOAtVzBOrFL PLAmlkGeFn1xT6TjQitqbg13ixK8G5 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-20221112_071805_809798_3B9BE8A4 X-CRM114-Status: GOOD ( 11.06 ) 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