UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

EDAC: Store error type in struct edac_raw_error_desc 

Store the error type in struct edac_raw_error_desc. This makes the
type parameter of edac_raw_mc_handle_error() obsolete.

[ kernel-doc typo ]
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Link: https://lkml.kernel.org/r/20200123090210.26933-4-rrichter@marvell.com
This commit is contained in:
Robert Richter 2020-01-23 09:02:54 +00:00 committed by Borislav Petkov
parent 1f27c79062
commit 672ef0e568
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/edac/edac_mc.c
View File

@ -1084,8 +1084,7 @@ static void edac_ue_error(struct mem_ctl_info *mci,
edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count); edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);
} }
void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
struct mem_ctl_info *mci,
struct edac_raw_error_desc *e) struct edac_raw_error_desc *e)
{ {
char detail[80]; char detail[80];
@ -1100,14 +1099,14 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
/* Report the error via the trace interface */ /* Report the error via the trace interface */
if (IS_ENABLED(CONFIG_RAS)) if (IS_ENABLED(CONFIG_RAS))
trace_mc_event(type, e->msg, e->label, e->error_count, trace_mc_event(e->type, e->msg, e->label, e->error_count,
mci->mc_idx, e->top_layer, e->mid_layer, mci->mc_idx, e->top_layer, e->mid_layer,
e->low_layer, e->low_layer,
(e->page_frame_number << PAGE_SHIFT) | e->offset_in_page, (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
grain_bits, e->syndrome, e->other_detail); grain_bits, e->syndrome, e->other_detail);
/* Memory type dependent details about the error */ /* Memory type dependent details about the error */
if (type == HW_EVENT_ERR_CORRECTED) { if (e->type == HW_EVENT_ERR_CORRECTED) {
snprintf(detail, sizeof(detail), snprintf(detail, sizeof(detail),
"page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx", "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",
e->page_frame_number, e->offset_in_page, e->page_frame_number, e->offset_in_page,
@ -1152,6 +1151,7 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
/* Fills the error report buffer */ /* Fills the error report buffer */
memset(e, 0, sizeof (*e)); memset(e, 0, sizeof (*e));
e->error_count = error_count; e->error_count = error_count;
e->type = type;
e->top_layer = top_layer; e->top_layer = top_layer;
e->mid_layer = mid_layer; e->mid_layer = mid_layer;
e->low_layer = low_layer; e->low_layer = low_layer;
@ -1282,6 +1282,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
if (p > e->location) if (p > e->location)
*(p - 1) = '\0'; *(p - 1) = '\0';
edac_raw_mc_handle_error(type, mci, e); edac_raw_mc_handle_error(mci, e);
} }
EXPORT_SYMBOL_GPL(edac_mc_handle_error); EXPORT_SYMBOL_GPL(edac_mc_handle_error);

4
drivers/edac/edac_mc.h
View File

@ -212,7 +212,6 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
* edac_raw_mc_handle_error() - Reports a memory event to userspace without * edac_raw_mc_handle_error() - Reports a memory event to userspace without
* doing anything to discover the error location. * doing anything to discover the error location.
* *
* @type: severity of the error (CE/UE/Fatal)
* @mci: a struct mem_ctl_info pointer * @mci: a struct mem_ctl_info pointer
* @e: error description * @e: error description
* *
@ -220,8 +219,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
* only be called directly when the hardware error come directly from BIOS, * only be called directly when the hardware error come directly from BIOS,
* like in the case of APEI GHES driver. * like in the case of APEI GHES driver.
*/ */
void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
struct mem_ctl_info *mci,
struct edac_raw_error_desc *e); struct edac_raw_error_desc *e);
/** /**

11
drivers/edac/ghes_edac.c
View File

@ -201,7 +201,6 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg)
void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
{ {
enum hw_event_mc_err_type type;
struct edac_raw_error_desc *e; struct edac_raw_error_desc *e;
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct ghes_edac_pvt *pvt; struct ghes_edac_pvt *pvt;
@ -240,17 +239,17 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
switch (sev) { switch (sev) {
case GHES_SEV_CORRECTED: case GHES_SEV_CORRECTED:
type = HW_EVENT_ERR_CORRECTED; e->type = HW_EVENT_ERR_CORRECTED;
break; break;
case GHES_SEV_RECOVERABLE: case GHES_SEV_RECOVERABLE:
type = HW_EVENT_ERR_UNCORRECTED; e->type = HW_EVENT_ERR_UNCORRECTED;
break; break;
case GHES_SEV_PANIC: case GHES_SEV_PANIC:
type = HW_EVENT_ERR_FATAL; e->type = HW_EVENT_ERR_FATAL;
break; break;
default: default:
case GHES_SEV_NO: case GHES_SEV_NO:
type = HW_EVENT_ERR_INFO; e->type = HW_EVENT_ERR_INFO;
} }
edac_dbg(1, "error validation_bits: 0x%08llx\n", edac_dbg(1, "error validation_bits: 0x%08llx\n",
@ -442,7 +441,7 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
if (p > pvt->other_detail) if (p > pvt->other_detail)
*(p - 1) = '\0'; *(p - 1) = '\0';
edac_raw_mc_handle_error(type, mci, e); edac_raw_mc_handle_error(mci, e);
unlock: unlock:
spin_unlock_irqrestore(&ghes_lock, flags); spin_unlock_irqrestore(&ghes_lock, flags);

2
include/linux/edac.h
View File

@ -442,6 +442,7 @@ struct errcount_attribute_data {
* struct edac_raw_error_desc - Raw error report structure * struct edac_raw_error_desc - Raw error report structure
* @grain: minimum granularity for an error report, in bytes * @grain: minimum granularity for an error report, in bytes
* @error_count: number of errors of the same type * @error_count: number of errors of the same type
* @type: severity of the error (CE/UE/Fatal)
* @top_layer: top layer of the error (layer[0]) * @top_layer: top layer of the error (layer[0])
* @mid_layer: middle layer of the error (layer[1]) * @mid_layer: middle layer of the error (layer[1])
* @low_layer: low layer of the error (layer[2]) * @low_layer: low layer of the error (layer[2])
@ -462,6 +463,7 @@ struct edac_raw_error_desc {
long grain; long grain;
u16 error_count; u16 error_count;
enum hw_event_mc_err_type type;
int top_layer; int top_layer;
int mid_layer; int mid_layer;
int low_layer; int low_layer;