From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Robert Richter <rrichter@marvell.com>
Cc: Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>,
James Morse <james.morse@arm.com>,
"linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 14/19] EDAC, mc: Create new function edac_inc_csrow()
Date: Fri, 11 Oct 2019 08:08:25 -0300 [thread overview]
Message-ID: <20191011080825.74932496@coco.lan> (raw)
In-Reply-To: <20191010202418.25098-15-rrichter@marvell.com>
Em Thu, 10 Oct 2019 20:25:33 +0000
Robert Richter <rrichter@marvell.com> escreveu:
> Have a separate function to count errors in csrow/channel. This better
> separates code and reduces the indentation level. No functional
> changes.
This one assumes patch 06/19, with I'm not sure if it is correct.
>
> Signed-off-by: Robert Richter <rrichter@marvell.com>
> ---
> 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 9e8c5716a8c0..3779204c0e21 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -1045,6 +1045,26 @@ static struct mem_ctl_info *error_desc_to_mci(struct edac_raw_error_desc *e)
> return container_of(e, struct mem_ctl_info, error_desc);
> }
>
> +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 dimm_info *dimm)
> {
> @@ -1201,22 +1221,12 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
> chan = -2;
> }
>
> - if (any_memory) {
> + if (any_memory)
> 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;
Thanks,
Mauro
next prev parent reply other threads:[~2019-10-11 11:08 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 20:25 [PATCH 00/19] EDAC: Rework edac_mc and ghes drivers Robert Richter
2019-10-10 20:25 ` [PATCH 01/19] EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function Robert Richter
2019-10-11 9:58 ` Mauro Carvalho Chehab
2019-10-11 11:38 ` Robert Richter
2019-10-10 20:25 ` [PATCH 02/19] EDAC: Remove EDAC_DIMM_OFF() macro Robert Richter
2019-10-11 10:09 ` Mauro Carvalho Chehab
2019-10-11 11:36 ` Robert Richter
2019-10-10 20:25 ` [PATCH 03/19] EDAC: Introduce mci_for_each_dimm() iterator Robert Richter
2019-10-11 10:14 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 04/19] EDAC, mc: Do not BUG_ON() in edac_mc_alloc() Robert Richter
2019-10-11 10:15 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 05/19] EDAC, mc: Reduce indentation level in edac_mc_handle_error() Robert Richter
2019-10-10 22:10 ` Joe Perches
2019-10-11 6:50 ` Robert Richter
2019-10-11 10:20 ` Mauro Carvalho Chehab
2019-10-11 10:50 ` Joe Perches
2019-10-11 12:08 ` Robert Richter
2019-10-11 14:49 ` Joe Perches
2019-10-11 10:17 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 06/19] EDAC, mc: Remove per layer counters Robert Richter
2019-10-11 10:40 ` Mauro Carvalho Chehab
2019-10-14 11:12 ` Robert Richter
2019-10-10 20:25 ` [PATCH 07/19] EDAC, mc: Rename iterator variable to idx Robert Richter
2019-10-11 10:41 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 08/19] EDAC, mc: Split edac_mc_alloc() into smaller functions Robert Richter
2019-10-11 10:43 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 09/19] EDAC, mc: Reorder functions edac_mc_alloc*() Robert Richter
2019-10-11 10:45 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 10/19] EDAC, mc: Rework edac_raw_mc_handle_error() to use struct dimm_info Robert Richter
2019-10-11 10:48 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 11/19] EDAC: Remove misleading comment in struct edac_raw_error_desc Robert Richter
2019-10-11 10:49 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 12/19] EDAC: Store error type " Robert Richter
2019-10-11 10:54 ` Mauro Carvalho Chehab
2019-10-14 11:47 ` Robert Richter
2019-10-10 20:25 ` [PATCH 13/19] EDAC, mc: Determine mci pointer from the error descriptor Robert Richter
2019-10-11 10:56 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 14/19] EDAC, mc: Create new function edac_inc_csrow() Robert Richter
2019-10-11 11:08 ` Mauro Carvalho Chehab [this message]
2019-10-14 11:58 ` Robert Richter
2019-10-10 20:25 ` [PATCH 15/19] EDAC, ghes: Use standard kernel macros for page calculations Robert Richter
2019-10-11 11:10 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 16/19] EDAC, ghes: Fix grain calculation Robert Richter
2019-10-11 11:22 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 17/19] EDAC, ghes: Remove intermediate buffer pvt->detail_location Robert Richter
2019-10-11 11:20 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 18/19] EDAC, ghes: Unify trace_mc_event() code with edac_mc driver Robert Richter
2019-10-11 11:23 ` Mauro Carvalho Chehab
2019-10-10 20:25 ` [PATCH 19/19] EDAC, Documentation: Describe CPER module definition and DIMM ranks Robert Richter
2019-10-11 11:29 ` Mauro Carvalho Chehab
2019-10-10 20:36 ` [PATCH 00/19] EDAC: Rework edac_mc and ghes drivers Robert Richter
2019-10-14 12:00 ` Robert Richter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191011080825.74932496@coco.lan \
--to=mchehab@kernel.org \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rrichter@marvell.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).