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
10841084 edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);
10851085 }
10861086
1087−void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
1088− struct mem_ctl_info *mci,
1087+void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
10891088 struct edac_raw_error_desc *e)
10901089 {
10911090 char detail[80];
@@ -1100,14 +1099,14 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, · 8 unmodified lines
11001099
11011100 /* Report the error via the trace interface */
11021101 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,
11041103 mci->mc_idx, e->top_layer, e->mid_layer,
11051104 e->low_layer,
11061105 (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
11071106 grain_bits, e->syndrome, e->other_detail);
11081107
11091108 /* Memory type dependent details about the error */
1110− if (type == HW_EVENT_ERR_CORRECTED) {
1109+ if (e->type == HW_EVENT_ERR_CORRECTED) {
11111110 snprintf(detail, sizeof(detail),
11121111 "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",
11131112 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
11521151 /* Fills the error report buffer */
11531152 memset(e, 0, sizeof (*e));
11541153 e->error_count = error_count;
1154+ e->type = type;
11551155 e->top_layer = top_layer;
11561156 e->mid_layer = mid_layer;
11571157 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
12821282 if (p > e->location)
12831283 *(p - 1) = '\0';
12841284
1285− edac_raw_mc_handle_error(type, mci, e);
1285+ edac_raw_mc_handle_error(mci, e);
12861286 }
12871287 EXPORT_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
212212 * edac_raw_mc_handle_error() - Reports a memory event to userspace without
213213 * doing anything to discover the error location.
214214 *
215− * @type: severity of the error (CE/UE/Fatal)
216215 * @mci: a struct mem_ctl_info pointer
217216 * @e: error description
218217 *
@@ -220,8 +219,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, · 1 unmodified line
220219 * only be called directly when the hardware error come directly from BIOS,
221220 * like in the case of APEI GHES driver.
222221 */
223−void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
224− struct mem_ctl_info *mci,
222+void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
225223 struct edac_raw_error_desc *e);
226224
227225 /**
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
201201
202202 void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
203203 {
204− enum hw_event_mc_err_type type;
205204 struct edac_raw_error_desc *e;
206205 struct mem_ctl_info *mci;
207206 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
240239
241240 switch (sev) {
242241 case GHES_SEV_CORRECTED:
243− type = HW_EVENT_ERR_CORRECTED;
242+ e->type = HW_EVENT_ERR_CORRECTED;
244243 break;
245244 case GHES_SEV_RECOVERABLE:
246− type = HW_EVENT_ERR_UNCORRECTED;
245+ e->type = HW_EVENT_ERR_UNCORRECTED;
247246 break;
248247 case GHES_SEV_PANIC:
249− type = HW_EVENT_ERR_FATAL;
248+ e->type = HW_EVENT_ERR_FATAL;
250249 break;
251250 default:
252251 case GHES_SEV_NO:
253− type = HW_EVENT_ERR_INFO;
252+ e->type = HW_EVENT_ERR_INFO;
254253 }
255254
256255 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
442441 if (p > pvt->other_detail)
443442 *(p - 1) = '\0';
444443
445− edac_raw_mc_handle_error(type, mci, e);
444+ edac_raw_mc_handle_error(mci, e);
446445
447446 unlock:
448447 spin_unlock_irqrestore(&ghes_lock, flags);
include/linux/edac.h+2−0
@@ -442,6 +442,7 @@ struct errcount_attribute_data { · 441 unmodified lines
442442 * struct edac_raw_error_desc - Raw error report structure
443443 * @grain: minimum granularity for an error report, in bytes
444444 * @error_count: number of errors of the same type
445+ * @type: severity of the error (CE/UE/Fatal)
445446 * @top_layer: top layer of the error (layer[0])
446447 * @mid_layer: middle layer of the error (layer[1])
447448 * @low_layer: low layer of the error (layer[2])
@@ -462,6 +463,7 @@ struct edac_raw_error_desc { · 14 unmodified lines
462463 long grain;
463464
464465 u16 error_count;
466+ enum hw_event_mc_err_type type;
465467 int top_layer;
466468 int mid_layer;
467469 int low_layer;