From mboxrd@z Thu Jan 1 00:00:00 1970 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 B4523C4828D for ; Sat, 3 Feb 2024 05:12:32 +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:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZrfSFIRzq9tpCcIzw0tF+ouJFH9o2ps7jP4Takrts1E=; b=xr2hnlG1n510wX i8tk+iK0I6B8lDt8aD3ugqx7Vo3iVgih+ZQskpWbiDjXq2RpzdvlacKTMxeeQ3kv67/NYfcaRJn/J iVMdPry/GqKDaoBjmvMmKLuH555CHk2Rkqc1c0WybZPRI8tRnMQe5g8dLejTgUvUezGQXY6/SKrc+ fHsgpt0nCMUCvaonhtszKc9s31zz3msHBQSRKDOuvFQqyEjd0p6LoYBdJmVNfY+Pck2RaQ+iPlfVw Btnd7ZCpi8Zy0HijJHnjA5kH38Eyo2PAM4J63iGaCNvWDfFEHOVV0IVTw0gImeeuHkF1Au9M1epUt wiUYL+lrOtCkMdMt/faw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rW8K3-0000000FItp-1OXG; Sat, 03 Feb 2024 05:12:11 +0000 Received: from mail-pg1-f171.google.com ([209.85.215.171]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rW8K0-0000000FIrc-373a for linux-arm-kernel@lists.infradead.org; Sat, 03 Feb 2024 05:12:10 +0000 Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5c229dabbb6so1816857a12.0 for ; Fri, 02 Feb 2024 21:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706937123; x=1707541923; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=DTV9gbg5MKn5RvztaG5+AnGINY2wWIUBOjQj4JgbKAs=; b=OdlBLk2a1IiADrH14X3N+ssYF/SojsVEjtGXTIJeyF+gzjWhS7PdSK0teJUwkTG+W2 p5RNV92eDbRXB3cWwg8AvmezAT7FyynhTPMVl6o/Ll7gF0R3ADl59Qi5+1auXlq4LrHi ITBH5kN1kIOU49La6U0MSTE+3sclpKnErftv9kub1fwchWHIwzF7crTPwH/zd7uS4NO3 Cgc6MQuez8zdiA2+e/FAAkYz0QVBIZXXKaAS4kBlSlLuEi4iialwGrn/pQ2mW/sZwYgb WZZz5KShSz7hFeey9a0U4YEICmZyTo2NqOg+8QARf/R560IEDeEDpM0DTLfhOYXvFAdj 38OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706937123; x=1707541923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DTV9gbg5MKn5RvztaG5+AnGINY2wWIUBOjQj4JgbKAs=; b=iOMGlkox/qx1Y1j8q7WYwJjiUI7jdgXpqzMbZZCHjx+CJivFinYSSuHJLu+K8m/3S2 oH6phV5hXrroqByxnHUwn+PhCeeYvK7AKQn6ZnAYXJ+JODn7gcV/5o31QE2caO0Yjnck qc27yhaae2YS8l2dz8u7hlaIU7CUMcYyBks7KL0Om+eZZpeszMZVrJPrSwicswtCqbRC 5sbN/fxdSAGIpFbLzxBONjJKrrmFYby/13p2ruP/VONqOa+1TRotK5ctMb6/TBA+z8zK M0flmm3uwzlTsiJWTmS4d7pMhq6qiVowVjdaUNKewtcA0RppVvZooahaR4BgcBX3CXB3 5iag== X-Gm-Message-State: AOJu0Yzrr5yUvdIjaCuxm4PEbKa4W0/ErOfmBdMo/aUO/jwQqrY4D41P BPGCszvm6+VxeEttGnTJQ+WXoyCtnxXts3CJd+kk2i7Usm+l1GRl X-Google-Smtp-Source: AGHT+IH5+XC1/bcCppA4nFR7X2sj4P5Iy8Z0U/6nYySgkYLySzaYVQAPqHXoiQs4dnlg7lwlTMkbNg== X-Received: by 2002:a17:902:e807:b0:1d7:6d49:c78a with SMTP id u7-20020a170902e80700b001d76d49c78amr12547440plg.58.1706937122766; Fri, 02 Feb 2024 21:12:02 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWTyx3Tb8ALnQnDfkcnBxx8lNHZQcdL5+5L97dSuORYHMNih1eREndOh7Pbm6/YwPLM88BBKE9zNrrHPVzc8uE8xdsFTmlNcIYSzf0TMQOBqR58x7INtYGp40T/2w6rLMdgID9zXSs+HgyFXrAwY5mIAM3zkGUjMc4SP628zNW4lYfPyBfdtUzca2SucvOVDt7+vBl8byGjlCYRl/38z5A18EunmLR9P02VqiX5LAllCDpHBSRzakp7wjFtoElTTTGFaNM/3aGHQ2d1Kj2u+mrwljYHMv+/5OogqJL7RI5Zhhdu3WhsUgQheyANoMP8QmJ0NONTRoN8YGf38Ru37AuW7T9v+tpdz34Iy2XMjQBk03e+daiCljZIE518h7t2Pjbn1FgrD8B2mG8g0egOMTTf0MqLaqFAV6vzpqTE5VknZxRc7uPWKlgI3F0i0Rw3w2e2TIl4lCu7hXzjir33FaEWl9Zj1odnltrn/UBmgE6nb5l+SiHGWn8VzqrS7uouGlLsx2TuLA== Received: from localhost ([129.146.253.192]) by smtp.gmail.com with ESMTPSA id r20-20020a170903411400b001d6ee9d8957sm2437664pld.281.2024.02.02.21.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 21:12:02 -0800 (PST) Date: Sat, 3 Feb 2024 13:11:54 +0800 From: Furong Xu <0x1207@gmail.com> To: Serge Semin Cc: "David S. Miller" , Jakub Kicinski , Alexandre Torgue , Jose Abreu , Eric Dumazet , Paolo Abeni , Maxime Coquelin , Joao Pinto , Simon Horman , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, xfr@outlook.com, rock.xu@nio.com Subject: Re: [PATCH net v3] net: stmmac: xgmac: fix handling of DPP safety error for DMA channels Message-ID: <20240203131154.00005898@gmail.com> In-Reply-To: References: <20240131020828.2007741-1-0x1207@gmail.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.34; x86_64-w64-mingw32) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240202_211208_831451_95C4D1DA X-CRM114-Status: GOOD ( 32.95 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, 3 Feb 2024 00:58:39 +0300 Serge Semin wrote: > On Wed, Jan 31, 2024 at 10:08:28AM +0800, Furong Xu wrote: > > Commit 56e58d6c8a56 ("net: stmmac: Implement Safety Features in > > XGMAC core") checks and reports safety errors, but leaves the > > Data Path Parity Errors for each channel in DMA unhandled at all, lead to > > a storm of interrupt. > > Fix it by checking and clearing the DMA_DPP_Interrupt_Status register. > > > > Fixes: 56e58d6c8a56 ("net: stmmac: Implement Safety Features in XGMAC core") > > Signed-off-by: Furong Xu <0x1207@gmail.com> > > --- > > Changes in v3: > > - code style fix, thanks Paolo Abeni > > > > Changes in v2: > > - explicit enable Data Path Parity Protection > > - add new counters to stmmac_safety_stats > > - add detailed log > > --- > > drivers/net/ethernet/stmicro/stmmac/common.h | 1 + > > .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 + > > .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 57 ++++++++++++++++++- > > 3 files changed, 60 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h > > index 721c1f8e892f..b4f60ab078d6 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/common.h > > +++ b/drivers/net/ethernet/stmicro/stmmac/common.h > > @@ -216,6 +216,7 @@ struct stmmac_safety_stats { > > unsigned long mac_errors[32]; > > unsigned long mtl_errors[32]; > > unsigned long dma_errors[32]; > > + unsigned long dma_dpp_errors[32]; > > }; > > > > /* Number of fields in Safety Stats */ > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h > > index 207ff1799f2c..5c67a3f89f08 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h > > @@ -303,6 +303,8 @@ > > #define XGMAC_RXCEIE BIT(4) > > #define XGMAC_TXCEIE BIT(0) > > #define XGMAC_MTL_ECC_INT_STATUS 0x000010cc > > +#define XGMAC_MTL_DPP_CONTROL 0x000010e0 > > > +#define XGMAC_DDPP_DISABLE BIT(0) > > Is the double "D" a typo? Shouldn't this be XGMAC_DPP_DISABLE or just > XGMAC_DDPP (if the "DDPP" means "Disable DPP")? > > If so, David/Jakub, is it possible to rebase the branch with the macro > fixed in the commit or a new cleanup patch is the only option? > > Other than the nit above no more notes from my side: > > Reviewed-by: Serge Semin > > -Serge(y) > Hi Serge: Sorry for my mistake. DDPP is copied from Synopsys Data book: Disable Data path Parity Protection. When it is 0x0, Data path Parity Protection is enabled. When it is 0x1, Data path Parity Protection is disabled. I will send a new patch. > > #define XGMAC_MTL_TXQ_OPMODE(x) (0x00001100 + (0x80 * (x))) > > #define XGMAC_TQS GENMASK(25, 16) > > #define XGMAC_TQS_SHIFT 16 > > @@ -385,6 +387,7 @@ > > #define XGMAC_DCEIE BIT(1) > > #define XGMAC_TCEIE BIT(0) > > #define XGMAC_DMA_ECC_INT_STATUS 0x0000306c > > +#define XGMAC_DMA_DPP_INT_STATUS 0x00003074 > > #define XGMAC_DMA_CH_CONTROL(x) (0x00003100 + (0x80 * (x))) > > #define XGMAC_SPH BIT(24) > > #define XGMAC_PBLx8 BIT(16) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c > > index eb48211d9b0e..04d7c4dc2e35 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c > > @@ -830,6 +830,43 @@ static const struct dwxgmac3_error_desc dwxgmac3_dma_errors[32]= { > > { false, "UNKNOWN", "Unknown Error" }, /* 31 */ > > }; > > > > +static const char * const dpp_rx_err = "Read Rx Descriptor Parity checker Error"; > > +static const char * const dpp_tx_err = "Read Tx Descriptor Parity checker Error"; > > +static const struct dwxgmac3_error_desc dwxgmac3_dma_dpp_errors[32] = { > > + { true, "TDPES0", dpp_tx_err }, > > + { true, "TDPES1", dpp_tx_err }, > > + { true, "TDPES2", dpp_tx_err }, > > + { true, "TDPES3", dpp_tx_err }, > > + { true, "TDPES4", dpp_tx_err }, > > + { true, "TDPES5", dpp_tx_err }, > > + { true, "TDPES6", dpp_tx_err }, > > + { true, "TDPES7", dpp_tx_err }, > > + { true, "TDPES8", dpp_tx_err }, > > + { true, "TDPES9", dpp_tx_err }, > > + { true, "TDPES10", dpp_tx_err }, > > + { true, "TDPES11", dpp_tx_err }, > > + { true, "TDPES12", dpp_tx_err }, > > + { true, "TDPES13", dpp_tx_err }, > > + { true, "TDPES14", dpp_tx_err }, > > + { true, "TDPES15", dpp_tx_err }, > > + { true, "RDPES0", dpp_rx_err }, > > + { true, "RDPES1", dpp_rx_err }, > > + { true, "RDPES2", dpp_rx_err }, > > + { true, "RDPES3", dpp_rx_err }, > > + { true, "RDPES4", dpp_rx_err }, > > + { true, "RDPES5", dpp_rx_err }, > > + { true, "RDPES6", dpp_rx_err }, > > + { true, "RDPES7", dpp_rx_err }, > > + { true, "RDPES8", dpp_rx_err }, > > + { true, "RDPES9", dpp_rx_err }, > > + { true, "RDPES10", dpp_rx_err }, > > + { true, "RDPES11", dpp_rx_err }, > > + { true, "RDPES12", dpp_rx_err }, > > + { true, "RDPES13", dpp_rx_err }, > > + { true, "RDPES14", dpp_rx_err }, > > + { true, "RDPES15", dpp_rx_err }, > > +}; > > + > > static void dwxgmac3_handle_dma_err(struct net_device *ndev, > > void __iomem *ioaddr, bool correctable, > > struct stmmac_safety_stats *stats) > > @@ -841,6 +878,13 @@ static void dwxgmac3_handle_dma_err(struct net_device *ndev, > > > > dwxgmac3_log_error(ndev, value, correctable, "DMA", > > dwxgmac3_dma_errors, STAT_OFF(dma_errors), stats); > > + > > + value = readl(ioaddr + XGMAC_DMA_DPP_INT_STATUS); > > + writel(value, ioaddr + XGMAC_DMA_DPP_INT_STATUS); > > + > > + dwxgmac3_log_error(ndev, value, false, "DMA_DPP", > > + dwxgmac3_dma_dpp_errors, > > + STAT_OFF(dma_dpp_errors), stats); > > } > > > > static int > > @@ -881,6 +925,12 @@ dwxgmac3_safety_feat_config(void __iomem *ioaddr, unsigned int asp, > > value |= XGMAC_TMOUTEN; /* FSM Timeout Feature */ > > writel(value, ioaddr + XGMAC_MAC_FSM_CONTROL); > > > > + /* 5. Enable Data Path Parity Protection */ > > + value = readl(ioaddr + XGMAC_MTL_DPP_CONTROL); > > + /* already enabled by default, explicit enable it again */ > > + value &= ~XGMAC_DDPP_DISABLE; > > + writel(value, ioaddr + XGMAC_MTL_DPP_CONTROL); > > + > > return 0; > > } > > > > @@ -914,7 +964,11 @@ static int dwxgmac3_safety_feat_irq_status(struct net_device *ndev, > > ret |= !corr; > > } > > > > - err = dma & (XGMAC_DEUIS | XGMAC_DECIS); > > + /* DMA_DPP_Interrupt_Status is indicated by MCSIS bit in > > + * DMA_Safety_Interrupt_Status, so we handle DMA Data Path > > + * Parity Errors here > > + */ > > + err = dma & (XGMAC_DEUIS | XGMAC_DECIS | XGMAC_MCSIS); > > corr = dma & XGMAC_DECIS; > > if (err) { > > dwxgmac3_handle_dma_err(ndev, ioaddr, corr, stats); > > @@ -930,6 +984,7 @@ static const struct dwxgmac3_error { > > { dwxgmac3_mac_errors }, > > { dwxgmac3_mtl_errors }, > > { dwxgmac3_dma_errors }, > > + { dwxgmac3_dma_dpp_errors }, > > }; > > > > static int dwxgmac3_safety_feat_dump(struct stmmac_safety_stats *stats, > > -- > > 2.34.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel