From: Serge Semin <fancer.lancer@gmail.com>
To: Michal Simek <michal.simek@amd.com>,
Alexander Stein <alexander.stein@ew.tq-group.com>,
Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>,
James Morse <james.morse@arm.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Robert Richter <rric@kernel.org>,
Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Cc: Serge Semin <fancer.lancer@gmail.com>,
Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>,
Dinh Nguyen <dinguyen@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org,
linux-kernel@vger.kernel.org,
Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>,
Borislav Petkov <bp@suse.de>
Subject: [PATCH v4 05/20] EDAC/synopsys: Fix reading errors count before ECC status
Date: Wed, 20 Sep 2023 22:10:29 +0300 [thread overview]
Message-ID: <20230920191059.28395-6-fancer.lancer@gmail.com> (raw)
In-Reply-To: <20230920191059.28395-1-fancer.lancer@gmail.com>
Aside with fixing the errors count CSR usage the commit e2932d1f6f05
("EDAC/synopsys: Read the error count from the correct register") all of
the sudden has also changed the order of the errors status check
procedure. So now the errors handler method first reads the number of CE
and UE and only then makes sure that any of these errors have actually
happened. It doesn't make sense. Fix that by getting back the correct
procedures order: first check the ECC status, then read the number of
errors.
Fixes: e2932d1f6f05 ("EDAC/synopsys: Read the error count from the correct register")
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
---
drivers/edac/synopsys_edac.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
index 308da6f82d3d..fff4b07ff6ac 100644
--- a/drivers/edac/synopsys_edac.c
+++ b/drivers/edac/synopsys_edac.c
@@ -419,18 +419,18 @@ static int zynqmp_get_error_info(struct synps_edac_priv *priv)
base = priv->baseaddr;
p = &priv->stat;
- regval = readl(base + ECC_ERRCNT_OFST);
- p->ce_cnt = regval & ECC_ERRCNT_CECNT_MASK;
- p->ue_cnt = (regval & ECC_ERRCNT_UECNT_MASK) >> ECC_ERRCNT_UECNT_SHIFT;
- if (!p->ce_cnt)
- goto ue_err;
-
regval = readl(base + ECC_STAT_OFST);
if (!regval)
return 1;
p->ceinfo.bitpos = (regval & ECC_STAT_BITNUM_MASK);
+ regval = readl(base + ECC_ERRCNT_OFST);
+ p->ce_cnt = regval & ECC_ERRCNT_CECNT_MASK;
+ p->ue_cnt = (regval & ECC_ERRCNT_UECNT_MASK) >> ECC_ERRCNT_UECNT_SHIFT;
+ if (!p->ce_cnt)
+ goto ue_err;
+
regval = readl(base + ECC_CEADDR0_OFST);
p->ceinfo.row = (regval & ECC_CEADDR0_RW_MASK);
regval = readl(base + ECC_CEADDR1_OFST);
--
2.41.0
next prev parent reply other threads:[~2023-09-20 19:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 19:10 [PATCH v4 00/20] EDAC/mc/synopsys: Various fixes and cleanups Serge Semin
2023-09-20 19:10 ` [PATCH v4 01/20] EDAC/synopsys: Fix ECC status data and IRQ disable race condition Serge Semin
2023-09-20 19:10 ` [PATCH v4 02/20] EDAC/synopsys: Fix generic device type detection procedure Serge Semin
2023-09-20 19:10 ` [PATCH v4 03/20] EDAC/synopsys: Fix mci->scrub_cap field setting Serge Semin
2023-09-20 19:10 ` [PATCH v4 04/20] EDAC/synopsys: Drop erroneous ADDRMAP4.addrmap_col_b10 parse Serge Semin
2023-09-20 19:10 ` Serge Semin [this message]
2023-09-20 19:10 ` [PATCH v4 06/20] EDAC/synopsys: Fix misleading IRQ self-cleared quirk flag Serge Semin
2023-09-20 19:10 ` [PATCH v4 07/20] EDAC/synopsys: Use platform device devm ioremap method Serge Semin
2023-09-20 19:10 ` [PATCH v4 08/20] EDAC/synopsys: Drop internal CE and UE counters Serge Semin
2023-09-20 19:10 ` [PATCH v4 09/20] EDAC/synopsys: Drop local to_mci() macro definition Serge Semin
2023-09-20 19:10 ` [PATCH v4 10/20] EDAC/synopsys: Drop struct ecc_error_info.blknr field Serge Semin
2023-09-20 19:10 ` [PATCH v4 11/20] EDAC/synopsys: Shorten out struct ecc_error_info.bankgrpnr field name Serge Semin
2023-09-20 19:10 ` [PATCH v4 12/20] EDAC/synopsys: Drop redundant info from the error messages Serge Semin
2023-09-20 19:10 ` [PATCH v4 13/20] EDAC/mc: Init DIMM labels in MC registration method Serge Semin
2023-09-20 19:10 ` [PATCH v4 14/20] EDAC/mc: Add generic unique MC index allocation procedure Serge Semin
2023-09-20 19:10 ` [PATCH v4 15/20] EDAC/mc: Re-use " Serge Semin
2023-09-20 19:10 ` [PATCH v4 16/20] EDAC/synopsys: Detach Zynq A05 DDRC support to separate driver Serge Semin
2023-09-21 11:26 ` kernel test robot
2023-09-21 19:32 ` Serge Semin
2023-09-20 19:10 ` [PATCH v4 17/20] EDAC/synopsys: Drop unused platform-specific setup API Serge Semin
2023-09-20 19:10 ` [PATCH v4 18/20] EDAC/synopsys: Unify CSRs macro declarations Serge Semin
2023-09-20 19:10 ` [PATCH v4 19/20] EDAC/synopsys: Unify struct/macro/function prefixes Serge Semin
2023-09-20 19:10 ` [PATCH v4 20/20] EDAC/synopsys: Convert to using BIT/GENMASK/FIELD_x macros Serge Semin
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=20230920191059.28395-6-fancer.lancer@gmail.com \
--to=fancer.lancer@gmail.com \
--cc=alexander.stein@ew.tq-group.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=dinguyen@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=michal.simek@amd.com \
--cc=punnaiah.choudary.kalluri@xilinx.com \
--cc=rric@kernel.org \
--cc=shubhrajyoti.datta@amd.com \
--cc=shubhrajyoti.datta@xilinx.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