Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb476cff authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras 



Pull MCE cleanup from Tony Luck:

 "Changes to simplify the SDM means that we can also simplify
  the code for SRAR (software recoverable action required) errors."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ca02c216 33d7885b

arch/x86/kernel/cpu/mcheck/mce-severity.c

+5 −10
Original line number Diff line number Diff line
@@ -110,22 +110,17 @@ static struct severity { 
	/* known AR MCACODs: */

#ifdef	CONFIG_MEMORY_FAILURE

	MCESEV(

		KEEP, "HT thread notices Action required: data load error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA),

		MCGMASK(MCG_STATUS_EIPV, 0)

		KEEP, "Action required but unaffected thread is continuable",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR),

		MCGMASK(MCG_STATUS_RIPV, MCG_STATUS_RIPV)

		),

	MCESEV(

		AR, "Action required: data load error",

		AR, "Action required: data load error in a user process",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA),

		USER

		),

	MCESEV(

		KEEP, "HT thread notices Action required: instruction fetch error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR),

		MCGMASK(MCG_STATUS_EIPV, 0)

		),

	MCESEV(

		AR, "Action required: instruction fetch error",

		AR, "Action required: instruction fetch error in a user process",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR),

		USER

		),