lkml.org 
[lkml]   [2019]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 05/10] EDAC/mc: Create new function edac_inc_csrow()
    Date
    Have a separate function to count errors in csrow/channel. This better
    separates code and reduces the indentation level. No functional
    changes.

    Signed-off-by: Robert Richter <rrichter@marvell.com>
    Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    ---
    drivers/edac/edac_mc.c | 40 +++++++++++++++++++++++++---------------
    1 file changed, 25 insertions(+), 15 deletions(-)

    diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
    index aff0630c02fc..e81d33960a0c 100644
    --- a/drivers/edac/edac_mc.c
    +++ b/drivers/edac/edac_mc.c
    @@ -1089,6 +1089,26 @@ static void edac_ue_error(struct mem_ctl_info *mci,
    edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count);
    }

    +static void edac_inc_csrow(struct edac_raw_error_desc *e, int row, int chan)
    +{
    + struct mem_ctl_info *mci = error_desc_to_mci(e);
    + u16 count = e->error_count;
    + enum hw_event_mc_err_type type = e->type;
    +
    + if (row < 0)
    + return;
    +
    + edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan);
    +
    + if (type == HW_EVENT_ERR_CORRECTED) {
    + mci->csrows[row]->ce_count += count;
    + if (chan >= 0)
    + mci->csrows[row]->channels[chan]->ce_count += count;
    + } else {
    + mci->csrows[row]->ue_count += count;
    + }
    +}
    +
    void edac_raw_mc_handle_error(struct edac_raw_error_desc *e)
    {
    struct mem_ctl_info *mci = error_desc_to_mci(e);
    @@ -1256,22 +1276,12 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
    chan = -2;
    }

    - if (!e->enable_per_layer_report) {
    + if (!e->enable_per_layer_report)
    strcpy(e->label, "any memory");
    - } else {
    - edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan);
    - if (p == e->label)
    - strcpy(e->label, "unknown memory");
    - if (type == HW_EVENT_ERR_CORRECTED) {
    - if (row >= 0) {
    - mci->csrows[row]->ce_count += error_count;
    - if (chan >= 0)
    - mci->csrows[row]->channels[chan]->ce_count += error_count;
    - }
    - } else
    - if (row >= 0)
    - mci->csrows[row]->ue_count += error_count;
    - }
    + else if (!*e->label)
    + strcpy(e->label, "unknown memory");
    +
    + edac_inc_csrow(e, row, chan);

    /* Fill the RAM location data */
    p = e->location;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-05 10:39    [W:4.198 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site