diff options
| author | Tony Luck <tony.luck@intel.com> | 2020-07-07 12:43:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-03 11:26:53 +0200 |
| commit | 6d11320bed41fb0234c23eb31e03c2f37933180f (patch) | |
| tree | 9165099f2fee25545a489bd301dbd97c21696733 /drivers/edac/skx_common.c | |
| parent | 87cc96bb11b9ea887bc58df253e138d78f1c5b63 (diff) | |
| download | linux-stable-6d11320bed41fb0234c23eb31e03c2f37933180f.tar.gz linux-stable-6d11320bed41fb0234c23eb31e03c2f37933180f.tar.bz2 linux-stable-6d11320bed41fb0234c23eb31e03c2f37933180f.zip | |
EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
[ Upstream commit 45bc6098a3e279d8e391d22428396687562797e2 ]
IA32_MCG_STATUS.RIPV indicates whether the return RIP value pushed onto
the stack as part of machine check delivery is valid or not.
Various drivers copied a code fragment that uses the RIPV bit to
determine the severity of the error as either HW_EVENT_ERR_UNCORRECTED
or HW_EVENT_ERR_FATAL, but this check is reversed (marking errors where
RIPV is set as "FATAL").
Reverse the tests so that the error is marked fatal when RIPV is not set.
Reported-by: Gabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20200707194324.14884-1-tony.luck@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/edac/skx_common.c')
| -rw-r--r-- | drivers/edac/skx_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c index 4ca87723dcdc..99dea4f66b5e 100644 --- a/drivers/edac/skx_common.c +++ b/drivers/edac/skx_common.c @@ -490,9 +490,9 @@ static void skx_mce_output_error(struct mem_ctl_info *mci, if (uncorrected_error) { core_err_cnt = 1; if (ripv) { - tp_event = HW_EVENT_ERR_FATAL; - } else { tp_event = HW_EVENT_ERR_UNCORRECTED; + } else { + tp_event = HW_EVENT_ERR_FATAL; } } else { tp_event = HW_EVENT_ERR_CORRECTED; |