Re: [PATCH 14/19] EDAC, mc: Create new function edac_inc_csrow()
On 11.10.19 08:08:25, Mauro Carvalho Chehab wrote:
> Em Thu, 10 Oct 2019 20:25:33 +
> Robert Richter 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.
See also my answer there, the driver should still work as you expect
it even with patch #6 applied. This patch is important to isolate the
csrow handling that makes the code much better understandable and
readable. I hope there are no concerns to this patch.
Thank you for review.
-Robert
>
> >
> > Signed-off-by: Robert Richter
> > ---
> > 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
Re: [PATCH 14/19] EDAC, mc: Create new function edac_inc_csrow()
Em Thu, 10 Oct 2019 20:25:33 +
Robert Richter 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
> ---
> 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
[PATCH 14/19] EDAC, mc: Create new function edac_inc_csrow()
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
---
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;
--
2.20.1
