Commit 7c694a36 authored by Mark Brown's avatar Mark Brown Committed by Jie Liu
Browse files

arm64/idreg: Add an override for FEAT_NMI 

kunpeng inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I90N2C
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git/commit/?h=arm64-nmi&id=754e6a3d61e2f2594a050118fbfc6355355fb323



----------------------------------------------------------------------

Add a named override for FEAT_NMI, allowing it to be explicitly disabled
in case of problems.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarJie Liu <liujie375@h-partners.com>
parent 611b58ad

arch/arm64/kernel/idreg-override.c

+1 −0
Original line number Diff line number Diff line
@@ -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),

		{}

	},