From patchwork Thu Feb 22 18:12:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 13567899 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 A6BC2C48BF8 for ; Thu, 22 Feb 2024 18:22:18 +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=msUUlDSXPo6za9zo6KK5rFO5y8WviifjHIsTXVs9Sdk=; b=NoNnqy2c1j6Mbh bOzg6Lo5nNUR0PV3ydN4Kzaelgy3D/EEzllN7eC70DTkI5bOYHiuWohVL1tpfFYCDH5KThWnhAMJD 1/5BKa8c6oobvqvyq4VWobnkOqhmpvSQpiWgyEQraZt3d5azD/i0xyrOgccRN3INx3LBPt+fCE33N W4ChNl9abOXwkUEfyCe5D9kVNagT1rek+geCPngvbWE0uga4Bk+JWXFh0bfSkdAIbxfKHCj5g/iF4 Kp5k3iO+HphadiODnUDo8dH489X1yJZMcffOxUn3d5bY8DJFYrGVZc0dqYKXrUfill7W4ZVrTe62F 3i8T3QdgxRfpU4btStrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdDhv-000000060hu-40Ig; Thu, 22 Feb 2024 18:22:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdDbm-00000005xeV-1rJa for linux-arm-kernel@bombadil.infradead.org; Thu, 22 Feb 2024 18:16:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=pzoe6r6O1SQZpxBPwnEmbzP/LY9Wg9dUZAFh860tCdU=; b=bbkUGq/loyPvypBRHnkKfmg+b9 BTvG+hwPEbo4Ozo4p/qjj8kT/0y8IOz9mE8Bm1bS+fCefvowLNVXkxZ2vZMRMprAiY1nlsinZvQeE +Ffvle19JYYI5WJAHri/Ft3i2H6+XSbOiQ9o9FQ5dUzCexwStTZ41DE9zmm+NLAk3k3ncXq/quvRH snLte4gdSm7FNymmSXut+jyNUh4wK6q2B+SdAux68Le8xCRGTd2ShLDVyWBxxBp/MlDoO/Xwgzsnp riyCZOB+RV/5dDARl26jVN4Jg0ztqPc5pOtAcjsZVGvlNti/Tqzt9NjkqnSl3D6xIrmvIXVTxOULM hIOxppLw==; Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by casper.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdDbj-00000004Ilb-2LW3 for linux-arm-kernel@lists.infradead.org; Thu, 22 Feb 2024 18:15:45 +0000 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-512bce554a5so91895e87.3 for ; Thu, 22 Feb 2024 10:15:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708625680; x=1709230480; 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=pzoe6r6O1SQZpxBPwnEmbzP/LY9Wg9dUZAFh860tCdU=; b=ml0+lkxYStwt9XGzvSGKI07C90PVrP9G0CQTnCp7qR108mTcCJ6y8K+e9dMC2lx7Dk pf5XtiZAwwp/aTSGXx5kwg+Zzmm8PWoXbWoQttmd6v2Xp8H3EN2IPfv3AcRYSLlu1aMo VYYg3jis3GA9rtHmhvQBGN6CydE4/WLaZWxCkPWOX5lFwV3LCkE1yVRYb6rUf9tc3ETB ew2K1vxY10POEQdWda0H0xfZPmU81ytZ+SyjL9Ntj+D3IjGDnnW97XvnwBifG9wTY7qG 60rnlxRCM9184RUhHqShEJU7vQt0HGzvLN7Zs7+bmT3vyCciz84maMF2CN4+fwyNFLYe XNHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708625680; x=1709230480; 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=pzoe6r6O1SQZpxBPwnEmbzP/LY9Wg9dUZAFh860tCdU=; b=PmwXCqK6n0ATbXpO2kfEhL7tdjbEAUwy6kRRkcCnJc26Et0oJth4GxNCDCDey/sr6C bYgk5vjwVjDXVUCGLzy3NP+PFqcQRvynntoKeSdlRuNXv00XV/zjpLeO/U1kWkeqNcCo doX0jgCD5CCwyMGG/pewXBiJ2cmXpq0QxSU2MFQfMpjRB4DeKx8dvej8k2Yp5XBkQht/ CZILl77Ggzdfc5buIBe+tl+IyvbLEH/FdC0O81PGom7awl+xsqE3yTNf/BGBdMSZQUJ/ YnZ/HZBuz8ZqQ1yCJ8C/j9MA6i77xawKKAp+zW1sruPzpc9hTGG+Id6oxO//6Q/KX+9C 5KxA== X-Forwarded-Encrypted: i=1; AJvYcCXKW4df2mIYQRJMVj77/om0Y2lRciqHRsecyih9faa+LDnp46g/iNHGs67WqzJZobhdjBExxVUjEzPbO/WTSeN1HqP/ORHhLvql5ZGsqSECETTSCcQ= X-Gm-Message-State: AOJu0YzO3Be6F1BJsc83V2zH9sNcB9i6gblsR4oJf2XtyCi/9bBKhpbz x/Wh5nkv8LtM27VYa9xammyGlACsXDiyjigo805Wa4qkz8i+kh63 X-Google-Smtp-Source: AGHT+IGcYWp+ryzNnOE+1eySElC1nrZpk/ByoTpbeCgHQM0hU5MtdJZ4f5r0RBCPz3VjbsW6XtHv6A== X-Received: by 2002:a05:6512:1384:b0:512:cb9f:a25b with SMTP id fc4-20020a056512138400b00512cb9fa25bmr6050995lfb.28.1708625680264; Thu, 22 Feb 2024 10:14:40 -0800 (PST) Received: from localhost ([178.176.56.174]) by smtp.gmail.com with ESMTPSA id y10-20020ac255aa000000b00512c531ffe4sm1081849lfg.180.2024.02.22.10.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 10:14:39 -0800 (PST) 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 v5 11/20] EDAC/synopsys: Shorten out struct ecc_error_info.bankgrpnr field name Date: Thu, 22 Feb 2024 21:12:56 +0300 Message-ID: <20240222181324.28242-12-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240222181324.28242-1-fancer.lancer@gmail.com> References: <20240222181324.28242-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-20240222_181543_618212_099EC4B0 X-CRM114-Status: GOOD ( 12.22 ) 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 6ca119459bd3..b0ff831287f5 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 ",