From patchwork Thu Jun 27 17:32:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 13714942 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 15099C2BD09 for ; Thu, 27 Jun 2024 17:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wkA9C4eBe9zrPFkOyR9chwI8BZqNOGe215GRsYCQ0Vk=; b=H+q689kAVaz12K3RbbjHTLviVD bMXJ1ZslFebWshbLwrQarLL8PBjgtmpEHuNIQAmJ9DiWq6GLiJSZ4WXLm311aaInhW9VvfZCqJgxz nbw2po8Qr8Q6nH4da+8FAqXg3GLbKrzbBEDskMzcQciOIgMltw5SKxwtVNzSjJxuRDNoVQPhA/vZ9 dBay4hxUyXwz8cc30UPWfWnBbhAQsURmmVRyqY4Z01xvUNl2H1uzwtjBS5E/bNBFDLUDzu+Aie+xS BHzgEJy6szDysLBYlppzyBjnhN8md581QhUDrbWaj3MKc1//3t5oFaKq9xNFFA34iD6Pr80v+Wzrc 9LjD1YcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMt0w-0000000BEFX-3AXc; Thu, 27 Jun 2024 17:34:30 +0000 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMszm-0000000BDUt-2F8d for linux-arm-kernel@lists.infradead.org; Thu, 27 Jun 2024 17:33:20 +0000 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2ec6635aa43so43940021fa.1 for ; Thu, 27 Jun 2024 10:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719509597; x=1720114397; 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=wkA9C4eBe9zrPFkOyR9chwI8BZqNOGe215GRsYCQ0Vk=; b=jjfC/SZth00gdbRwDOolpPiQI6x+Snyk6r1NbB92kI/+fW6neXsbM7YuxBbAE2vxo7 RwdcnnfNnqsdbmNHQq1V8NJfqWUUCs1HMRhIhiOFRO42Nxy83GrnDsWdLcvTjczL6KJe D4LSZ9uwNM0dsyCt9SfHXW7kXLgWd4SFrq0W7OUPEF3CJtCIGIijV6ccZOndehLdXNsW PQp1/i2BxMUNNYCdpdkSO9gt+ZPwgQ3vI9Np/er24bToUF/djPBaqowE/b2qya6Nt7Vf AlkDVLDAPOeGnW/ckUiGBDZTWmPKzpl6zD5Gxux+OSM7tIUX1Y6ApBzBW2tZq3O9dhyf 2FAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719509597; x=1720114397; 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=wkA9C4eBe9zrPFkOyR9chwI8BZqNOGe215GRsYCQ0Vk=; b=XYAp9O+CmwEHBVW1xQxv5awlxs2bHEf0zpQcvlUXdxM+a9sIQuQvc5uq2fnCd6M4Xv x8rrv8jV/9oXrt/xQ425TFZx+n9Xr3FmSfbCmLWfp+v/cKhqsJirdi7wzZHp2cCwdx33 /qCOnAx6Pusj4AexNh3dFSTAbbywRBqJ+4o4dFJWY0Y3RBcSfqlkr4KSQxcRKdiyF3G7 udaLvOO0bVG0wcPgAEXUHhGxcDt9+XLxh2Ri/ASYWjAFiDO3dMp7PbileWI74fYeELAH XQAwXcOuOzcC2+xH3O0smJQ8XVFdA37gMPB7q+zm8by1Ys8k/UZ2QDz9/yKp4HCHVs/F 4jlA== X-Forwarded-Encrypted: i=1; AJvYcCUEjia1AeQL7+vV5ZL0AlNRYF92Fyu4cSrZqdTay/TzRl4Ga6r0FmJZ9T9H0L3UMY0GL41X813eKJEgsZVgow2ohOsPt2k7NKjDJTlW9MWqASRc5M8= X-Gm-Message-State: AOJu0YxatwUoXPS1IPkBJfSwot5/z6fc4FpPw1wcDSFAX8w442An4WnJ D2Dj1e+oJqSRmBJpAQ7nk9ZWQ8SnrhY1fdo3KNJIG2GnS50jYLIt X-Google-Smtp-Source: AGHT+IGRHdnaZ61P0qLag6rV5tFY8rbbLPkyQL7JrDkYZXnvm5q2UAt24A8bDte9VKFYXgoMVqZu3w== X-Received: by 2002:a2e:97d8:0:b0:2eb:ef78:29c8 with SMTP id 38308e7fff4ca-2ec5797a37fmr91414371fa.14.1719509596861; Thu, 27 Jun 2024 10:33:16 -0700 (PDT) Received: from localhost ([213.79.110.82]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ee4a344147sm3286201fa.15.2024.06.27.10.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 10:33:16 -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 , Shubhrajyoti Datta , Arnd Bergmann , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Shubhrajyoti Datta Subject: [PATCH RESEND v6 09/18] EDAC/synopsys: Shorten out struct ecc_error_info.bankgrpnr field name Date: Thu, 27 Jun 2024 20:32:16 +0300 Message-ID: <20240627173251.25718-10-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240627173251.25718-1-fancer.lancer@gmail.com> References: <20240627173251.25718-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-20240627_103318_828877_59E7BF02 X-CRM114-Status: GOOD ( 13.43 ) 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 Reviewed-by: Shubhrajyoti Datta --- 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 a874f6e4130d..8b7069bca600 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -268,17 +268,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; }; /** @@ -429,7 +429,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); @@ -443,7 +443,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; @@ -478,9 +478,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", @@ -497,9 +497,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 ",