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 5B610CD6E75 for ; Fri, 5 Jun 2026 01:01:10 +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=cuK6dXKBAsFNVUM3IcE6hxmCyNGfHV5JrrNTNHc8ejQ=; b=dJ1qkktGhrj3x3xX7fcXHvzpOw Uwp23/GCEBEbtve87Y7TPSbk0jISpT5sZTDmwQWUNrKjZhLjH2+6xWrAMrWW7jK6ier6D6doZPp6m uakKzRRAdxTXjBGpHKRsrztIcyNc+eYzzj1dQG1S3aOP8h7Z1fQvzmp7dqJtHl5T1/xalOE4Z3985 bq1hkokuVigUwdnfsWIxN+ekTHluKGDsmrggECrdyYdZ5B5bet3//byfDmM4LMIyZ2Hsr7GehpjY8 m67o9zoUVaG00ixnl7nCFt5ip1HA+ax7ln0jXaiUeVqEyW/j0vSOSP3E9dfzNrepr5QL19gbedijp bSCIRjTw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wVIvn-0000000HTvo-0kPg; Fri, 05 Jun 2026 01:01:04 +0000 Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wVIve-0000000HToh-12pW for linux-arm-kernel@lists.infradead.org; Fri, 05 Jun 2026 01:00:56 +0000 Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-4864a8e80bbso912191b6e.0 for ; Thu, 04 Jun 2026 18:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20251104.gappssmtp.com; s=20251104; t=1780621253; x=1781226053; 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=cuK6dXKBAsFNVUM3IcE6hxmCyNGfHV5JrrNTNHc8ejQ=; b=XrIggOOCRxV1vQqUZT7Vx+5Ltuki8OjnQFy8VrrJ88kWDBlNbv4m9j0Ct7n03QwxEj 0oJ7SLBx5elDq7PZwUv648dlKqcc19+57kYBmHCcewV+dsrW5cA4n2cb/unhWMX9jJPz OKPN+RBIrJKNUoZryYIWHfnDyz5cfUwjDo1toTexZs4RAVtsExYmVyQ2Qvnql85Pvmw7 xWTHkTQaOQV1lHysHjuWZ1TVDfUdSnD3OYVy8XCUM+mZWjaJuhaBK15gfJgxOaitMDaY 1YvRGIvlSf5spnL09p7h33Ek51xJeaZASBGa5MsWicaxjsr0Cmqsrm/1+6SbhnkJXj31 czMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780621253; x=1781226053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cuK6dXKBAsFNVUM3IcE6hxmCyNGfHV5JrrNTNHc8ejQ=; b=RuPO9p/KR0o1T+dqXDWWwIZjtYhzjd2PjgKy/00KK3W4XELMblfIgaCnnF6bgntd5N sA4Cxvan6dtftQX+t24C++k1/OA/TaIBLd1cCGa95QOu/W7pFDeubhnmf3eA0h9gEjph 0lRroUiwwNgPyZYK1s3aQjTybkJgAeYuH8io+30ibuK9xlHCeAjjcGAUPys3zUty9NUp hpwya3ZDRGuU3aanUEYN+KvTTDVJari6H2ufKKWMAUliq09SHuNK3G92EHEqfYr/LarY N72PD6EFfLjt/WTBRg94hp0L/mxm6j+Aqf96spAeeuVkA/gPyARJh4FoDe8ZfbfP1UWl uGFg== X-Forwarded-Encrypted: i=1; AFNElJ+yj4HAeRqm7a4f/XQi6sEqtDUjjkOaVeS/QiuqZshK6w8OzvPB7m5rUirJqUJoejee48dIxLOcrZ+/eiRX/GsJ@lists.infradead.org X-Gm-Message-State: AOJu0YyBFPKkTVE3ybcNPlpt+K+zTI0+liG8GIYcrSDzYj4P/TBHaDDT esSTWSWpSnJ8K0mceKKVw0Ci4YmInHbhrv98GFfMJzvenC9FwtWlEMyTlrkJMl+DVUc= X-Gm-Gg: Acq92OFyb/M28tKYKy/cH6Nq7VMDDs5ufFxeh4p+pXMFiI4ke182DNidtEIdivqUO8S d1lVIa5uZ+MdrJoAwj4rj2n6kIKu9zfXO/GTua9mnWsJwST5+iCI3NMTPvXZETAf0i8CN0i6KQW l5HAPE2d3GZawBFe41BIj+iWu8ahXqDILowyJAbuHha+jOxxSmUYdCfm2Xff1pisFKtZ/cQyJHJ PhMIWste3wZoHE/QuHM4irFCDgScMhsaOHUt0r+bp4F9MbYqvnYu1MErGK1+cSAMLKLzEmBwtDd w4RVxzxlwwxE8HGylN6n1a0l5HrTfYxrAQz1c2yqVanZJm+u+rkDyOHq4f6ELL7fvcWYko4xo4s 7f94zjiudplfwpFrrj9W5Q/tBFCvBczV5vQhBjRXmYQb26DOi8nM1svKHEZbVg2pURh9oBPnUY6 XZ5Ro2pFc/l6j5YnPEk3rKe1Zr2pmLQ6rCxleKRC7BX+11m5+/ X-Received: by 2002:a05:6808:d49:b0:479:e869:5424 with SMTP id 5614622812f47-4868dc7df9bmr777929b6e.19.1780621253368; Thu, 04 Jun 2026 18:00:53 -0700 (PDT) Received: from zippy.localdomain ([73.62.185.64]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4865b6ec694sm5544631b6e.5.2026.06.04.18.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 18:00:53 -0700 (PDT) From: Alex Elder To: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, maxime.chevallier@bootlin.com, rmk+kernel@armlinux.org.uk, andersson@kernel.org, konradybcio@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, linusw@kernel.org, brgl@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org Cc: Daniel Thompson , elder@riscstar.com, mohd.anwar@oss.qualcomm.com, a0987203069@gmail.com, alexandre.torgue@foss.st.com, ast@kernel.org, boon.khai.ng@altera.com, chenchuangyu@xiaomi.com, chenhuacai@kernel.org, daniel@iogearbox.net, hawk@kernel.org, hkallweit1@gmail.com, inochiama@gmail.com, john.fastabend@gmail.com, julianbraha@gmail.com, livelycarpet87@gmail.com, mcoquelin.stm32@gmail.com, me@ziyao.cc, prabhakar.mahadev-lad.rj@bp.renesas.com, richardcochran@gmail.com, rohan.g.thomas@altera.com, sdf@fomichev.me, siyanteng@cqsoftware.com.cn, weishangjuan@eswincomputing.com, wens@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-gpio@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 08/14] net: stmmac: dwxgmac2: Add XGMAC 3.01a support Date: Thu, 4 Jun 2026 20:00:15 -0500 Message-ID: <20260605010022.968612-9-elder@riscstar.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260605010022.968612-1-elder@riscstar.com> References: <20260605010022.968612-1-elder@riscstar.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260604_180054_727104_2028D055 X-CRM114-Status: GOOD ( 18.51 ) 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 From: Daniel Thompson XGMAC 2.x and 3.x are architecturally very similar. That means that for everything except one erratum we can simply use the XGMAC 2.x callback functions in the stmmac_dma_ops structure. Only the set_rx_ring_len callback is specific to XGMAC 3.01. It limits the number of outstanding write requests that can be serviced per DMA. The other erratum addressed in this patch is simply a comment to ensure that a feature that stmmac doesn't currently use is not enabled without contemplating the errata. Signed-off-by: Daniel Thompson Signed-off-by: Alex Elder --- .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 3 ++ .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 53 +++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h index 9b0b5cc619556..bcf59ad8a1939 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -374,6 +374,8 @@ #define XGMAC_DMA_CH_RxDESC_TAIL_LPTR(x) (0x0000312c + (0x80 * (x))) #define XGMAC_DMA_CH_TxDESC_RING_LEN(x) (0x00003130 + (0x80 * (x))) #define XGMAC_DMA_CH_RxDESC_RING_LEN(x) (0x00003134 + (0x80 * (x))) +#define XGMAC_OWRQ GENMASK(25, 24) +#define XGMAC_RDRL GENMASK(15, 0) #define XGMAC_DMA_CH_INT_EN(x) (0x00003138 + (0x80 * (x))) #define XGMAC_NIE BIT(15) #define XGMAC_AIE BIT(14) @@ -463,6 +465,7 @@ extern const struct stmmac_ops dwxgmac210_ops; extern const struct stmmac_ops dwxlgmac2_ops; extern const struct stmmac_dma_ops dwxgmac210_dma_ops; +extern const struct stmmac_dma_ops dwxgmac301_dma_ops; extern const struct stmmac_desc_ops dwxgmac210_desc_ops; #endif /* __STMMAC_DWXGMAC2_H__ */ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c index a84601ac32153..584ab28d7f7f5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c @@ -38,6 +38,14 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr, value = u32_replace_bits(value, XGMAC_INTM_MODE1, XGMAC_INTM_MASK); + /* + * A friendly warning to future adventurers. If Descriptor Posted + * Write support, which is off by default, is ever enabled then be sure + * to make it optional. This is required by errata for at least XGMAC + * 3.01A... and the XGMAC 2.x and 3.x are architecturally similar so we + * use dwxgmac2 support for the 3.x family as well. + */ + writel(value, ioaddr + XGMAC_DMA_MODE); } @@ -490,6 +498,20 @@ static void dwxgmac2_set_rx_ring_len(struct stmmac_priv *priv, writel(len, ioaddr + XGMAC_DMA_CH_RxDESC_RING_LEN(chan)); } +static void dwxgmac301_set_rx_ring_len(struct stmmac_priv *priv, + void __iomem *ioaddr, u32 len, u32 chan) +{ + u32 val = FIELD_PREP(XGMAC_RDRL, len); + + /* + * Reduce the number of outstanding write requests to 3 (from default + * of 4). This is an errata workaround for XGMAC 3.01a. + */ + val |= FIELD_PREP(XGMAC_OWRQ, 3); + + writel(val, ioaddr + XGMAC_DMA_CH_RxDESC_RING_LEN(chan)); +} + static void dwxgmac2_set_tx_ring_len(struct stmmac_priv *priv, void __iomem *ioaddr, u32 len, u32 chan) { @@ -619,3 +641,34 @@ const struct stmmac_dma_ops dwxgmac210_dma_ops = { .enable_sph = dwxgmac2_enable_sph, .enable_tbs = dwxgmac2_enable_tbs, }; + +/* All but one field are the same as dwxgmac210_dma_ops */ +const struct stmmac_dma_ops dwxgmac301_dma_ops = { + .reset = dwxgmac2_dma_reset, + .init = dwxgmac2_dma_init, + .init_chan = dwxgmac2_dma_init_chan, + .init_rx_chan = dwxgmac2_dma_init_rx_chan, + .init_tx_chan = dwxgmac2_dma_init_tx_chan, + .axi = dwxgmac2_dma_axi, + .dump_regs = dwxgmac2_dma_dump_regs, + .dma_rx_mode = dwxgmac2_dma_rx_mode, + .dma_tx_mode = dwxgmac2_dma_tx_mode, + .enable_dma_irq = dwxgmac2_enable_dma_irq, + .disable_dma_irq = dwxgmac2_disable_dma_irq, + .start_tx = dwxgmac2_dma_start_tx, + .stop_tx = dwxgmac2_dma_stop_tx, + .start_rx = dwxgmac2_dma_start_rx, + .stop_rx = dwxgmac2_dma_stop_rx, + .dma_interrupt = dwxgmac2_dma_interrupt, + .get_hw_feature = dwxgmac2_get_hw_feature, + .rx_watchdog = dwxgmac2_rx_watchdog, + .set_rx_ring_len = dwxgmac301_set_rx_ring_len, /* Only 3.01 */ + .set_tx_ring_len = dwxgmac2_set_tx_ring_len, + .set_rx_tail_ptr = dwxgmac2_set_rx_tail_ptr, + .set_tx_tail_ptr = dwxgmac2_set_tx_tail_ptr, + .enable_tso = dwxgmac2_enable_tso, + .qmode = dwxgmac2_qmode, + .set_bfsize = dwxgmac2_set_bfsize, + .enable_sph = dwxgmac2_enable_sph, + .enable_tbs = dwxgmac2_enable_tbs, +}; -- 2.51.0