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: 142645 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4487854vqi; Wed, 20 Sep 2023 16:16:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFI5/ixT1YBuJBYwoHj5JxI3GKQrk6lVQTBQxtLe8O3bUgkgxgTjn45zdOgIQ+KqKWUZTln X-Received: by 2002:a17:902:ab5d:b0:1c5:7aa1:3a52 with SMTP id ij29-20020a170902ab5d00b001c57aa13a52mr3098336plb.2.1695251773624; Wed, 20 Sep 2023 16:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695251773; cv=none; d=google.com; s=arc-20160816; b=Z/AxNawWDU0ROZIn2p7R5hWkE9S7oAK3z2sx/jHL9j9xxIi66BkSRPhVf6kEvwzdYz DxblhxZv7G4ijiBszj74LjXzUM7Ehqf3fn+GbR0SpwI9ZKvqhi2H+fF46iPTWtyn2fvl oGk7bRlcs7xVjXrnq1iEYB6C8ftjCnOgvQsEFOwl2YWxd4wMgs67kOOaIIPuE7IlisUC /ge79dfmZ7dOKhpTFkHWisC0k3lwzAQFegLgMPf5STMLjV84bzPfR15bnAE3F9TYzBd8 hQAxmaOMdWW5hnek3BAqn6PdOHIgGuwN6r7nbSzuKUaDFyswC5ff0NZ7jNFtzTMlpxva N2Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mCL/KfRnOdR+fD7qSne1U1v9LHSA52Tb/8PzjUuto2I=; fh=Dnqcu1G7YxMiPJ+rEGjOOR/MtvfjezykDSRJXQQtmAE=; b=vSG/A6t0VqVU3ApkpX0puz6BOi1RVlU9y4pGLE/clpVyTIrkEeXrEfQ9/u6HpjGM7+ BxuSD6jIoF6Zr8b2rFiTXulW/2u8XTKcGjVRXdJM6733ypR9nH3lYrTKuScRqIH7BDej 0Azeq6IW91VhXsD7rO7zXz/kB+/02IxiIBqeeqa1aYVSn8bor7/ItzDc4fSrAslb9drz 8Tj6lpSi95HfBAXtMGtNFG1DkyNHmEd9IhuoZSMxIfnZoLIvMt5RkAi2loTZQclFv9KJ GJs6yHnoz/cvKVcIf5PT37oGbgr655Jjgy73+vI044Y2l94ovXq9XafWchkTKwfOpZZE QbpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=c0+HBqKH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id f10-20020a170902684a00b001c33d339754si128972pln.136.2023.09.20.16.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 16:16:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=c0+HBqKH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id CFD44828CC1A; Wed, 20 Sep 2023 12:12:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230053AbjITTMY (ORCPT + 27 others); Wed, 20 Sep 2023 15:12:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230048AbjITTMK (ORCPT ); Wed, 20 Sep 2023 15:12:10 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D440FCDE; Wed, 20 Sep 2023 12:11:52 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-500cfb168c6so344156e87.2; Wed, 20 Sep 2023 12:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695237110; x=1695841910; darn=vger.kernel.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=c0+HBqKH+NN4r98AouQKn/689VwpVdpOGj/k4hP7I0n/+hmVArcpsx3kN84C0BFxw4 f5uLBwZBO4zxwJpeOnUnqk7a0Zv3bLp0zSL47oywMm3aHGpt5JR0d80LvfUlGxO5Gs29 +ZB4Vr70Gl7r/ZW7nmStf90sgFRPbQvDYA7UxnX/NvIE8teUDH7ldmI9LPU768FgRruY NuVPWhM2SHLiRkHQ+aqRWM/hHMKcr/GxS97lQkmlJfpQnoM0Wa5tIuAS8mJJJ2/zuUj8 jmItm6osrMOXBpGOFY81RmpGR3EpoR+rU4wmRL1Vskrs/DLpTmsayEsQ+loFquwzOx4/ DEqw== 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=NgHUILsW0q9qF2JsUoZCYzlFcQzn1Lt3q6P8nxGwRjEUZ7bSC8xewy3kjuTkTIvkBk pgUix3n8UpZeLMHhywVjwBTucfubte9pahiYWNOFLu7iSgvN7zoynVIr4/lI60ht/GGO hpXkeQTQmkVxFxqp/2uyXRsgekyGak0KX8uYdVQo8gZ8IjvzYu7lvRKwXbWIpmJI8WEj VrBHU/B7lS0/8/X+DIDkFE4RKcFKMD5a2kgkIqSgz72OqGieqAJr2ZSg0ZaTNjqDPQ+2 E69AWUbfPiNqt6owFyJTM982a79KG26aQFL63q98F73p40GiWDUw7PZ2+nrrKnNP7/Ew hPVQ== X-Gm-Message-State: AOJu0Yxf/J6XUYJd9YR6/XK3JoyvtOH47DHMDFX9w43Hh8CG2+oHffBj lKGM53Ja7eKoV3VMZlcDWQ4= 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-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 20 Sep 2023 12:12:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777600323867069626 X-GMAIL-MSGID: 1777600323867069626 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 ",