Re: [PATCH 10/19] EDAC, mc: Rework edac_raw_mc_handle_error() to use struct dimm_info
From: Mauro Carvalho Chehab
Date: Fri Oct 11 2019 - 06:49:05 EST
Em Thu, 10 Oct 2019 20:25:24 +0000
Robert Richter <rrichter@xxxxxxxxxxx> escreveu:
> The error handling functions have the pos[] array argument for
> determing the dimm handle. Rework those functions to use the dimm
> handle directly.
>
> Signed-off-by: Robert Richter <rrichter@xxxxxxxxxxx>
Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@xxxxxxxxxx>
> ---
> drivers/edac/edac_mc.c | 28 +++++++++++++---------------
> drivers/edac/edac_mc.h | 2 ++
> drivers/edac/ghes_edac.c | 6 +++++-
> 3 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index 6d880cf4d599..cdfb383f7a35 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -925,11 +925,9 @@ const char *edac_layer_name[] = {
> EXPORT_SYMBOL_GPL(edac_layer_name);
>
> static void edac_inc_ce_error(struct mem_ctl_info *mci,
> - const int pos[EDAC_MAX_LAYERS],
> + struct dimm_info *dimm,
> const u16 count)
> {
> - struct dimm_info *dimm = edac_get_dimm(mci, pos[0], pos[1], pos[2]);
> -
> mci->ce_mc += count;
>
> if (dimm)
> @@ -939,11 +937,9 @@ static void edac_inc_ce_error(struct mem_ctl_info *mci,
> }
>
> static void edac_inc_ue_error(struct mem_ctl_info *mci,
> - const int pos[EDAC_MAX_LAYERS],
> - const u16 count)
> + struct dimm_info *dimm,
> + const u16 count)
> {
> - struct dimm_info *dimm = edac_get_dimm(mci, pos[0], pos[1], pos[2]);
> -
> mci->ue_mc += count;
>
> if (dimm)
> @@ -953,8 +949,8 @@ static void edac_inc_ue_error(struct mem_ctl_info *mci,
> }
>
> static void edac_ce_error(struct mem_ctl_info *mci,
> + struct dimm_info *dimm,
> const u16 error_count,
> - const int pos[EDAC_MAX_LAYERS],
> const char *msg,
> const char *location,
> const char *label,
> @@ -982,7 +978,7 @@ static void edac_ce_error(struct mem_ctl_info *mci,
> error_count, msg, msg_aux, label,
> location, detail);
> }
> - edac_inc_ce_error(mci, pos, error_count);
> + edac_inc_ce_error(mci, dimm, error_count);
>
> if (mci->scrub_mode == SCRUB_SW_SRC) {
> /*
> @@ -1006,8 +1002,8 @@ static void edac_ce_error(struct mem_ctl_info *mci,
> }
>
> static void edac_ue_error(struct mem_ctl_info *mci,
> + struct dimm_info *dimm,
> const u16 error_count,
> - const int pos[EDAC_MAX_LAYERS],
> const char *msg,
> const char *location,
> const char *label,
> @@ -1041,15 +1037,15 @@ static void edac_ue_error(struct mem_ctl_info *mci,
> msg, msg_aux, label, location, detail);
> }
>
> - edac_inc_ue_error(mci, pos, error_count);
> + edac_inc_ue_error(mci, dimm, error_count);
> }
>
> void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
> struct mem_ctl_info *mci,
> + struct dimm_info *dimm,
> struct edac_raw_error_desc *e)
> {
> char detail[80];
> - int pos[EDAC_MAX_LAYERS] = { e->top_layer, e->mid_layer, e->low_layer };
>
> /* Memory type dependent details about the error */
> if (type == HW_EVENT_ERR_CORRECTED) {
> @@ -1057,7 +1053,7 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
> "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx",
> e->page_frame_number, e->offset_in_page,
> e->grain, e->syndrome);
> - edac_ce_error(mci, e->error_count, pos, e->msg, e->location,
> + edac_ce_error(mci, dimm, e->error_count, e->msg, e->location,
> e->label, detail, e->other_detail,
> e->page_frame_number, e->offset_in_page, e->grain);
> } else {
> @@ -1065,7 +1061,7 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
> "page:0x%lx offset:0x%lx grain:%ld",
> e->page_frame_number, e->offset_in_page, e->grain);
>
> - edac_ue_error(mci, e->error_count, pos, e->msg, e->location,
> + edac_ue_error(mci, dimm, e->error_count, e->msg, e->location,
> e->label, detail, e->other_detail);
> }
>
> @@ -1245,6 +1241,8 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
> (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
> grain_bits, e->syndrome, e->other_detail);
>
> - edac_raw_mc_handle_error(type, mci, e);
> + dimm = edac_get_dimm(mci, top_layer, mid_layer, low_layer);
> +
> + edac_raw_mc_handle_error(type, mci, dimm, e);
> }
> EXPORT_SYMBOL_GPL(edac_mc_handle_error);
> diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h
> index 02aac5c61d00..2c3e2fbcedc4 100644
> --- a/drivers/edac/edac_mc.h
> +++ b/drivers/edac/edac_mc.h
> @@ -214,6 +214,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
> *
> * @type: severity of the error (CE/UE/Fatal)
> * @mci: a struct mem_ctl_info pointer
> + * @dimm: a struct dimm_info pointer
> * @e: error description
> *
> * This raw function is used internally by edac_mc_handle_error(). It should
> @@ -222,6 +223,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
> */
> void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type,
> struct mem_ctl_info *mci,
> + struct dimm_info *dimm,
> struct edac_raw_error_desc *e);
>
> /**
> diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
> index e0b90c6d7d63..4f5721cf4380 100644
> --- a/drivers/edac/ghes_edac.c
> +++ b/drivers/edac/ghes_edac.c
> @@ -193,6 +193,7 @@ 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)
> {
> + struct dimm_info *dimm;
> enum hw_event_mc_err_type type;
> struct edac_raw_error_desc *e;
> struct mem_ctl_info *mci;
> @@ -437,7 +438,10 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err)
> (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,
> grain_bits, e->syndrome, pvt->detail_location);
>
> - edac_raw_mc_handle_error(type, mci, e);
> + dimm = edac_get_dimm_by_index(mci, e->top_layer);
> +
> + edac_raw_mc_handle_error(type, mci, dimm, e);
> +
> spin_unlock_irqrestore(&ghes_lock, flags);
> }
>
Thanks,
Mauro