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>
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
Subject: [PATCH v4 11/20] EDAC/synopsys: Shorten out struct ecc_error_info.bankgrpnr field name
Date: Wed, 20 Sep 2023 22:10:35 +0300 [thread overview]
Message-ID: <20230920191059.28395-12-fancer.lancer@gmail.com> (raw)
In-Reply-To: <20230920191059.28395-1-fancer.lancer@gmail.com>
None of the ecc_error_info structure fields have "nr" suffix even though
each of them do represent some number (row number, column number, bank
number). Drop the suffix from the bankgrpnr field name for the sake of
unification then. Similarly drop the word "Number" from the CE/UE error
messages too since it doesn't give any helpful info there.
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
drivers/edac/synopsys_edac.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c
index f2bcc3f79bf2..f1ec44cdd87f 100644
--- a/drivers/edac/synopsys_edac.c
+++ b/drivers/edac/synopsys_edac.c
@@ -269,17 +269,17 @@
* @row: Row number.
* @col: Column number.
* @bank: Bank number.
+ * @bankgrp: Bank group number.
* @bitpos: Bit position.
* @data: Data causing the error.
- * @bankgrpnr: Bank group number.
*/
struct ecc_error_info {
u32 row;
u32 col;
u32 bank;
+ u32 bankgrp;
u32 bitpos;
u32 data;
- u32 bankgrpnr;
};
/**
@@ -430,7 +430,7 @@ static int zynqmp_get_error_info(struct synps_edac_priv *priv)
regval = readl(base + ECC_CEADDR1_OFST);
p->ceinfo.bank = (regval & ECC_CEADDR1_BNKNR_MASK) >>
ECC_CEADDR1_BNKNR_SHIFT;
- p->ceinfo.bankgrpnr = (regval & ECC_CEADDR1_BNKGRP_MASK) >>
+ p->ceinfo.bankgrp = (regval & ECC_CEADDR1_BNKGRP_MASK) >>
ECC_CEADDR1_BNKGRP_SHIFT;
p->ceinfo.col = (regval & ECC_CEADDR1_COL_MASK);
p->ceinfo.data = readl(base + ECC_CSYND0_OFST);
@@ -444,7 +444,7 @@ static int zynqmp_get_error_info(struct synps_edac_priv *priv)
regval = readl(base + ECC_UEADDR0_OFST);
p->ueinfo.row = (regval & ECC_CEADDR0_RW_MASK);
regval = readl(base + ECC_UEADDR1_OFST);
- p->ueinfo.bankgrpnr = (regval & ECC_CEADDR1_BNKGRP_MASK) >>
+ p->ueinfo.bankgrp = (regval & ECC_CEADDR1_BNKGRP_MASK) >>
ECC_CEADDR1_BNKGRP_SHIFT;
p->ueinfo.bank = (regval & ECC_CEADDR1_BNKNR_MASK) >>
ECC_CEADDR1_BNKNR_SHIFT;
@@ -479,9 +479,9 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p)
pinf = &p->ceinfo;
if (priv->p_data->quirks & DDR_ECC_INTR_SUPPORT) {
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
- "DDR ECC error type:%s Row %d Col %d Bank %d BankGroup Number %d Bit Position: %d Data: 0x%08x",
+ "DDR ECC error type:%s Row %d Col %d Bank %d Bank Group %d Bit Position: %d Data: 0x%08x",
"CE", pinf->row, pinf->col, pinf->bank,
- pinf->bankgrpnr, pinf->bitpos, pinf->data);
+ pinf->bankgrp, pinf->bitpos, pinf->data);
} else {
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
"DDR ECC error type:%s Row %d Bank %d Col %d Bit Position: %d Data: 0x%08x",
@@ -498,9 +498,9 @@ static void handle_error(struct mem_ctl_info *mci, struct synps_ecc_status *p)
pinf = &p->ueinfo;
if (priv->p_data->quirks & DDR_ECC_INTR_SUPPORT) {
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
- "DDR ECC error type :%s Row %d Col %d Bank %d BankGroup Number %d",
+ "DDR ECC error type :%s Row %d Col %d Bank %d Bank Group %d",
"UE", pinf->row, pinf->col, pinf->bank,
- pinf->bankgrpnr);
+ pinf->bankgrp);
} else {
snprintf(priv->message, SYNPS_EDAC_MSG_SIZE,
"DDR ECC error type :%s Row %d Bank %d Col %d ",
--
2.41.0
next prev parent reply other threads:[~2023-09-20 19:12 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 ` [PATCH v4 05/20] EDAC/synopsys: Fix reading errors count before ECC status Serge Semin
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 ` Serge Semin [this message]
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-12-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=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=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