History

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

Robert Richter committed 6 years ago

Commit 672ef0e1 parent 1f27c794 files · +13 −14Browse files

Unified · Split

4 files
  1. drivers/edac/edac_mc.c +5 −5
  2. drivers/edac/edac_mc.h +1 −3
  3. drivers/edac/ghes_edac.c +5 −6
  4. include/linux/edac.h +2 −0
drivers/edac/edac_mc.c+5−5
@@ -1084,8 +1084,7 @@ static void edac_ue_error(struct mem_ctl_info *mci, · 1083 unmodified lines
1084 edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);1084 edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);
1085}1085}
1086 1086
1087void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,1087void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
1088 struct mem_ctl_info *mci,
1089 struct edac_raw_error_desc *e)1088 struct edac_raw_error_desc *e)
1090{1089{
1091 char detail[80];1090 char detail[80];
@@ -1100,14 +1099,14 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, · 8 unmodified lines
1100 1099
1101 /* Report the error via the trace interface */1100 /* Report the error via the trace interface */
1102 if (IS_ENABLED(CONFIG_RAS))1101 if (IS_ENABLED(CONFIG_RAS))
1103 trace_mc_event(type, e->msg, e->label, e->error_count,1102 trace_mc_event(e->type, e->msg, e->label, e->error_count,
1104 mci->mc_idx, e->top_layer, e->mid_layer,1103 mci->mc_idx, e->top_layer, e->mid_layer,
1105 e->low_layer,1104 e->low_layer,
1106 (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,1105 (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
1107 grain_bits, e->syndrome, e->other_detail);1106 grain_bits, e->syndrome, e->other_detail);
1108 1107
1109 /* Memory type dependent details about the error */1108 /* Memory type dependent details about the error */
1110 if (type == HW_EVENT_ERR_CORRECTED) {1109 if (e->type == HW_EVENT_ERR_CORRECTED) {
1111 snprintf(detail, sizeof(detail),1110 snprintf(detail, sizeof(detail),
1112 "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",1111 "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",
1113 e->page_frame_number, e->offset_in_page,1112 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, · 38 unmodified lines
1152 /* Fills the error report buffer */1151 /* Fills the error report buffer */
1153 memset(e, 0, sizeof (*e));1152 memset(e, 0, sizeof (*e));
1154 e->error_count = error_count;1153 e->error_count = error_count;
1154 e->type = type;
1155 e->top_layer = top_layer;1155 e->top_layer = top_layer;
1156 e->mid_layer = mid_layer;1156 e->mid_layer = mid_layer;
1157 e->low_layer = low_layer;1157 e->low_layer = low_layer;
@@ -1282,6 +1282,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, · 124 unmodified lines
1282 if (p > e->location)1282 if (p > e->location)
1283 *(p - 1) = '\0';1283 *(p - 1) = '\0';
1284 1284
1285 edac_raw_mc_handle_error(type, mci, e);1285 edac_raw_mc_handle_error(mci, e);
1286}1286}
1287EXPORT_SYMBOL_GPL(edac_mc_handle_error);1287EXPORT_SYMBOL_GPL(edac_mc_handle_error);
drivers/edac/edac_mc.h+1−3
@@ -212,7 +212,6 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, · 211 unmodified lines
212 * edac_raw_mc_handle_error() - Reports a memory event to userspace without212 * edac_raw_mc_handle_error() - Reports a memory event to userspace without
213 * doing anything to discover the error location.213 * doing anything to discover the error location.
214 *214 *
215 * @type: severity of the error (CE/UE/Fatal)
216 * @mci: a struct mem_ctl_info pointer215 * @mci: a struct mem_ctl_info pointer
217 * @e: error description216 * @e: error description
218 *217 *
@@ -220,8 +219,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, · 1 unmodified line
220 * only be called directly when the hardware error come directly from BIOS,219 * only be called directly when the hardware error come directly from BIOS,
221 * like in the case of APEI GHES driver.220 * like in the case of APEI GHES driver.
222 */221 */
223void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,222void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
224 struct mem_ctl_info *mci,
225 struct edac_raw_error_desc *e);223 struct edac_raw_error_desc *e);
226 224
227/**225/**
drivers/edac/ghes_edac.c+5−6
@@ -201,7 +201,6 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) · 200 unmodified lines
201 201
202void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)202void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
203{203{
204 enum hw_event_mc_err_type type;
205 struct edac_raw_error_desc *e;204 struct edac_raw_error_desc *e;
206 struct mem_ctl_info *mci;205 struct mem_ctl_info *mci;
207 struct ghes_edac_pvt *pvt;206 struct ghes_edac_pvt *pvt;
@@ -240,17 +239,17 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) · 32 unmodified lines
240 239
241 switch (sev) {240 switch (sev) {
242 case GHES_SEV_CORRECTED:241 case GHES_SEV_CORRECTED:
243 type = HW_EVENT_ERR_CORRECTED;242 e->type = HW_EVENT_ERR_CORRECTED;
244 break;243 break;
245 case GHES_SEV_RECOVERABLE:244 case GHES_SEV_RECOVERABLE:
246 type = HW_EVENT_ERR_UNCORRECTED;245 e->type = HW_EVENT_ERR_UNCORRECTED;
247 break;246 break;
248 case GHES_SEV_PANIC:247 case GHES_SEV_PANIC:
249 type = HW_EVENT_ERR_FATAL;248 e->type = HW_EVENT_ERR_FATAL;
250 break;249 break;
251 default:250 default:
252 case GHES_SEV_NO:251 case GHES_SEV_NO:
253 type = HW_EVENT_ERR_INFO;252 e->type = HW_EVENT_ERR_INFO;
254 }253 }
255 254
256 edac_dbg(1, "error validation_bits: 0x%08llx\n",255 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) · 185 unmodified lines
442 if (p > pvt->other_detail)441 if (p > pvt->other_detail)
443 *(p - 1) = '\0';442 *(p - 1) = '\0';
444 443
445 edac_raw_mc_handle_error(type, mci, e);444 edac_raw_mc_handle_error(mci, e);
446 445
447unlock:446unlock:
448 spin_unlock_irqrestore(&ghes_lock, flags);447 spin_unlock_irqrestore(&ghes_lock, flags);
include/linux/edac.h+2−0
@@ -442,6 +442,7 @@ struct errcount_attribute_data { · 441 unmodified lines
442 * struct edac_raw_error_desc - Raw error report structure442 * struct edac_raw_error_desc - Raw error report structure
443 * @grain: minimum granularity for an error report, in bytes443 * @grain: minimum granularity for an error report, in bytes
444 * @error_count: number of errors of the same type444 * @error_count: number of errors of the same type
445 * @type: severity of the error (CE/UE/Fatal)
445 * @top_layer: top layer of the error (layer[0])446 * @top_layer: top layer of the error (layer[0])
446 * @mid_layer: middle layer of the error (layer[1])447 * @mid_layer: middle layer of the error (layer[1])
447 * @low_layer: low layer of the error (layer[2])448 * @low_layer: low layer of the error (layer[2])
@@ -462,6 +463,7 @@ struct edac_raw_error_desc { · 14 unmodified lines
462 long grain;463 long grain;
463 464
464 u16 error_count;465 u16 error_count;
466 enum hw_event_mc_err_type type;
465 int top_layer;467 int top_layer;
466 int mid_layer;468 int mid_layer;
467 int low_layer;469 int low_layer;