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

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 2513078..8d8c099 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -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);
 }
 
-void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
-                             struct mem_ctl_info *mci,
+void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
                              struct edac_raw_error_desc *e)
 {
        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 */
        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,
                               e->low_layer,
                               (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
                               grain_bits, e->syndrome, e->other_detail);
 
        /* Memory type dependent details about the error */
-       if (type == HW_EVENT_ERR_CORRECTED) {
+       if (e->type == HW_EVENT_ERR_CORRECTED) {
                snprintf(detail, sizeof(detail),
                        "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",
                        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 */
        memset(e, 0, sizeof (*e));
        e->error_count = error_count;
+       e->type = type;
        e->top_layer = top_layer;
        e->mid_layer = mid_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)
                *(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);

diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h
index 02aac5c..5d78be7 100644 (file)
--- a/drivers/edac/edac_mc.h
+++ b/drivers/edac/edac_mc.h
@@ -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
  *     doing anything to discover the error location.
  *
- * @type:              severity of the error (CE/UE/Fatal)
  * @mci:               a struct mem_ctl_info pointer
  * @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,
  * like in the case of APEI GHES driver.
  */
-void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
-                             struct mem_ctl_info *mci,
+void edac_raw_mc_handle_error(struct mem_ctl_info *mci,
                              struct edac_raw_error_desc *e);
 
 /**

diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index b99080d..7c3e526 100644 (file)
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -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)
 {
-       enum hw_event_mc_err_type type;
        struct edac_raw_error_desc *e;
        struct mem_ctl_info *mci;
        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) {
        case GHES_SEV_CORRECTED:
-               type = HW_EVENT_ERR_CORRECTED;
+               e->type = HW_EVENT_ERR_CORRECTED;
                break;
        case GHES_SEV_RECOVERABLE:
-               type = HW_EVENT_ERR_UNCORRECTED;
+               e->type = HW_EVENT_ERR_UNCORRECTED;
                break;
        case GHES_SEV_PANIC:
-               type = HW_EVENT_ERR_FATAL;
+               e->type = HW_EVENT_ERR_FATAL;
                break;
        default:
        case GHES_SEV_NO:
-               type = HW_EVENT_ERR_INFO;
+               e->type = HW_EVENT_ERR_INFO;
        }
 
        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)
                *(p - 1) = '\0';
 
-       edac_raw_mc_handle_error(type, mci, e);
+       edac_raw_mc_handle_error(mci, e);
 
 unlock:
        spin_unlock_irqrestore(&ghes_lock, flags);

diff --git a/include/linux/edac.h b/include/linux/edac.h
index cc31b97..6703eb4 100644 (file)
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -442,6 +442,7 @@ struct errcount_attribute_data {
  * struct edac_raw_error_desc - Raw error report structure
  * @grain:                     minimum granularity for an error report, in bytes
  * @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])
  * @mid_layer:                 middle layer of the error (layer[1])
  * @low_layer:                 low layer of the error (layer[2])
@@ -462,6 +463,7 @@ struct edac_raw_error_desc {
        long grain;
 
        u16 error_count;
+       enum hw_event_mc_err_type type;
        int top_layer;
        int mid_layer;
        int low_layer;