sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel
Subsystems (2)
PATCH 1/1 sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel
Intel IA32 SDM Table 15-14 defines channel 0xf as 'not specified', but EDAC doesn't know about this and returns and INTERNAL ERROR when the channel is greater than NUM_CHANNELS:
kernel: [ 1538.886456] CPU 0: Machine Check Exception: 0 Bank 1: 940000000000009f
kernel: [ 1538.886669] TSC 2bc68b22e7e812 ADDR 46dae7000 MISC 0 PROCESSOR 0:306e4 TIME 1390414572 SOCKET 0 APIC 0
kernel: [ 1538.971948] EDAC MC1: INTERNAL ERROR: channel value is out of range (15 >= 4)
kernel: [ 1538.972203] EDAC MC1: 0 CE memory read error on unknown memory (slot:0 page:0x46dae7 offset:0x0 grain:0 syndrome:0x0 - area:DRAM err_code:0000:009f socket:1 channel_mask:1 rank:0)
This commit changes sb_edac to forward a channel of -1 to EDAC if the channel is not specified. edac_mc_handle_error() sets the channel to -1 internally after the error message anyway, so this commit should have no effect other than avoiding the INTERNAL ERROR message when the channel is not specified.
--- drivers/edac/sb_edac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/edac/sb_edac.c +6 -2
@@ -283,8 +283,9 @@ static const u32 correrrthrsld[] = {* sbridge structs */ -#define NUM_CHANNELS 4 -#define MAX_DIMMS 3/* Max DIMMS per channel */ +#define NUM_CHANNELS 4 +#define MAX_DIMMS 3/* Max DIMMS per channel */ +#define CHANNEL_UNSPECIFIED 0xf/* Intel IA32 SDM 15-14 */ enum type {SANDY_BRIDGE ,
@@ -1991,6 +1992,9 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,/* FIXME: need support for channel mask */ +if (channel ==CHANNEL_UNSPECIFIED ) + channel =-1 ; +/* Call the helper to output message */ edac_mc_handle_error(tp_event, mci, core_err_cnt, m->addr >> PAGE_SHIFT, m->addr & ~PAGE_MASK, 0,
Signature · 1 line
1.9.3
Quoted 40 lines · Seth Jennings
Intel IA32 SDM Table 15-14 defines channel
0xfas 'not specified', but EDAC doesn't know about this and returns and INTERNAL ERROR when the channel is greater thanNUM_CHANNELS:kernel: [ 1538.886456] CPU 0: Machine Check Exception: 0 Bank 1:
940000000000009f
kernel: [ 1538.886669] TSC2bc68b22e7e812ADDR46dae7000MISC 0 PROCESSOR 0:306e4 TIME 1390414572 SOCKET 0 APIC 0
kernel: [ 1538.971948] EDAC MC1: INTERNAL ERROR: channel value is out of range (15 >= 4)
kernel: [ 1538.972203] EDAC MC1: 0 CE memory read error on unknown memory (slot:0 page:0x46dae7 offset:0x0 grain:0 syndrome:0x0 - area:DRAM err_code:0000:009f socket:1 channel_mask:1 rank:0)This commit changes
sb_edacto forward a channel of -1 to EDAC if the channel is not specified.edac_mc_handle_error()sets the channel to -1 internally after the error message anyway, so this commit should have no effect other than avoiding the INTERNAL ERROR message when the channel is not specified.Signed-off-by Seth Jennings <[email protected]>Cc Aristeu Rozanski <[email protected]>--- drivers/edac/sb_edac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/edac/sb_edac.c +3
-2@@ -283,8 +283,9 @@ static const u32 correrrthrsld[] = {* sbridge structs */ -#define NUM_CHANNELS 4 -#define MAX_DIMMS 3/* Max DIMMS per channel */ +#define NUM_CHANNELS 4 +#define MAX_DIMMS 3/* Max DIMMS per channel */ +#define CHANNEL_UNSPECIFIED 0xf/* Intel IA32 SDM 15-14 */ enum type {SANDY_BRIDGE ,
drivers/edac/sb_edac.c static void sbridge_mce_output_error(struct mem_ctl_info *mci, · line 2000
Quoted 9 lines
drivers/edac/sb_edac.c +3
-0@@ -1991,6 +1992,9 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,/* FIXME: need support for channel mask */ +if (channel ==CHANNEL_UNSPECIFIED ) + channel =-1 ; +/* Call the helper to output message */ edac_mc_handle_error(tp_event, mci, core_err_cnt, m->addr >> PAGE_SHIFT, m->addr & ~PAGE_MASK, 0,
Signature · 1 line
Aristeu
Quoted 10 lines · Aristeu Rozanski
Quoted 9 lines · Seth Jennings
Intel IA32 SDM Table 15-14 defines channel
0xfas 'not specified', but EDAC doesn't know about this and returns and INTERNAL ERROR when the channel is greater thanNUM_CHANNELS:kernel: [ 1538.886456] CPU 0: Machine Check Exception: 0 Bank 1:
940000000000009f
kernel: [ 1538.886669] TSC2bc68b22e7e812ADDR46dae7000MISC 0 PROCESSOR 0:306e4 TIME 1390414572 SOCKET 0 APIC 0
kernel: [ 1538.971948] EDAC MC1: INTERNAL ERROR: channel value is out of range (15 >= 4)
kernel: [ 1538.972203] EDAC MC1: 0 CE memory read error on unknown memory (slot:0 page:0x46dae7 offset:0x0 grain:0 syndrome:0x0 - area:DRAM err_code:0000:009f socket:1 channel_mask:1 rank:0)
Quoted 5 lines
Quoted 5 lines
This commit changes
sb_edacto forward a channel of -1 to EDAC if the channel is not specified.edac_mc_handle_error()sets the channel to -1 internally after the error message anyway, so this commit should have no effect other than avoiding the INTERNAL ERROR message when the channel is not specified.
Hey Mauro,
I was wanting to make sure this was on your radar. I don't see it in -next and haven't gotten any feedback or confirmation that the patch has been accepted/rejected/needs work.
Seth
Quoted 41 lines
Quoted 26 lines
Signed-off-by Seth Jennings <[email protected]>Cc Aristeu Rozanski <[email protected]>--- drivers/edac/sb_edac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/edac/sb_edac.c +3
-2@@ -283,8 +283,9 @@ static const u32 correrrthrsld[] = {* sbridge structs */ -#define NUM_CHANNELS 4 -#define MAX_DIMMS 3/* Max DIMMS per channel */ +#define NUM_CHANNELS 4 +#define MAX_DIMMS 3/* Max DIMMS per channel */ +#define CHANNEL_UNSPECIFIED 0xf/* Intel IA32 SDM 15-14 */ enum type {SANDY_BRIDGE ,drivers/edac/sb_edac.c static void sbridge_mce_output_error(struct mem_ctl_info *mci, · line 2000
Quoted 9 lines
drivers/edac/sb_edac.c +3
-0@@ -1991,6 +1992,9 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,/* FIXME: need support for channel mask */ +if (channel ==CHANNEL_UNSPECIFIED ) + channel =-1 ; +/* Call the helper to output message */ edac_mc_handle_error(tp_event, mci, core_err_cnt, m->addr >> PAGE_SHIFT, m->addr & ~PAGE_MASK, 0,Acked-by Aristeu Rozanski <[email protected]>Signature · 1 line
Aristeu