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 BC417C54F4C for ; Mon, 27 Jul 2026 16:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=93TMOwmmnA33qUmymwgbRJyKUm3DPKKWnaLojYxDR3s=; b=GZA6NWlfezvjJqRPSyGgQ4wgKi IqsMHB2qZWCITvOjobpNWggJmc6CKF+8aMbB3OerTYTOoxB09ht/663WFElYQQIKVfN+VVSsC0ugS tDnEOr47F2mByZ1663P32Twns2HLfI4d4TiOpWAbeeN7cCfirTznyIyGLB7ThMcga/OuUmTEU20SD DOWDn1Axh4YdhlJiEmCDsWmb70iMgPPEfKqtRsn+i8EWRbbvEatYRbaTbmV2aro4f0WIuZeB0MYIL /hf1EwK1JzRHj6exwKUMM7nLvNCbvfDLOPyGz+pqfHrUgqrRoCQUi5JCYLuLXBOrheSi57IUoA+dg m8EaEVtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1woOKo-00000003OKq-2w0R; Mon, 27 Jul 2026 16:37:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1woOJ4-00000003N31-1rGE for linux-arm-kernel@lists.infradead.org; Mon, 27 Jul 2026 16:36:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A099175D; Mon, 27 Jul 2026 09:35:53 -0700 (PDT) Received: from login2.euhpc2.arm.com (login2.euhpc2.arm.com [10.58.100.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A7D9E3F86F; Mon, 27 Jul 2026 09:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1785170157; bh=019wPjaya9m2Y2NGXIYwHCeLDSZmYQD/2myhIZKnk70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lg7nr8A8oPBQR+RuNP7BgjJ0A5ae6iOeGA3dgocsQJ4tzeFnOOC7lC2ht/UQ1ZLxQ 0P8MqcHPNfx5Q6FYV3gNyxe0RL+X2lG63ke/v0Q8XC17gWe3+yNGjh7PrJc0H3rP45 XOlr35n7pDfqiRIsMBedmMzcNCJbVJ4j/tr64j5Y= From: Vladimir Murzin To: linux-arm-kernel@lists.infradead.org Cc: mark.rutland@arm.com, maz@kernel.org, will@kernel.org, catalin.marinas@arm.com, ruanjinjie@huawei.com, liaochang1@huawei.com Subject: [RFC PATCH v2 30/45] arm64: idreg: Add an override for FEAT_NMI Date: Mon, 27 Jul 2026 17:34:38 +0100 Message-Id: <20260727163453.7969-31-vladimir.murzin@arm.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20260727163453.7969-1-vladimir.murzin@arm.com> References: <20260727163453.7969-1-vladimir.murzin@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260727_093558_594483_1E9FA0B2 X-CRM114-Status: UNSURE ( 9.14 ) 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 From: Mark Brown Add a named override for FEAT_NMI, allowing it to be explicitly disabled in case of problems. Signed-off-by: Mark Brown Signed-off-by: Ada Couprie Diaz Signed-off-by: Vladimir Murzin Reviewed-by: Jinjie Ruan --- arch/arm64/kernel/pi/idreg-override.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/pi/idreg-override.c b/arch/arm64/kernel/pi/idreg-override.c index bc57b290e5e7..e5ea280452c3 100644 --- a/arch/arm64/kernel/pi/idreg-override.c +++ b/arch/arm64/kernel/pi/idreg-override.c @@ -154,6 +154,7 @@ static const struct ftr_set_desc pfr1 __prel64_initconst = { FIELD("bt", ID_AA64PFR1_EL1_BT_SHIFT, NULL ), FIELD("gcs", ID_AA64PFR1_EL1_GCS_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), FIELD("mpam_frac", ID_AA64PFR1_EL1_MPAM_frac_SHIFT, NULL), {} -- 2.34.1