From patchwork Wed Sep 20 19:10:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 13393261 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F1202C04FED for ; Wed, 20 Sep 2023 19:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6L7sEyqtOUTMJKQz5aESTXQfm/0EB+2RWt+pKuVDgTc=; b=gNFZUVppf7+kSf gCOovcYfX4eQM4e7igo/7urNp+3V8wdE2YJv+Ncf0n3t0dOFK/HkPCHgbNgPuxt4tMr2SlvACiOM4 r75qnLrnfTwhkWPA2Kvs2tvGhkL/d3glBIkvobZr21Qhs/5SEC53Bn/0la4k6KVowaawhMxjU8vOQ LZnibk4R2xicO9cl5K7fTS/Fg06F7D/RJEwRX9LEs/qlSR721gCqMZ93G7g5DnzjWcQvwU1VsFQ8J E1DzRDeHB05XFIGrjoe7YZ//rTs62+eLi6HCjIk0PWH4/U48AYdbbvhRvGWHih906joPAwVH4uhS2 xCj4jC/Nusqx1Bm8WTUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qj2cd-003xXz-0a; Wed, 20 Sep 2023 19:12:27 +0000 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qj2c3-003x65-1d for linux-arm-kernel@lists.infradead.org; Wed, 20 Sep 2023 19:11:53 +0000 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-50300cb4776so339373e87.3 for ; Wed, 20 Sep 2023 12:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695237110; x=1695841910; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mCL/KfRnOdR+fD7qSne1U1v9LHSA52Tb/8PzjUuto2I=; b=HiTHU9LJxKneRbGArDB9W5kzVFA7TkKiqq9nUB6JYglTHvCfoQkt12FtxyVGv0zR06 JDtETP+Vyt5RurJyMbsWHxF1nkmGtdfxftdBxcX+FEVbyqYzG/zqODk/iXtTH1jhhQUI ffWYQEWkQcVhG2DwXC6rwKqfLtTaWPWgg7/91Ca6tCVqzozcl+PmoAQPVQrQ0SUanoXe Rrf6h6+RNx6XMjpG045M+awVGBdToh07bZO/DMLwgP/uoAVtq6abx9AMTaxTV4oNRMW/ YwTsqP6BMLEJvzJjUkr4fWZDlMu4www39S+Q8n2vg2/dbhDomeR4eEnjUqxa/9kvrrm8 PpmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695237110; x=1695841910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mCL/KfRnOdR+fD7qSne1U1v9LHSA52Tb/8PzjUuto2I=; b=KrsCXjUE1+U2vidlzg3WstmjXGQ83ORU9c4o7gnBkwK16srQGgTKWCDg8gGd/nzS8P Iz2YH4u2buVYPl/Tkx42/szhsbeoS8uwPm0PDzZTRNE887SVfYxL0Ivfo9/5gjN7tm/C 2E5IXyB+KyNyL7YoKspPNdSS7kbYyG3Xt1K1Sx3ej/r2rpGEwJUzQePM0o2NmIsj+E/K hIybPx4hYrWFqp5oZr+qthC8oTPOn2Jdp6la2vz9tVR4OHmANXPcBXxvBR7Bg+k8WroI +0t3fYZul5AafAprxi3Pg1swU8QFxzzVoE3DLlwBmlxDqdiNHahRWuajqQUxsUwcOSbw wCVA== X-Gm-Message-State: AOJu0Yx0Iw9Z0h8EMYwhobsnbSua3EsHo3zvnGRyf6eTbnML16WfDN8f mS6xKXv6gpyF3+DJOI5IHww= X-Google-Smtp-Source: AGHT+IG0MBhp9k1dVAO8UTtbMqjpSrpZp4ViKXvxlqfQuedsWqoefMUxzt6ATljwC5wWyMEElxz3VA== X-Received: by 2002:a19:e01a:0:b0:500:aa41:9d67 with SMTP id x26-20020a19e01a000000b00500aa419d67mr2857648lfg.8.1695237109965; Wed, 20 Sep 2023 12:11:49 -0700 (PDT) Received: from localhost ([178.176.82.53]) by smtp.gmail.com with ESMTPSA id w14-20020ac2598e000000b004ff8631d6c0sm2781963lfn.278.2023.09.20.12.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 12:11:49 -0700 (PDT) From: Serge Semin To: Michal Simek , Alexander Stein , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter Cc: Serge Semin , Punnaiah Choudary Kalluri , Dinh Nguyen , Arnd Bergmann , Greg Kroah-Hartman , 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 Message-ID: <20230920191059.28395-12-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920191059.28395-1-fancer.lancer@gmail.com> References: <20230920191059.28395-1-fancer.lancer@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230920_121151_551014_5E605668 X-CRM114-Status: GOOD ( 14.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 ",