From nobody Sat Apr 4 04:36:26 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp10.broadcom.com [192.19.144.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D702036E470; Fri, 20 Mar 2026 21:19:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.205 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041592; cv=none; b=fuXDJeadJSSolNd21DT0Hi3Y6m8pOg+NxFl7w1IU6vG9ywcDmASvCH8P/D//AGVv8/YhLq1oEm3UvsEUfBBL7YdY1kb5jB7mg/2z6QfhnxLYfcueWVEsf1yNE2PfcrbqhfSJXJSd5gbWl94uYJeK0BBudmV7oj+sEtbRiNW1akI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041592; c=relaxed/simple; bh=Qj0VCImCrWJnC20PW2Tcs//uU7c7cuxI1j0MHoEqggs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VjY9VlMLBQT8JfyDtHCFPfwGNf+Cay5EW8DIRgZrhjus7M5ty436ec5wsnOGV7rBJRMzdYgY36jyCp9Dsnc/BelhfEICbLS7H0EXdeQC6BCgZah30ESQVvaQf1oAg6LVnpXZONGHH1Rrnxp4eo4GMHd/EYWQPVP4mXOXwirzK7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=ArQ2Nktf; arc=none smtp.client-ip=192.19.144.205 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="ArQ2Nktf" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id BB60CC00081F; Fri, 20 Mar 2026 14:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com BB60CC00081F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1774041589; bh=Qj0VCImCrWJnC20PW2Tcs//uU7c7cuxI1j0MHoEqggs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ArQ2Nktf3jVtIbnxmMSl9mPe+MIhMBWmUQtghIm15+GbJnJBWWDVsjEb29flyJJeN ElqFmI/U0XHc3iv6h3NWiB+PzDW9aAGDy1UJINileumZHhOSJHt2WOQgFVIzOrJLzz xxLgPJRFv/ebBYJQCbaA5UaIhmVUiQbXhhOPLY8A= Received: from lvnvdb8054.lvn.broadcom.net (lvnvdb8054.lvn.broadcom.net [10.17.214.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id C6527AE81; Fri, 20 Mar 2026 17:19:46 -0400 (EDT) From: "Jitendra Vegiraju" To: netdev@vger.kernel.org Cc: alexandre.torgue@foss.st.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, jitendra.vegiraju@broadcom.com, bcm-kernel-feedback-list@broadcom.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, rmk+kernel@armlinux.org.uk, rohan.g.thomas@altera.com, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, me@ziyao.cc, siyanteng@cqsoftware.com.cn, prabhakar.mahadev-lad.rj@bp.renesas.com, weishangjuan@eswincomputing.com, wens@kernel.org, vladimir.oltean@nxp.com, lizhi2@eswincomputing.com, boon.khai.ng@altera.com, maxime.chevallier@bootlin.com, chenchuangyu@xiaomi.com, yangtiezhu@loongson.cn, ovidiu.panait.rb@renesas.com, chenhuacai@kernel.org, florian.fainelli@broadcom.com, quic_abchauha@quicinc.com Subject: [PATCH net-next v8 1/6] Add 25GMAC core type to dwmac_core_type enum Date: Fri, 20 Mar 2026 14:19:16 -0700 Message-ID: <20260320211921.1202058-2-jitendra.vegiraju@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> References: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jitendra Vegiraju The DW25GMAC is a newer ethernet MAC IP block from Synopsys that introduced new DMA architecure called Hyper-DMA. Define a new dwmac_core_type enum in include/linux/stmmac.h file. Signed-off-by: Jitendra Vegiraju --- include/linux/stmmac.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 72febd246bdb..464f4f2e366a 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -197,6 +197,7 @@ enum dwmac_core_type { DWMAC_CORE_GMAC, DWMAC_CORE_GMAC4, DWMAC_CORE_XGMAC, + DWMAC_CORE_25GMAC, }; =20 #define STMMAC_FLAG_SPH_DISABLE BIT(1) --=20 2.34.1 From nobody Sat Apr 4 04:36:26 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp10.broadcom.com [192.19.144.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19EE5388E62; Fri, 20 Mar 2026 21:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.205 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041596; cv=none; b=lIbjClu+a08OSFrq6A0bXG/3db/SIYCZXw0A5mMHY8TlMEr6X7IAMnh/0vk/q1/xo3D4bgnsCpB76M9ImKGbd5E3Cv+R01vlX45b7MFg617zmwQ8d5RlEHeXLxn587G4jWZu4NpEZxopYmJyLKumftj0yTrcIEYK5/dRwb1XVUc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041596; c=relaxed/simple; bh=s2UuLFxxlGhogl9n78Nn5SQiFy/QzQSatnx162a3lEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+Erhho8lmXMemKSThjGXGUmtxPR7088W7pKIriLekoD30vuWNS9gJeagTfp9Odi5fludJJKCrNLFev0kD8gzR7fz6OrahTxB3qs/2fB4hm+BjiszUCBUh43jvAZart01cFNdFdZ8eZAw6///jQKlufBkUK2mqmvOqwhGbr9FsE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=JCu4k+6y; arc=none smtp.client-ip=192.19.144.205 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="JCu4k+6y" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id F2C94C0009A6; Fri, 20 Mar 2026 14:19:52 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com F2C94C0009A6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1774041593; bh=s2UuLFxxlGhogl9n78Nn5SQiFy/QzQSatnx162a3lEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JCu4k+6yYKpZyejNYZ1fL+a7hy8zlPb5x1G2q3eyxC3U87RXvj+hhC+z9ilB0dzKS PM4XCC091nBZgErwgmz7MznSlfzZtXC3dP4JOUFmKBd9n7zgfK+XdwlZ66cr7WbExQ fwEZj6XaKDnBV3prV+ChHmGmP/Sxe+wKJrz/6PRQ= Received: from lvnvdb8054.lvn.broadcom.net (lvnvdb8054.lvn.broadcom.net [10.17.214.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id DFC60AE80; Fri, 20 Mar 2026 17:19:49 -0400 (EDT) From: "Jitendra Vegiraju" To: netdev@vger.kernel.org Cc: alexandre.torgue@foss.st.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, jitendra.vegiraju@broadcom.com, bcm-kernel-feedback-list@broadcom.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, rmk+kernel@armlinux.org.uk, rohan.g.thomas@altera.com, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, me@ziyao.cc, siyanteng@cqsoftware.com.cn, prabhakar.mahadev-lad.rj@bp.renesas.com, weishangjuan@eswincomputing.com, wens@kernel.org, vladimir.oltean@nxp.com, lizhi2@eswincomputing.com, boon.khai.ng@altera.com, maxime.chevallier@bootlin.com, chenchuangyu@xiaomi.com, yangtiezhu@loongson.cn, ovidiu.panait.rb@renesas.com, chenhuacai@kernel.org, florian.fainelli@broadcom.com, quic_abchauha@quicinc.com Subject: [PATCH net-next v8 2/6] Add DW25GMAC support in stmmac core driver Date: Fri, 20 Mar 2026 14:19:17 -0700 Message-ID: <20260320211921.1202058-3-jitendra.vegiraju@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> References: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jitendra Vegiraju The DW25GMAC introduced in this version adds new DMA architecture called Hyper-DMA (HDMA) for virtualization scalability. This is realized by decoupling physical DMA channels (PDMA) from potentially large number of virtual DMA channels (VDMA). The VDMAs provide software abstraction to driver that map to PDMAs for frame transmission and receptio= n. Since the 25GMAC is a derivative of XGMAC, majority of IP is common to both. To add support for the HDMA in 25GMAC, a new instance of dma_ops, dw25gmac400_dma_ops is introduced. To support the current needs, a simple one-to-one mapping of dw25gmac's logical VDMA (channel) to TC to PDMAs is used. Most of the other dma operat= ion functions in existing dwxgamc2_dma.c file are reused where applicable. Added setup function for DW25GMAC's stmmac_hwif_entry in stmmac core. Signed-off-by: Jitendra Vegiraju --- drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- drivers/net/ethernet/stmicro/stmmac/common.h | 12 +- .../net/ethernet/stmicro/stmmac/dw25gmac.c | 161 ++++++++++++++++++ .../net/ethernet/stmicro/stmmac/dw25gmac.h | 92 ++++++++++ .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 1 + .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 59 ++++--- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 51 ++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 35 ++++ 9 files changed, 390 insertions(+), 24 deletions(-) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dw25gmac.c create mode 100644 drivers/net/ethernet/stmicro/stmmac/dw25gmac.h diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/eth= ernet/stmicro/stmmac/Makefile index 945c5354eced..a99bb0dfe5ab 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -6,7 +6,7 @@ stmmac-objs:=3D stmmac_main.o stmmac_ethtool.o stmmac_mdio.= o ring_mode.o \ mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o dwmac4_descs.o \ dwmac4_dma.o dwmac4_lib.o dwmac4_core.o dwmac5.o hwif.o \ stmmac_tc.o dwxgmac2_core.o dwxgmac2_dma.o dwxgmac2_descs.o \ - stmmac_xdp.o stmmac_est.o stmmac_fpe.o stmmac_vlan.o \ + stmmac_xdp.o stmmac_est.o stmmac_fpe.o stmmac_vlan.o dw25gmac.o \ stmmac_pcs.o $(stmmac-y) =20 stmmac-$(CONFIG_STMMAC_SELFTESTS) +=3D stmmac_selftests.o diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/eth= ernet/stmicro/stmmac/common.h index 8166389c853f..b6dfe7a890ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -42,13 +42,18 @@ #define DWXGMAC_CORE_2_20 0x22 #define DWXLGMAC_CORE_2_00 0x20 =20 +#define DW25GMAC_CORE_3_20 0x32 +#define DW25GMAC_CORE_4_00 0x40 + /* Device ID */ #define DWXGMAC_ID 0x76 +#define DW25GMAC_ID 0x55 #define DWXLGMAC_ID 0x27 =20 static inline bool dwmac_is_xmac(enum dwmac_core_type core_type) { - return core_type =3D=3D DWMAC_CORE_GMAC4 || core_type =3D=3D DWMAC_CORE_X= GMAC; + return core_type =3D=3D DWMAC_CORE_GMAC4 || core_type =3D=3D DWMAC_CORE_X= GMAC || + core_type =3D=3D DWMAC_CORE_25GMAC; } =20 #define STMMAC_CHAN0 0 /* Always supported and default for all chips */ @@ -328,6 +333,9 @@ struct stmmac_safety_stats { #define PHY_INTF_GMII 0 #define PHY_INTF_RGMII 1 =20 +/* DW25GMAC uses different encoding - defaults to XGMII */ +#define PHY_INTF_DW25GMAC_XGMII 0 + /* MSI defines */ #define STMMAC_MSI_VEC_MAX 32 =20 @@ -596,6 +604,7 @@ struct mac_link { u32 speed2500; u32 speed5000; u32 speed10000; + u32 speed25000; } xgmii; struct { u32 speed25000; @@ -655,6 +664,7 @@ int dwmac100_setup(struct stmmac_priv *priv); int dwmac1000_setup(struct stmmac_priv *priv); int dwmac4_setup(struct stmmac_priv *priv); int dwxgmac2_setup(struct stmmac_priv *priv); +int dw25gmac_setup(struct stmmac_priv *priv); int dwxlgmac2_setup(struct stmmac_priv *priv); =20 void stmmac_set_mac_addr(void __iomem *ioaddr, const u8 addr[6], diff --git a/drivers/net/ethernet/stmicro/stmmac/dw25gmac.c b/drivers/net/e= thernet/stmicro/stmmac/dw25gmac.c new file mode 100644 index 000000000000..82eb22bff73e --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dw25gmac.c @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024-2026 Broadcom Corporation + */ +#include "stmmac.h" +#include "dwxgmac2.h" +#include "dw25gmac.h" + +u32 dw25gmac_decode_vdma_count(u32 regval) +{ + /* compressed encoding for vdma count */ + if (regval < 16) /* Direct mapping */ + return regval + 1; + else if (regval < 20) /* 20, 24, 28, 32 */ + return 20 + (regval - 16) * 4; + else if (regval < 24) /* 40, 48, 56, 64 */ + return 40 + (regval - 20) * 8; + else if (regval < 28) /* 80, 96, 112, 128 */ + return 80 + (regval - 24) * 16; + else /* not defined */ + return 0; +} + +static int rd_dma_ch_ind(void __iomem *ioaddr, u8 mode, u32 channel) +{ + u32 reg_val =3D 0; + + reg_val |=3D FIELD_PREP(XXVGMAC_MODE_SELECT, mode); + reg_val |=3D FIELD_PREP(XXVGMAC_ADDR_OFFSET, channel); + reg_val |=3D XXVGMAC_CMD_TYPE | XXVGMAC_OB; + writel(reg_val, ioaddr + XXVGMAC_DMA_CH_IND_CONTROL); + return readl(ioaddr + XXVGMAC_DMA_CH_IND_DATA); +} + +static void wr_dma_ch_ind(void __iomem *ioaddr, u8 mode, u32 channel, u32 = val) +{ + u32 reg_val =3D 0; + + writel(val, ioaddr + XXVGMAC_DMA_CH_IND_DATA); + reg_val |=3D FIELD_PREP(XXVGMAC_MODE_SELECT, mode); + reg_val |=3D FIELD_PREP(XXVGMAC_ADDR_OFFSET, channel); + reg_val |=3D XGMAC_OB; + writel(reg_val, ioaddr + XXVGMAC_DMA_CH_IND_CONTROL); +} + +void dw25gmac_dma_init(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg) +{ + u32 tx_pdmas, rx_pdmas; + u32 hw_cap; + u32 value; + u32 i; + + value =3D readl(ioaddr + XGMAC_DMA_SYSBUS_MODE); + value &=3D ~(XGMAC_AAL | XGMAC_EAME); + if (dma_cfg->aal) + value |=3D XGMAC_AAL; + if (dma_cfg->eame) + value |=3D XGMAC_EAME; + writel(value, ioaddr + XGMAC_DMA_SYSBUS_MODE); + + /* Get PDMA counts from HW */ + hw_cap =3D readl(ioaddr + XGMAC_HW_FEATURE2); + tx_pdmas =3D FIELD_GET(XGMAC_HWFEAT_TXQCNT, hw_cap) + 1; + rx_pdmas =3D FIELD_GET(XGMAC_HWFEAT_RXQCNT, hw_cap) + 1; + + /* Initialize all PDMAs with burst length fields */ + for (i =3D 0; i < tx_pdmas; i++) { + value =3D rd_dma_ch_ind(ioaddr, MODE_TXEXTCFG, i); + value &=3D ~(XXVGMAC_TXPBL | XXVGMAC_TPBLX8_MODE); + if (dma_cfg->pblx8) + value |=3D XXVGMAC_TPBLX8_MODE; + value |=3D FIELD_PREP(XXVGMAC_TXPBL, dma_cfg->pbl); + wr_dma_ch_ind(ioaddr, MODE_TXEXTCFG, i, value); + } + + for (i =3D 0; i < rx_pdmas; i++) { + value =3D rd_dma_ch_ind(ioaddr, MODE_RXEXTCFG, i); + value &=3D ~(XXVGMAC_RXPBL | XXVGMAC_RPBLX8_MODE); + if (dma_cfg->pblx8) + value |=3D XXVGMAC_RPBLX8_MODE; + value |=3D FIELD_PREP(XXVGMAC_RXPBL, dma_cfg->pbl); + wr_dma_ch_ind(ioaddr, MODE_RXEXTCFG, i, value); + } +} + +void dw25gmac_dma_init_tx_chan(struct stmmac_priv *priv, + void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_addr, u32 chan) +{ + u32 value; + u32 tc; + + /* Descriptor cache size and prefetch threshold size */ + value =3D rd_dma_ch_ind(ioaddr, MODE_TXDESCCTRL, chan); + value &=3D ~XXVGMAC_TXDCSZ; + value |=3D FIELD_PREP(XXVGMAC_TXDCSZ, + XXVGMAC_TXDCSZ_256BYTES); + value &=3D ~XXVGMAC_TDPS; + value |=3D FIELD_PREP(XXVGMAC_TDPS, XXVGMAC_TDPS_HALF); + wr_dma_ch_ind(ioaddr, MODE_TXDESCCTRL, chan, value); + + /* Use one-to-one mapping between VDMA, TC, and PDMA. */ + tc =3D chan; + + /* 1-to-1 PDMA to TC mapping */ + value =3D rd_dma_ch_ind(ioaddr, MODE_TXEXTCFG, chan); + value &=3D ~XXVGMAC_TP2TCMP; + value |=3D FIELD_PREP(XXVGMAC_TP2TCMP, tc); + wr_dma_ch_ind(ioaddr, MODE_TXEXTCFG, chan, value); + + /* 1-to-1 VDMA to TC mapping */ + value =3D readl(ioaddr + XGMAC_DMA_CH_TX_CONTROL(chan)); + value &=3D ~XXVGMAC_TVDMA2TCMP; + value |=3D FIELD_PREP(XXVGMAC_TVDMA2TCMP, tc); + writel(value, ioaddr + XGMAC_DMA_CH_TX_CONTROL(chan)); + + writel(upper_32_bits(dma_addr), + ioaddr + XGMAC_DMA_CH_TxDESC_HADDR(chan)); + writel(lower_32_bits(dma_addr), + ioaddr + XGMAC_DMA_CH_TxDESC_LADDR(chan)); +} + +void dw25gmac_dma_init_rx_chan(struct stmmac_priv *priv, + void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_addr, u32 chan) +{ + u32 value; + u32 tc; + + /* Descriptor cache size and prefetch threshold size */ + value =3D rd_dma_ch_ind(ioaddr, MODE_RXDESCCTRL, chan); + value &=3D ~XXVGMAC_RXDCSZ; + value |=3D FIELD_PREP(XXVGMAC_RXDCSZ, + XXVGMAC_RXDCSZ_256BYTES); + value &=3D ~XXVGMAC_RDPS; + value |=3D FIELD_PREP(XXVGMAC_RDPS, XXVGMAC_RDPS_HALF); + wr_dma_ch_ind(ioaddr, MODE_RXDESCCTRL, chan, value); + + /* Use one-to-one mapping between VDMA, TC, and PDMA. */ + tc =3D chan; + + /* 1-to-1 PDMA to TC mapping */ + value =3D rd_dma_ch_ind(ioaddr, MODE_RXEXTCFG, chan); + value &=3D ~XXVGMAC_RP2TCMP; + value |=3D FIELD_PREP(XXVGMAC_RP2TCMP, tc); + wr_dma_ch_ind(ioaddr, MODE_RXEXTCFG, chan, value); + + /* 1-to-1 VDMA to TC mapping */ + value =3D readl(ioaddr + XGMAC_DMA_CH_RX_CONTROL(chan)); + value &=3D ~XXVGMAC_RVDMA2TCMP; + value |=3D FIELD_PREP(XXVGMAC_RVDMA2TCMP, tc); + writel(value, ioaddr + XGMAC_DMA_CH_RX_CONTROL(chan)); + + writel(upper_32_bits(dma_addr), + ioaddr + XGMAC_DMA_CH_RxDESC_HADDR(chan)); + writel(lower_32_bits(dma_addr), + ioaddr + XGMAC_DMA_CH_RxDESC_LADDR(chan)); +} diff --git a/drivers/net/ethernet/stmicro/stmmac/dw25gmac.h b/drivers/net/e= thernet/stmicro/stmmac/dw25gmac.h new file mode 100644 index 000000000000..b2eee66f04d5 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dw25gmac.h @@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (c) 2024-2026 Broadcom Corporation + * DW25GMAC definitions. + */ +#ifndef __STMMAC_DW25GMAC_H__ +#define __STMMAC_DW25GMAC_H__ + +/* Hardware features */ +#define XXVGMAC_HWFEAT_VDMA_RXCNT GENMASK(16, 12) +#define XXVGMAC_HWFEAT_VDMA_TXCNT GENMASK(22, 18) + +/* DMA Indirect Registers*/ +#define XXVGMAC_DMA_CH_IND_CONTROL 0x00003080 +#define XXVGMAC_MODE_SELECT GENMASK(27, 24) +enum dma_ch_ind_modes { + MODE_TXEXTCFG =3D 0x0, /* Tx Extended Config */ + MODE_RXEXTCFG =3D 0x1, /* Rx Extended Config */ + MODE_TXDBGSTS =3D 0x2, /* Tx Debug Status */ + MODE_RXDBGSTS =3D 0x3, /* Rx Debug Status */ + MODE_TXDESCCTRL =3D 0x4, /* Tx Descriptor control */ + MODE_RXDESCCTRL =3D 0x5, /* Rx Descriptor control */ +}; + +#define XXVGMAC_ADDR_OFFSET GENMASK(14, 8) +#define XXVGMAC_AUTO_INCR GENMASK(5, 4) +#define XXVGMAC_CMD_TYPE BIT(1) +#define XXVGMAC_OB BIT(0) +#define XXVGMAC_DMA_CH_IND_DATA 0x00003084 + +/* TX Config definitions */ +#define XXVGMAC_TXPBL GENMASK(29, 24) +#define XXVGMAC_TPBLX8_MODE BIT(19) +#define XXVGMAC_TP2TCMP GENMASK(18, 16) +#define XXVGMAC_ORRQ GENMASK(13, 8) + +/* RX Config definitions */ +#define XXVGMAC_RXPBL GENMASK(29, 24) +#define XXVGMAC_RPBLX8_MODE BIT(19) +#define XXVGMAC_RP2TCMP GENMASK(18, 16) +#define XXVGMAC_OWRQ GENMASK(13, 8) + +/* Tx Descriptor control */ +#define XXVGMAC_TXDCSZ GENMASK(2, 0) +#define XXVGMAC_TXDCSZ_0BYTES 0 +#define XXVGMAC_TXDCSZ_64BYTES 1 +#define XXVGMAC_TXDCSZ_128BYTES 2 +#define XXVGMAC_TXDCSZ_256BYTES 3 +#define XXVGMAC_TDPS GENMASK(5, 3) +#define XXVGMAC_TDPS_ZERO 0 +#define XXVGMAC_TDPS_1_8TH 1 +#define XXVGMAC_TDPS_1_4TH 2 +#define XXVGMAC_TDPS_HALF 3 +#define XXVGMAC_TDPS_3_4TH 4 + +/* Rx Descriptor control */ +#define XXVGMAC_RXDCSZ GENMASK(2, 0) +#define XXVGMAC_RXDCSZ_0BYTES 0 +#define XXVGMAC_RXDCSZ_64BYTES 1 +#define XXVGMAC_RXDCSZ_128BYTES 2 +#define XXVGMAC_RXDCSZ_256BYTES 3 +#define XXVGMAC_RDPS GENMASK(5, 3) +#define XXVGMAC_RDPS_ZERO 0 +#define XXVGMAC_RDPS_1_8TH 1 +#define XXVGMAC_RDPS_1_4TH 2 +#define XXVGMAC_RDPS_HALF 3 +#define XXVGMAC_RDPS_3_4TH 4 + +/* DWCXG_DMA_CH(#i) Registers*/ +#define XXVGMAC_DSL GENMASK(20, 18) +#define XXVGMAC_MSS GENMASK(13, 0) +#define XXVGMAC_TFSEL GENMASK(30, 29) +#define XXVGMAC_TQOS GENMASK(27, 24) +#define XXVGMAC_IPBL BIT(15) +#define XXVGMAC_TVDMA2TCMP GENMASK(6, 4) +#define XXVGMAC_RPF BIT(31) +#define XXVGMAC_RVDMA2TCMP GENMASK(30, 28) +#define XXVGMAC_RQOS GENMASK(27, 24) + +u32 dw25gmac_decode_vdma_count(u32 regval); + +void dw25gmac_dma_init(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg); + +void dw25gmac_dma_init_tx_chan(struct stmmac_priv *priv, + void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_addr, u32 chan); +void dw25gmac_dma_init_rx_chan(struct stmmac_priv *priv, + void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_addr, u32 chan); +#endif /* __STMMAC_DW25GMAC_H__ */ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/e= thernet/stmicro/stmmac/dwxgmac2.h index 51943705a2b0..eb302a885dd3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -17,6 +17,7 @@ #define XGMAC_CONFIG_SS_OFF 29 #define XGMAC_CONFIG_SS_MASK GENMASK(31, 29) #define XGMAC_CONFIG_SS_10000 (0x0 << XGMAC_CONFIG_SS_OFF) +#define XGMAC_CONFIG_SS_25000 (0x1 << XGMAC_CONFIG_SS_OFF) #define XGMAC_CONFIG_SS_2500_GMII (0x2 << XGMAC_CONFIG_SS_OFF) #define XGMAC_CONFIG_SS_1000_GMII (0x3 << XGMAC_CONFIG_SS_OFF) #define XGMAC_CONFIG_SS_100_MII (0x4 << XGMAC_CONFIG_SS_OFF) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/= net/ethernet/stmicro/stmmac/dwxgmac2_core.c index f02b434bbd50..64c38de294da 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -13,6 +13,7 @@ #include "stmmac_vlan.h" #include "dwxlgmac2.h" #include "dwxgmac2.h" +#include "dw25gmac.h" =20 static void dwxgmac2_core_init(struct mac_device_info *hw, struct net_device *dev) @@ -1519,11 +1520,11 @@ const struct stmmac_ops dwxlgmac2_ops =3D { .fpe_map_preemption_class =3D dwxgmac3_fpe_map_preemption_class, }; =20 -int dwxgmac2_setup(struct stmmac_priv *priv) +static void dwxgmac2_common_setup(struct stmmac_priv *priv, char *mac_name) { struct mac_device_info *mac =3D priv->hw; =20 - dev_info(priv->device, "\tXGMAC2\n"); + dev_info(priv->device, "\t%s\n", mac_name); =20 priv->dev->priv_flags |=3D IFF_UNICAST_FLT; mac->pcsr =3D priv->ioaddr; @@ -1534,6 +1535,19 @@ int dwxgmac2_setup(struct stmmac_priv *priv) if (mac->multicast_filter_bins) mac->mcast_bits_log2 =3D ilog2(mac->multicast_filter_bins); =20 + mac->mii.addr =3D XGMAC_MDIO_ADDR; + mac->mii.data =3D XGMAC_MDIO_DATA; + mac->mii.addr_mask =3D GENMASK_U32(20, 16); + mac->mii.reg_mask =3D GENMASK_U32(15, 0); + mac->mii.clk_csr_mask =3D GENMASK_U32(21, 19); +} + +int dwxgmac2_setup(struct stmmac_priv *priv) +{ + struct mac_device_info *mac =3D priv->hw; + + dwxgmac2_common_setup(priv, "XGMAC2"); + mac->link.caps =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | MAC_10 | MAC_100 | MAC_1000FD | MAC_2500FD | MAC_5000FD | MAC_10000FD; @@ -1547,30 +1561,37 @@ int dwxgmac2_setup(struct stmmac_priv *priv) mac->link.xgmii.speed10000 =3D XGMAC_CONFIG_SS_10000; mac->link.speed_mask =3D XGMAC_CONFIG_SS_MASK; =20 - mac->mii.addr =3D XGMAC_MDIO_ADDR; - mac->mii.data =3D XGMAC_MDIO_DATA; - mac->mii.addr_mask =3D GENMASK_U32(20, 16); - mac->mii.reg_mask =3D GENMASK_U32(15, 0); - mac->mii.clk_csr_mask =3D GENMASK_U32(21, 19); mac->num_vlan =3D stmmac_get_num_vlan(priv->ioaddr); =20 return 0; } =20 -int dwxlgmac2_setup(struct stmmac_priv *priv) +int dw25gmac_setup(struct stmmac_priv *priv) { struct mac_device_info *mac =3D priv->hw; =20 - dev_info(priv->device, "\tXLGMAC\n"); + dwxgmac2_common_setup(priv, "DW25GMAC"); =20 - priv->dev->priv_flags |=3D IFF_UNICAST_FLT; - mac->pcsr =3D priv->ioaddr; - mac->multicast_filter_bins =3D priv->plat->multicast_filter_bins; - mac->unicast_filter_entries =3D priv->plat->unicast_filter_entries; - mac->mcast_bits_log2 =3D 0; + mac->link.caps =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | + MAC_1000FD | MAC_2500FD | MAC_5000FD | + MAC_10000FD | MAC_25000FD; + mac->link.duplex =3D 0; + mac->link.speed1000 =3D XGMAC_CONFIG_SS_1000_GMII; + mac->link.speed2500 =3D XGMAC_CONFIG_SS_2500_GMII; + mac->link.xgmii.speed2500 =3D XGMAC_CONFIG_SS_2500; + mac->link.xgmii.speed5000 =3D XGMAC_CONFIG_SS_5000; + mac->link.xgmii.speed10000 =3D XGMAC_CONFIG_SS_10000; + mac->link.xgmii.speed25000 =3D XGMAC_CONFIG_SS_25000; + mac->link.speed_mask =3D XGMAC_CONFIG_SS_MASK; =20 - if (mac->multicast_filter_bins) - mac->mcast_bits_log2 =3D ilog2(mac->multicast_filter_bins); + return 0; +} + +int dwxlgmac2_setup(struct stmmac_priv *priv) +{ + struct mac_device_info *mac =3D priv->hw; + + dwxgmac2_common_setup(priv, "XLGMAC"); =20 mac->link.caps =3D MAC_ASYM_PAUSE | MAC_SYM_PAUSE | MAC_1000FD | MAC_2500FD | MAC_5000FD | @@ -1587,11 +1608,5 @@ int dwxlgmac2_setup(struct stmmac_priv *priv) mac->link.xlgmii.speed100000 =3D XLGMAC_CONFIG_SS_100G; mac->link.speed_mask =3D XLGMAC_CONFIG_SS; =20 - mac->mii.addr =3D XGMAC_MDIO_ADDR; - mac->mii.data =3D XGMAC_MDIO_DATA; - mac->mii.addr_mask =3D GENMASK_U32(20, 16); - mac->mii.reg_mask =3D GENMASK_U32(15, 0); - mac->mii.clk_csr_mask =3D GENMASK_U32(21, 19); - return 0; } diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/n= et/ethernet/stmicro/stmmac/dwxgmac2_dma.c index 03437f1cf3df..99f5b5598fcf 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c @@ -7,6 +7,7 @@ #include #include "stmmac.h" #include "dwxgmac2.h" +#include "dw25gmac.h" =20 static int dwxgmac2_dma_reset(void __iomem *ioaddr) { @@ -470,6 +471,26 @@ static int dwxgmac2_get_hw_feature(void __iomem *ioadd= r, return 0; } =20 +static int dw25gmac_get_hw_feature(void __iomem *ioaddr, + struct dma_features *dma_cap) +{ + u32 hw_cap; + int ret; + + ret =3D dwxgmac2_get_hw_feature(ioaddr, dma_cap); + + /* For DW25GMAC VDMA channel count is channel count */ + hw_cap =3D readl(ioaddr + XGMAC_HW_FEATURE2); + dma_cap->number_tx_channel =3D + dw25gmac_decode_vdma_count(FIELD_GET(XXVGMAC_HWFEAT_VDMA_TXCNT, + hw_cap)); + dma_cap->number_rx_channel =3D + dw25gmac_decode_vdma_count(FIELD_GET(XXVGMAC_HWFEAT_VDMA_RXCNT, + hw_cap)); + + return ret; +} + static void dwxgmac2_rx_watchdog(struct stmmac_priv *priv, void __iomem *i= oaddr, u32 riwt, u32 queue) { @@ -611,3 +632,33 @@ const struct stmmac_dma_ops dwxgmac210_dma_ops =3D { .enable_sph =3D dwxgmac2_enable_sph, .enable_tbs =3D dwxgmac2_enable_tbs, }; + +const struct stmmac_dma_ops dw25gmac400_dma_ops =3D { + .reset =3D dwxgmac2_dma_reset, + .init =3D dw25gmac_dma_init, + .init_chan =3D dwxgmac2_dma_init_chan, + .init_rx_chan =3D dw25gmac_dma_init_rx_chan, + .init_tx_chan =3D dw25gmac_dma_init_tx_chan, + .axi =3D dwxgmac2_dma_axi, + .dump_regs =3D dwxgmac2_dma_dump_regs, + .dma_rx_mode =3D dwxgmac2_dma_rx_mode, + .dma_tx_mode =3D dwxgmac2_dma_tx_mode, + .enable_dma_irq =3D dwxgmac2_enable_dma_irq, + .disable_dma_irq =3D dwxgmac2_disable_dma_irq, + .start_tx =3D dwxgmac2_dma_start_tx, + .stop_tx =3D dwxgmac2_dma_stop_tx, + .start_rx =3D dwxgmac2_dma_start_rx, + .stop_rx =3D dwxgmac2_dma_stop_rx, + .dma_interrupt =3D dwxgmac2_dma_interrupt, + .get_hw_feature =3D dw25gmac_get_hw_feature, + .rx_watchdog =3D dwxgmac2_rx_watchdog, + .set_rx_ring_len =3D dwxgmac2_set_rx_ring_len, + .set_tx_ring_len =3D dwxgmac2_set_tx_ring_len, + .set_rx_tail_ptr =3D dwxgmac2_set_rx_tail_ptr, + .set_tx_tail_ptr =3D dwxgmac2_set_tx_tail_ptr, + .enable_tso =3D dwxgmac2_enable_tso, + .qmode =3D dwxgmac2_qmode, + .set_bfsize =3D dwxgmac2_set_bfsize, + .enable_sph =3D dwxgmac2_enable_sph, + .enable_tbs =3D dwxgmac2_enable_tbs, +}; diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ether= net/stmicro/stmmac/hwif.h index e6317b94fff7..66c24bb033e9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -686,6 +686,7 @@ extern const struct stmmac_dma_ops dwmac410_dma_ops; extern const struct stmmac_ops dwmac510_ops; extern const struct stmmac_tc_ops dwmac4_tc_ops; extern const struct stmmac_tc_ops dwmac510_tc_ops; +extern const struct stmmac_dma_ops dw25gmac400_dma_ops; =20 #define GMAC_VERSION 0x00000020 /* GMAC CORE Version */ #define GMAC4_VERSION 0x00000110 /* GMAC4+ CORE Version */ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index 5062537f79e9..2ea9072e8516 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -144,6 +144,10 @@ static const char *stmmac_dwxgmac_phyif[4] =3D { [PHY_INTF_RGMII] =3D "RGMII", }; =20 +static const char *stmmac_dw25gmac_phyif[2] =3D { + [PHY_INTF_DW25GMAC_XGMII] =3D "XGMII", +}; + static irqreturn_t stmmac_interrupt(int irq, void *dev_id); /* For MSI interrupts handling */ static irqreturn_t stmmac_mac_interrupt(int irq, void *dev_id); @@ -1100,6 +1104,32 @@ static void stmmac_mac_link_up(struct phylink_config= *config, default: return; } + } else if (interface =3D=3D PHY_INTERFACE_MODE_XGMII) { + switch (speed) { + case SPEED_25000: + ctrl |=3D priv->hw->link.xgmii.speed25000; + break; + case SPEED_10000: + ctrl |=3D priv->hw->link.xgmii.speed10000; + break; + case SPEED_5000: + ctrl |=3D priv->hw->link.xgmii.speed5000; + break; + case SPEED_2500: + ctrl |=3D priv->hw->link.xgmii.speed2500; + break; + case SPEED_1000: + ctrl |=3D priv->hw->link.speed1000; + break; + case SPEED_100: + ctrl |=3D priv->hw->link.speed100; + break; + case SPEED_10: + ctrl |=3D priv->hw->link.speed10; + break; + default: + return; + } } else if (interface =3D=3D PHY_INTERFACE_MODE_XLGMII) { switch (speed) { case SPEED_100000: @@ -7292,6 +7322,11 @@ static void stmmac_print_actphyif(struct stmmac_priv= *priv) phyif_table =3D stmmac_dwxgmac_phyif; phyif_table_size =3D ARRAY_SIZE(stmmac_dwxgmac_phyif); break; + + case DWMAC_CORE_25GMAC: + phyif_table =3D stmmac_dw25gmac_phyif; + phyif_table_size =3D ARRAY_SIZE(stmmac_dw25gmac_phyif); + break; } =20 if (priv->dma_cap.actphyif < phyif_table_size) --=20 2.34.1 From nobody Sat Apr 4 04:36:26 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp09.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9738B368972; Fri, 20 Mar 2026 21:19:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041598; cv=none; b=NACpy1iS72dklpRAdbArDrf1yIMtMVZg28bSsT4wu28DO0kEqM+K155MNBxvs9Rz1Z046jFMRwY/OwcivDKo5mVvZH8hvMZ2OXpNUcwrMmgbBsGTFcR8i+qFpbTp1Dt9q+NthUl2/gCGPPsqQVGvXZInuEBbOxND8eE0nmgxMas= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041598; c=relaxed/simple; bh=/7pvxyjAbdC+aTRnvIOLO3AixVnSpkXmZjLfqfwJpuQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bj70A60l2OE9XvdQ1kfXnzgKJ/OKVCQckNx9IQopVVF6sZkz5622J4ytUxn1VaOyMuky1Hsd8HP5NrSqh0HHty0Hd8/TepgbBo5uosel7DMhZvX/rPlofM1Rlj6Tfy3VjMVQjFvr8e5LruQS/7StSE6hpUO6oUy+Ts4dM7R1QJE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=Ay8kFaYx; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Ay8kFaYx" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 4B9AEC05AE42; Fri, 20 Mar 2026 14:19:56 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 4B9AEC05AE42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1774041596; bh=/7pvxyjAbdC+aTRnvIOLO3AixVnSpkXmZjLfqfwJpuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ay8kFaYxQhojgTU+U5PEm2v16QJugzRGK/Qu+NISR96CHfongT2asty85vI8PKC3w S3wGyaq4AR+LvMXrVvbAc33Ra0vq1MPMNFbdPWL6RLVbjyJc7ObF/MayWJ4LnxMWRZ 1xj6AlsZ1+mz29zcFtN7vcH4pzWfnhaLCpdFF/mk= Received: from lvnvdb8054.lvn.broadcom.net (lvnvdb8054.lvn.broadcom.net [10.17.214.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 22B29AE81; Fri, 20 Mar 2026 17:19:53 -0400 (EDT) From: "Jitendra Vegiraju" To: netdev@vger.kernel.org Cc: alexandre.torgue@foss.st.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, jitendra.vegiraju@broadcom.com, bcm-kernel-feedback-list@broadcom.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, rmk+kernel@armlinux.org.uk, rohan.g.thomas@altera.com, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, me@ziyao.cc, siyanteng@cqsoftware.com.cn, prabhakar.mahadev-lad.rj@bp.renesas.com, weishangjuan@eswincomputing.com, wens@kernel.org, vladimir.oltean@nxp.com, lizhi2@eswincomputing.com, boon.khai.ng@altera.com, maxime.chevallier@bootlin.com, chenchuangyu@xiaomi.com, yangtiezhu@loongson.cn, ovidiu.panait.rb@renesas.com, chenhuacai@kernel.org, florian.fainelli@broadcom.com, quic_abchauha@quicinc.com Subject: [PATCH net-next v8 3/6] Integrate dw25gmac into hwif handling Date: Fri, 20 Mar 2026 14:19:18 -0700 Message-ID: <20260320211921.1202058-4-jitendra.vegiraju@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> References: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jitendra Vegiraju Integrate dw25gmac support into stmmac hardware interface handling. Added a new entry to the stmmac_hw table in hwif.c. Signed-off-by: Jitendra Vegiraju --- drivers/net/ethernet/stmicro/stmmac/hwif.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ether= net/stmicro/stmmac/hwif.c index 511b0fd5e834..a69f558c0db0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -287,6 +287,26 @@ static const struct stmmac_hwif_entry { .mmc =3D &dwxgmac_mmc_ops, .est =3D &dwmac510_est_ops, .setup =3D dwxlgmac2_setup, + }, { + .core_type =3D DWMAC_CORE_25GMAC, + .min_id =3D DW25GMAC_CORE_3_20, + .regs =3D { + .ptp_off =3D PTP_XGMAC_OFFSET, + .mmc_off =3D MMC_XGMAC_OFFSET, + .est_off =3D EST_XGMAC_OFFSET, + }, + .desc =3D &dwxgmac210_desc_ops, + .dma =3D &dw25gmac400_dma_ops, + .mac =3D &dwxgmac210_ops, + .vlan =3D &dwxgmac210_vlan_ops, + .hwtimestamp =3D &stmmac_ptp, + .ptp =3D &stmmac_ptp_clock_ops, + .mode =3D NULL, + .tc =3D &dwmac510_tc_ops, + .mmc =3D &dwxgmac_mmc_ops, + .est =3D &dwmac510_est_ops, + .setup =3D dw25gmac_setup, + .quirks =3D NULL, }, }; =20 --=20 2.34.1 From nobody Sat Apr 4 04:36:26 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.144.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7632F3B19DA; Fri, 20 Mar 2026 21:20:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.144.207 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041602; cv=none; b=Bt9E4JOxErirWp2VSmOwIbLr9Ro7HyOeviXR9Oh2LSko943b2cPPjomM6LFCB1Yoov8fFFVCzoYAUielqgqixjjUZm2nxLs97XOzAvdax5b3odo6rK6I/FvARaB7+reK5uzL+RxCrnX05MqneX9alZtz3IlsAg02B9LHG3JdaHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041602; c=relaxed/simple; bh=4ps/U/RKDZh57Wh8SpKjgSdQa94cvN1By1UuLe/YKLM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZM9nRar8PelyJCPGpF4gUE2Dc6OLAgMy58fmHpSwi+CPccGFCIkc2P/XRbSxBQUv5f3R3ppZ/Csfb99x9pXOoJLreYErBgmI7mJKpvV8TmP7HnNLp9r0dSEaK7hKbKpDcBrLGxqwSHKAN/15LMuP7QfZJXRCxoReXj2WREi4Etc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=FXLZfISC; arc=none smtp.client-ip=192.19.144.207 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="FXLZfISC" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 31C98C0005D7; Fri, 20 Mar 2026 14:19:59 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 31C98C0005D7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1774041599; bh=4ps/U/RKDZh57Wh8SpKjgSdQa94cvN1By1UuLe/YKLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FXLZfISC8pXt/mKFj4cg6Qhl35MZTfEhG3dP3jfqKD1dLwPRUqcF4Ap7Lz46dA9+V pRRP6yXLSIsCPv+TE/vTAYrhFduf2Plp5cg5B0WtvbYG03/LU111iojm2P6aAT5roT HJccFEOQQ0xmYlfY6eSM6wpDfBHjK9/QAIePm/Go= Received: from lvnvdb8054.lvn.broadcom.net (lvnvdb8054.lvn.broadcom.net [10.17.214.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 3C37BAE80; Fri, 20 Mar 2026 17:19:56 -0400 (EDT) From: "Jitendra Vegiraju" To: netdev@vger.kernel.org Cc: alexandre.torgue@foss.st.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, jitendra.vegiraju@broadcom.com, bcm-kernel-feedback-list@broadcom.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, rmk+kernel@armlinux.org.uk, rohan.g.thomas@altera.com, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, me@ziyao.cc, siyanteng@cqsoftware.com.cn, prabhakar.mahadev-lad.rj@bp.renesas.com, weishangjuan@eswincomputing.com, wens@kernel.org, vladimir.oltean@nxp.com, lizhi2@eswincomputing.com, boon.khai.ng@altera.com, maxime.chevallier@bootlin.com, chenchuangyu@xiaomi.com, yangtiezhu@loongson.cn, ovidiu.panait.rb@renesas.com, chenhuacai@kernel.org, florian.fainelli@broadcom.com, quic_abchauha@quicinc.com Subject: [PATCH net-next v8 4/6] Add PCI driver support for BCM8958x Date: Fri, 20 Mar 2026 14:19:19 -0700 Message-ID: <20260320211921.1202058-5-jitendra.vegiraju@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> References: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jitendra Vegiraju Add PCI ethernet driver support for Broadcom BCM8958x SoC devices used in automotive applications. This SoC device has PCIe ethernet MAC attached to an integrated ethernet switch using XGMII interface. The PCIe ethernet controller is presented to the Linux host as PCI network device. The following block diagram gives an overview of the application. +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ | Host CPU/Linux | +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ || PCIe || +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ | +--------------+ | | | PCIE Endpoint| | | | Ethernet | | | | Controller | | | | DMA | | | +--------------+ | | | MAC | BCM8958X | | +--------------+ SoC | | || XGMII | | || | | +--------------+ | | | Ethernet | | | | switch | | | +--------------+ | | || || || || | +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ || || || || More external interfaces The MAC IP block on BCM8958x is based on Synopsis XGMAC 4.00a core. This driver uses common dwxgmac2 code where applicable. Driver functionality specific to this MAC is implemented in dw25gmac.c. Management of integrated ethernet switch on this SoC is not handled via the PCIe interface. This SoC device has PCIe ethernet MAC directly attached to an integrated ethernet switch using XGMII interface. Since device tree support is not available on this platform, a software node is created to enable fixed-link support using phylink driver. Signed-off-by: Jitendra Vegiraju --- .../net/ethernet/stmicro/stmmac/dwmac-brcm.c | 429 ++++++++++++++++++ 1 file changed, 429 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c b/drivers/net= /ethernet/stmicro/stmmac/dwmac-brcm.c new file mode 100644 index 000000000000..3a00452c0aa6 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c @@ -0,0 +1,429 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2024-2026 Broadcom Corporation + * + * PCI driver for ethernet interface of BCM8958X automotive switch chip. + * + * High level block diagram of the device. + * +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * | Host CPU/Linux | + * +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * || PCIe + * || + * +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * | +--------------+ | + * | | PCIE Endpoint| | + * | | Ethernet | | + * | | Controller | | + * | | DMA | | + * | +--------------+ | + * | | MAC | BCM8958X | + * | +--------------+ SoC | + * | || XGMII | + * | || | + * | +--------------+ | + * | | Ethernet | | + * | | switch | | + * | +--------------+ | + * | || || || || | + * +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + * || || || || More external interfaces + * + * This SoC device has PCIe ethernet MAC directly attached to an integrated + * ethernet switch using XGMII interface. Since devicetree support is not + * available on this platform, a software node is created to enable + * fixed-link support using phylink driver. + */ + +#include +#include +#include +#include +#include +#include "stmmac.h" +#include "stmmac_libpci.h" +#include "dwxgmac2.h" +#include "dw25gmac.h" + +#define PCI_DEVICE_ID_BROADCOM_BCM8958X 0xa00d +#define BRCM_MAX_MTU 1500 + +/* TX and RX Queue counts */ +#define BRCM_TX_Q_COUNT 4 +#define BRCM_RX_Q_COUNT 4 + +#define BRCM_XGMAC_BAR0_MASK BIT(0) + +#define BRCM_XGMAC_IOMEM_MISC_REG_OFFSET 0x0 +#define BRCM_XGMAC_IOMEM_MBOX_REG_OFFSET 0x1000 +#define BRCM_XGMAC_IOMEM_CFG_REG_OFFSET 0x3000 + +#define XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LOW 0x940 +#define XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LO_VALUE 0x00000001 +#define XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HIGH 0x944 +#define XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HI_VALUE 0x88000000 + +#define XGMAC_PCIE_MISC_MII_CTRL_OFFSET 0x4 +#define XGMAC_PCIE_MISC_MII_CTRL_PAUSE_RX BIT(0) +#define XGMAC_PCIE_MISC_MII_CTRL_PAUSE_TX BIT(1) +#define XGMAC_PCIE_MISC_MII_CTRL_LINK_UP BIT(2) +#define XGMAC_PCIE_MISC_PCIESS_CTRL_OFFSET 0x8 +#define XGMAC_PCIE_MISC_PCIESS_CTRL_EN_MSI_MSIX BIT(9) +#define XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_OFFSET 0x90 +#define XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_VALUE 0x00000001 +#define XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_OFFSET 0x94 +#define XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_VALUE 0x88000000 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_OFFSET 0x700 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_VALUE 1 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_OFFSET 0x704 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_VALUE 1 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_OFFSET 0x728 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_VALUE 1 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_OFFSET 0x740 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_VALUE 0 + +/* MSIX Vector map register starting offsets */ +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_RX0_PF0_OFFSET 0x840 +#define XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_TX0_PF0_OFFSET 0x890 +#define BRCM_MAX_DMA_CHANNEL_PAIRS 4 +#define BRCM_XGMAC_MSI_MAC_VECTOR 0 +#define BRCM_XGMAC_MSI_RX_VECTOR_START 1 +#define BRCM_XGMAC_MSI_TX_VECTOR_START 2 +#define BRCM_XGMAC_MSI_VECTOR_MAX (BRCM_XGMAC_MSI_RX_VECTOR_START + \ + BRCM_MAX_DMA_CHANNEL_PAIRS * 2) + +static const struct property_entry fixed_link_properties[] =3D { + PROPERTY_ENTRY_U32("speed", 10000), + PROPERTY_ENTRY_BOOL("full-duplex"), + PROPERTY_ENTRY_BOOL("pause"), + { } +}; + +static const struct software_node parent_swnode =3D { + .name =3D "phy-device", +}; + +static const struct software_node fixed_link_swnode =3D { + .name =3D "fixed-link", /* MUST be named "fixed-link" */ + .parent =3D &parent_swnode, + .properties =3D fixed_link_properties, +}; + +static const struct software_node *brcm_swnodes[] =3D { + &parent_swnode, + &fixed_link_swnode, + NULL +}; + +struct brcm_priv_data { + void __iomem *mbox_regs; /* MBOX Registers*/ + void __iomem *misc_regs; /* MISC Registers*/ + void __iomem *xgmac_regs; /* XGMAC Registers*/ +}; + +struct dwxgmac_brcm_pci_info { + int (*setup)(struct pci_dev *pdev, struct plat_stmmacenet_data *plat); +}; + +static void misc_iowrite(struct brcm_priv_data *brcm_priv, + u32 reg, u32 val) +{ + iowrite32(val, brcm_priv->misc_regs + reg); +} + +static void dwxgmac_brcm_common_default_data(struct plat_stmmacenet_data *= plat) +{ + int i; + + plat->force_sf_dma_mode =3D true; + plat->mac_port_sel_speed =3D SPEED_10000; + plat->clk_ptp_rate =3D 125000000; + plat->clk_ref_rate =3D 250000000; + plat->tx_coe =3D true; + plat->rx_coe =3D STMMAC_RX_COE_TYPE1; + plat->rss_en =3D 1; + plat->max_speed =3D SPEED_10000; + + /* Set default value for multicast hash bins */ + plat->multicast_filter_bins =3D HASH_TABLE_SIZE; + + /* Set default value for unicast filter entries */ + plat->unicast_filter_entries =3D 1; + + /* Set the maxmtu to device's default */ + plat->maxmtu =3D BRCM_MAX_MTU; + + /* Set default number of RX and TX queues to use */ + plat->tx_queues_to_use =3D BRCM_TX_Q_COUNT; + plat->rx_queues_to_use =3D BRCM_RX_Q_COUNT; + + plat->tx_sched_algorithm =3D MTL_TX_ALGORITHM_SP; + for (i =3D 0; i < plat->tx_queues_to_use; i++) { + plat->tx_queues_cfg[i].use_prio =3D false; + plat->tx_queues_cfg[i].prio =3D 0; + plat->tx_queues_cfg[i].mode_to_use =3D MTL_QUEUE_AVB; + } + + plat->rx_sched_algorithm =3D MTL_RX_ALGORITHM_SP; + for (i =3D 0; i < plat->rx_queues_to_use; i++) { + plat->rx_queues_cfg[i].use_prio =3D false; + plat->rx_queues_cfg[i].mode_to_use =3D MTL_QUEUE_AVB; + plat->rx_queues_cfg[i].pkt_route =3D 0x0; + plat->rx_queues_cfg[i].chan =3D i; + } +} + +static int dwxgmac_brcm_default_data(struct pci_dev *pdev, + struct plat_stmmacenet_data *plat) +{ + /* Set common default data first */ + dwxgmac_brcm_common_default_data(plat); + plat->core_type =3D DWMAC_CORE_25GMAC; + plat->bus_id =3D 0; + plat->phy_addr =3D 0; + plat->phy_interface =3D PHY_INTERFACE_MODE_XGMII; + + plat->dma_cfg->pbl =3D DEFAULT_DMA_PBL; + plat->dma_cfg->pblx8 =3D true; + plat->dma_cfg->aal =3D false; + plat->dma_cfg->eame =3D true; + + plat->axi->axi_wr_osr_lmt =3D 31; + plat->axi->axi_rd_osr_lmt =3D 31; + plat->axi->axi_fb =3D false; + plat->axi->axi_blen_regval =3D DMA_AXI_BLEN64; + return 0; +} + +static struct dwxgmac_brcm_pci_info dwxgmac_brcm_pci_info =3D { + .setup =3D dwxgmac_brcm_default_data, +}; + +static void brcm_config_misc_regs(struct pci_dev *pdev, + struct brcm_priv_data *brcm_priv) +{ + pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LOW, + XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LO_VALUE); + pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HIGH, + XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HI_VALUE); + + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_OFFSET, + XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_VALUE); + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_OFFSET, + XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_VALUE); + + /* Enable Switch Link */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MII_CTRL_OFFSET, + XGMAC_PCIE_MISC_MII_CTRL_PAUSE_RX | + XGMAC_PCIE_MISC_MII_CTRL_PAUSE_TX | + XGMAC_PCIE_MISC_MII_CTRL_LINK_UP); +} + +static int brcm_config_multi_msi(struct pci_dev *pdev, + struct plat_stmmacenet_data *plat, + struct stmmac_resources *res) +{ + int ret; + int i; + + ret =3D pci_alloc_irq_vectors(pdev, BRCM_XGMAC_MSI_VECTOR_MAX, + BRCM_XGMAC_MSI_VECTOR_MAX, + PCI_IRQ_MSI | PCI_IRQ_MSIX); + if (ret < 0) { + dev_err(&pdev->dev, "%s: multi MSI enablement failed\n", + __func__); + return ret; + } + + /* For RX MSI */ + for (i =3D 0; i < plat->rx_queues_to_use; i++) + res->rx_irq[i] =3D + pci_irq_vector(pdev, + BRCM_XGMAC_MSI_RX_VECTOR_START + i * 2); + + /* For TX MSI */ + for (i =3D 0; i < plat->tx_queues_to_use; i++) + res->tx_irq[i] =3D + pci_irq_vector(pdev, + BRCM_XGMAC_MSI_TX_VECTOR_START + i * 2); + + res->irq =3D pci_irq_vector(pdev, BRCM_XGMAC_MSI_MAC_VECTOR); + + plat->flags |=3D STMMAC_FLAG_MULTI_MSI_EN; + plat->flags |=3D STMMAC_FLAG_TSO_EN; + plat->flags |=3D STMMAC_FLAG_SPH_DISABLE; + return 0; +} + +static int brcm_pci_resume(struct device *dev, void *bsp_priv) +{ + struct pci_dev *pdev =3D to_pci_dev(dev); + + brcm_config_misc_regs(pdev, bsp_priv); + + return stmmac_pci_plat_resume(dev, bsp_priv); +} + +static int dwxgmac_brcm_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *id) +{ + struct dwxgmac_brcm_pci_info *info =3D + (struct dwxgmac_brcm_pci_info *)id->driver_data; + struct plat_stmmacenet_data *plat; + struct brcm_priv_data *brcm_priv; + struct stmmac_resources res; + struct device *dev; + int rx_offset; + int tx_offset; + int vector; + int ret; + + dev =3D &pdev->dev; + + brcm_priv =3D devm_kzalloc(&pdev->dev, sizeof(*brcm_priv), GFP_KERNEL); + if (!brcm_priv) + return -ENOMEM; + + plat =3D stmmac_plat_dat_alloc(dev); + if (!plat) + return -ENOMEM; + + plat->axi =3D devm_kzalloc(&pdev->dev, sizeof(*plat->axi), GFP_KERNEL); + if (!plat->axi) + return -ENOMEM; + + /* This device is directly attached to the switch chip internal to the + * SoC using XGMII interface. Since no MDIO is present, register + * fixed-link software_node to create phylink. + */ + software_node_register_node_group(brcm_swnodes); + device_set_node(dev, software_node_fwnode(&parent_swnode)); + + /* Disable D3COLD as our device does not support it */ + pci_d3cold_disable(pdev); + + /* Enable PCI device */ + ret =3D pcim_enable_device(pdev); + if (ret) { + dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n", + __func__); + return ret; + } + + pci_set_master(pdev); + + memset(&res, 0, sizeof(res)); + res.addr =3D pcim_iomap_region(pdev, 0, pci_name(pdev)); + if (IS_ERR(res.addr)) + return dev_err_probe(&pdev->dev, PTR_ERR(res.addr), + "failed to map IO region\n"); + /* MISC Regs */ + brcm_priv->misc_regs =3D res.addr + BRCM_XGMAC_IOMEM_MISC_REG_OFFSET; + /* MBOX Regs */ + brcm_priv->mbox_regs =3D res.addr + BRCM_XGMAC_IOMEM_MBOX_REG_OFFSET; + /* XGMAC config Regs */ + res.addr +=3D BRCM_XGMAC_IOMEM_CFG_REG_OFFSET; + brcm_priv->xgmac_regs =3D res.addr; + + plat->suspend =3D stmmac_pci_plat_suspend; + plat->resume =3D brcm_pci_resume; + plat->bsp_priv =3D brcm_priv; + + ret =3D info->setup(pdev, plat); + if (ret) + return ret; + + pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LOW, + XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LO_VALUE); + pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HIGH, + XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HI_VALUE); + + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_OFFSET, + XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_VALUE); + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_OFFSET, + XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_VALUE); + + /* SBD Interrupt */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_VALUE); + /* EP_DOORBELL Interrupt */ + misc_iowrite(brcm_priv, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_VALUE); + /* EP_H0 Interrupt */ + misc_iowrite(brcm_priv, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_VALUE); + /* EP_H1 Interrupt */ + misc_iowrite(brcm_priv, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_VALUE); + + rx_offset =3D XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_RX0_PF0_OFFSET; + tx_offset =3D XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_TX0_PF0_OFFSET; + vector =3D BRCM_XGMAC_MSI_RX_VECTOR_START; + for (int i =3D 0; i < BRCM_MAX_DMA_CHANNEL_PAIRS; i++) { + /* RX Interrupt */ + misc_iowrite(brcm_priv, rx_offset, vector++); + /* TX Interrupt */ + misc_iowrite(brcm_priv, tx_offset, vector++); + rx_offset +=3D 4; + tx_offset +=3D 4; + } + + /* Enable Switch Link */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MII_CTRL_OFFSET, + XGMAC_PCIE_MISC_MII_CTRL_PAUSE_RX | + XGMAC_PCIE_MISC_MII_CTRL_PAUSE_TX | + XGMAC_PCIE_MISC_MII_CTRL_LINK_UP); + /* Enable MSI-X */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_PCIESS_CTRL_OFFSET, + XGMAC_PCIE_MISC_PCIESS_CTRL_EN_MSI_MSIX); + + ret =3D brcm_config_multi_msi(pdev, plat, &res); + if (ret) { + dev_err(&pdev->dev, + "%s: ERROR: failed to enable IRQ\n", __func__); + goto err_disable_msi; + } + + ret =3D stmmac_dvr_probe(&pdev->dev, plat, &res); + if (ret) + goto err_disable_msi; + + return ret; + +err_disable_msi: + pci_free_irq_vectors(pdev); + + return ret; +} + +static void dwxgmac_brcm_pci_remove(struct pci_dev *pdev) +{ + stmmac_dvr_remove(&pdev->dev); + pci_free_irq_vectors(pdev); + device_set_node(&pdev->dev, NULL); + software_node_unregister_node_group(brcm_swnodes); +} + +static const struct pci_device_id dwxgmac_brcm_id_table[] =3D { + { PCI_DEVICE_DATA(BROADCOM, BCM8958X, &dwxgmac_brcm_pci_info) }, + {} +}; + +MODULE_DEVICE_TABLE(pci, dwxgmac_brcm_id_table); + +static struct pci_driver dwxgmac_brcm_pci_driver =3D { + .name =3D "brcm-bcm8958x", + .id_table =3D dwxgmac_brcm_id_table, + .probe =3D dwxgmac_brcm_pci_probe, + .remove =3D dwxgmac_brcm_pci_remove, + .driver =3D { + .pm =3D &stmmac_simple_pm_ops, + }, +}; + +module_pci_driver(dwxgmac_brcm_pci_driver); + +MODULE_DESCRIPTION("Broadcom 10G Automotive Ethernet PCIe driver"); +MODULE_LICENSE("GPL"); --=20 2.34.1 From nobody Sat Apr 4 04:36:26 2026 Received: from relay.smtp-ext.broadcom.com (lpdvsmtp09.broadcom.com [192.19.166.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59BB73EF0A1; Fri, 20 Mar 2026 21:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041604; cv=none; b=LTd4Q/fbduLVlhb7sKOFeUsa08eTSruVLHW67fpgj64mBUoOvQun1FXOEjyAT5UR/QI5okaNOMuj9ooHTP0ph0sc3kkFqOPZCxLi9sli+CJBURKE2MxI2Y8NoMOBOFPJjc+Vjc3SuG4kHLMInoqt0aSNwBSE5G5FS1cIKZkQWdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041604; c=relaxed/simple; bh=aZJWZChcHQriYj94KKlegTaH8Blqvbr+O8JNgv3EGt4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OxvZUnvlGQKjk+G/tOdlWLXDwOs3jjtVaFW7nlRoo5xe05pJZ8QI2NYeCACVfvUqa5fmekaZsVwZSzRy+bu6RhmZe+DYcc0ao9xfJiouOHCaE+ED7td4xTWfxapy5ZEZJnMAQf+/b3JhHlEljpB20wiW0epMJflo62WoumrmvUo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=CgctF/jZ; arc=none smtp.client-ip=192.19.166.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="CgctF/jZ" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 922ABC05AE44; Fri, 20 Mar 2026 14:20:02 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 922ABC05AE44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1774041602; bh=aZJWZChcHQriYj94KKlegTaH8Blqvbr+O8JNgv3EGt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CgctF/jZkVlUSumC82D5Onn44q+x64d8oSUKFsALOlQsXr74TWf7+tcls0fXZPS/5 mnGT3IP9a4H/+9wZUaLwBis5XHF51ZwLInidkUsAeIjmy0n6sS9PML3oX1RWypGvx6 30wIxu4JzTYNFT7354Zj1Atq1p2ieBsKKoOSPXso= Received: from lvnvdb8054.lvn.broadcom.net (lvnvdb8054.lvn.broadcom.net [10.17.214.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 5585FAE81; Fri, 20 Mar 2026 17:19:59 -0400 (EDT) From: "Jitendra Vegiraju" To: netdev@vger.kernel.org Cc: alexandre.torgue@foss.st.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, jitendra.vegiraju@broadcom.com, bcm-kernel-feedback-list@broadcom.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, rmk+kernel@armlinux.org.uk, rohan.g.thomas@altera.com, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, me@ziyao.cc, siyanteng@cqsoftware.com.cn, prabhakar.mahadev-lad.rj@bp.renesas.com, weishangjuan@eswincomputing.com, wens@kernel.org, vladimir.oltean@nxp.com, lizhi2@eswincomputing.com, boon.khai.ng@altera.com, maxime.chevallier@bootlin.com, chenchuangyu@xiaomi.com, yangtiezhu@loongson.cn, ovidiu.panait.rb@renesas.com, chenhuacai@kernel.org, florian.fainelli@broadcom.com, quic_abchauha@quicinc.com, Russell King Subject: [PATCH net-next v8 5/6] Fix error handling in probe function. Date: Fri, 20 Mar 2026 14:19:20 -0700 Message-ID: <20260320211921.1202058-6-jitendra.vegiraju@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> References: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jitendra Vegiraju Software node created in probe function is not being cleaned up if the probe function returns an error. The stmmac core provides mechanism to handle this error condition with plat->init, plat->exit helper functions. Move glue driver's initialization code to plat->init function. If the probe function returns an error, plat->exit function is called. Handle any glue driver level cleanup in the plat->exit handler. Use devm_add_action_or_reset() to register a callback to free irq vectors automatically, simplifying error handling in probe(). Suggested-by: Russell King (Oracle) Signed-off-by: Jitendra Vegiraju --- .../net/ethernet/stmicro/stmmac/dwmac-brcm.c | 164 ++++++++++-------- 1 file changed, 90 insertions(+), 74 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c b/drivers/net= /ethernet/stmicro/stmmac/dwmac-brcm.c index 3a00452c0aa6..9103e9cf38f1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c @@ -218,6 +218,13 @@ static void brcm_config_misc_regs(struct pci_dev *pdev, XGMAC_PCIE_MISC_MII_CTRL_LINK_UP); } =20 +static void brcm_free_irq_vectors(void *data) +{ + struct pci_dev *pdev =3D data; + + pci_free_irq_vectors(pdev); +} + static int brcm_config_multi_msi(struct pci_dev *pdev, struct plat_stmmacenet_data *plat, struct stmmac_resources *res) @@ -251,9 +258,87 @@ static int brcm_config_multi_msi(struct pci_dev *pdev, plat->flags |=3D STMMAC_FLAG_MULTI_MSI_EN; plat->flags |=3D STMMAC_FLAG_TSO_EN; plat->flags |=3D STMMAC_FLAG_SPH_DISABLE; + + return devm_add_action_or_reset(&pdev->dev, + brcm_free_irq_vectors, pdev); +} + +static int brcm_drv_init(struct device *dev, void *bsp_priv) +{ + struct brcm_priv_data *brcm_priv =3D (struct brcm_priv_data *)bsp_priv; + struct pci_dev *pdev =3D to_pci_dev(dev); + int rx_offset; + int tx_offset; + int vector; + int ret; + + /* This device is directly attached to the switch chip internal to the + * SoC using XGMII interface. Since no MDIO is present, register + * fixed-link software_node to create phylink. + */ + ret =3D software_node_register_node_group(brcm_swnodes); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "failed to register software_node\n"); + device_set_node(dev, software_node_fwnode(&parent_swnode)); + + pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LOW, + XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LO_VALUE); + pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HIGH, + XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HI_VALUE); + + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_OFFSET, + XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_VALUE); + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_OFFSET, + XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_VALUE); + + /* SBD Interrupt */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_VALUE); + /* EP_DOORBELL Interrupt */ + misc_iowrite(brcm_priv, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_VALUE); + /* EP_H0 Interrupt */ + misc_iowrite(brcm_priv, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_VALUE); + /* EP_H1 Interrupt */ + misc_iowrite(brcm_priv, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_OFFSET, + XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_VALUE); + + rx_offset =3D XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_RX0_PF0_OFFSET; + tx_offset =3D XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_TX0_PF0_OFFSET; + vector =3D BRCM_XGMAC_MSI_RX_VECTOR_START; + for (int i =3D 0; i < BRCM_MAX_DMA_CHANNEL_PAIRS; i++) { + /* RX Interrupt */ + misc_iowrite(brcm_priv, rx_offset, vector++); + /* TX Interrupt */ + misc_iowrite(brcm_priv, tx_offset, vector++); + rx_offset +=3D 4; + tx_offset +=3D 4; + } + + /* Enable Switch Link */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MII_CTRL_OFFSET, + XGMAC_PCIE_MISC_MII_CTRL_PAUSE_RX | + XGMAC_PCIE_MISC_MII_CTRL_PAUSE_TX | + XGMAC_PCIE_MISC_MII_CTRL_LINK_UP); + /* Enable MSI-X */ + misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_PCIESS_CTRL_OFFSET, + XGMAC_PCIE_MISC_PCIESS_CTRL_EN_MSI_MSIX); return 0; } =20 +static void brcm_drv_exit_cleanup(struct device *dev, void *bsp_priv) +{ + struct pci_dev *pdev =3D to_pci_dev(dev); + + device_set_node(&pdev->dev, NULL); + software_node_unregister_node_group(brcm_swnodes); +} + static int brcm_pci_resume(struct device *dev, void *bsp_priv) { struct pci_dev *pdev =3D to_pci_dev(dev); @@ -272,9 +357,6 @@ static int dwxgmac_brcm_pci_probe(struct pci_dev *pdev, struct brcm_priv_data *brcm_priv; struct stmmac_resources res; struct device *dev; - int rx_offset; - int tx_offset; - int vector; int ret; =20 dev =3D &pdev->dev; @@ -291,13 +373,6 @@ static int dwxgmac_brcm_pci_probe(struct pci_dev *pdev, if (!plat->axi) return -ENOMEM; =20 - /* This device is directly attached to the switch chip internal to the - * SoC using XGMII interface. Since no MDIO is present, register - * fixed-link software_node to create phylink. - */ - software_node_register_node_group(brcm_swnodes); - device_set_node(dev, software_node_fwnode(&parent_swnode)); - /* Disable D3COLD as our device does not support it */ pci_d3cold_disable(pdev); =20 @@ -324,6 +399,8 @@ static int dwxgmac_brcm_pci_probe(struct pci_dev *pdev, res.addr +=3D BRCM_XGMAC_IOMEM_CFG_REG_OFFSET; brcm_priv->xgmac_regs =3D res.addr; =20 + plat->init =3D brcm_drv_init; + plat->exit =3D brcm_drv_exit_cleanup; plat->suspend =3D stmmac_pci_plat_suspend; plat->resume =3D brcm_pci_resume; plat->bsp_priv =3D brcm_priv; @@ -332,78 +409,17 @@ static int dwxgmac_brcm_pci_probe(struct pci_dev *pde= v, if (ret) return ret; =20 - pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LOW, - XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_LO_VALUE); - pci_write_config_dword(pdev, XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HIGH, - XGMAC_PCIE_CFG_MSIX_ADDR_MATCH_HI_VALUE); - - misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_OFFSET, - XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_LO_VALUE); - misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_OFFSET, - XGMAC_PCIE_MISC_MSIX_ADDR_MATCH_HI_VALUE); - - /* SBD Interrupt */ - misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_OFFSET, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_SBD_ALL_VALUE); - /* EP_DOORBELL Interrupt */ - misc_iowrite(brcm_priv, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_OFFSET, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST_DBELL_VALUE); - /* EP_H0 Interrupt */ - misc_iowrite(brcm_priv, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_OFFSET, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST0_VALUE); - /* EP_H1 Interrupt */ - misc_iowrite(brcm_priv, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_OFFSET, - XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_EP2HOST1_VALUE); - - rx_offset =3D XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_RX0_PF0_OFFSET; - tx_offset =3D XGMAC_PCIE_MISC_MSIX_VECTOR_MAP_TX0_PF0_OFFSET; - vector =3D BRCM_XGMAC_MSI_RX_VECTOR_START; - for (int i =3D 0; i < BRCM_MAX_DMA_CHANNEL_PAIRS; i++) { - /* RX Interrupt */ - misc_iowrite(brcm_priv, rx_offset, vector++); - /* TX Interrupt */ - misc_iowrite(brcm_priv, tx_offset, vector++); - rx_offset +=3D 4; - tx_offset +=3D 4; - } - - /* Enable Switch Link */ - misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_MII_CTRL_OFFSET, - XGMAC_PCIE_MISC_MII_CTRL_PAUSE_RX | - XGMAC_PCIE_MISC_MII_CTRL_PAUSE_TX | - XGMAC_PCIE_MISC_MII_CTRL_LINK_UP); - /* Enable MSI-X */ - misc_iowrite(brcm_priv, XGMAC_PCIE_MISC_PCIESS_CTRL_OFFSET, - XGMAC_PCIE_MISC_PCIESS_CTRL_EN_MSI_MSIX); - ret =3D brcm_config_multi_msi(pdev, plat, &res); - if (ret) { - dev_err(&pdev->dev, - "%s: ERROR: failed to enable IRQ\n", __func__); - goto err_disable_msi; - } - - ret =3D stmmac_dvr_probe(&pdev->dev, plat, &res); if (ret) - goto err_disable_msi; - - return ret; - -err_disable_msi: - pci_free_irq_vectors(pdev); + return dev_err_probe(&pdev->dev, ret, + "failed to configure IRQ\n"); =20 - return ret; + return stmmac_dvr_probe(&pdev->dev, plat, &res); } =20 static void dwxgmac_brcm_pci_remove(struct pci_dev *pdev) { stmmac_dvr_remove(&pdev->dev); - pci_free_irq_vectors(pdev); - device_set_node(&pdev->dev, NULL); - software_node_unregister_node_group(brcm_swnodes); } =20 static const struct pci_device_id dwxgmac_brcm_id_table[] =3D { --=20 2.34.1 From nobody Sat Apr 4 04:36:26 2026 Received: from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com [192.19.166.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 206CB36A01E; Fri, 20 Mar 2026 21:20:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.19.166.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041608; cv=none; b=fsAmhmB+EDWI8jKZW85SdNAViXLZj+hKzouyjIgHVXM0UTdi3pd7tOpDpAm7zyC7PUtNwW8Y0AIbjyKNndIVCtmV1qf2wdyZdbjwe6+Etma8bY0w8r3TEeW+R5mydvdjQlkslxobRHmznABOlGsaUtawlkJnNdW2bxlQCQudx6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774041608; c=relaxed/simple; bh=zN4dslV6Zxx5Z3smcDyjIRq0uqjSqffHvQQbZlwmYuY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N077q6+I1xsuGm/r63Gtvbcr4S9DPss3WTPbuvslZsynG2q9Ro3o4l1VNyAzLlHX2IOBd8dGWhLJKJVdPOAj/zxOBLryVs4wICJKX7aR0jtLgo7OSIIbuvcSFjvtCK1dItCxciQN+ye70DkZFNX764imk3P3AMQFTGTyFIdchU8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=upHD9kEq; arc=none smtp.client-ip=192.19.166.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="upHD9kEq" Received: from mail-acc-it-01.broadcom.com (mail-acc-it-01.acc.broadcom.net [10.35.36.83]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id B1F1DC0017F3; Fri, 20 Mar 2026 14:20:05 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com B1F1DC0017F3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1774041605; bh=zN4dslV6Zxx5Z3smcDyjIRq0uqjSqffHvQQbZlwmYuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=upHD9kEqFdaugDS2A9zgdf5u8GPsL2vZGU7PTa+kuYgkasB43jPL6uRUUbOJ7HGN4 cH1t4wrkR0VviW/8Z+zV+F3zAv5jyCJsVz0RWI74nRAcHIeYtEjRO3OGHCsZv47NBZ rwKTZg3kQfNBs6UteckaKJvYb8JRh1MYfEc2ziDs= Received: from lvnvdb8054.lvn.broadcom.net (lvnvdb8054.lvn.broadcom.net [10.17.214.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail-acc-it-01.broadcom.com (Postfix) with ESMTPSA id 81537AE80; Fri, 20 Mar 2026 17:20:02 -0400 (EDT) From: "Jitendra Vegiraju" To: netdev@vger.kernel.org Cc: alexandre.torgue@foss.st.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, jitendra.vegiraju@broadcom.com, bcm-kernel-feedback-list@broadcom.com, richardcochran@gmail.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, rmk+kernel@armlinux.org.uk, rohan.g.thomas@altera.com, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org, andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me, me@ziyao.cc, siyanteng@cqsoftware.com.cn, prabhakar.mahadev-lad.rj@bp.renesas.com, weishangjuan@eswincomputing.com, wens@kernel.org, vladimir.oltean@nxp.com, lizhi2@eswincomputing.com, boon.khai.ng@altera.com, maxime.chevallier@bootlin.com, chenchuangyu@xiaomi.com, yangtiezhu@loongson.cn, ovidiu.panait.rb@renesas.com, chenhuacai@kernel.org, florian.fainelli@broadcom.com, quic_abchauha@quicinc.com Subject: [PATCH net-next v8 6/6] Add BCM8958x driver to build system Date: Fri, 20 Mar 2026 14:19:21 -0700 Message-ID: <20260320211921.1202058-7-jitendra.vegiraju@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> References: <20260320211921.1202058-1-jitendra.vegiraju@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jitendra Vegiraju Add PCI driver for BCM8958x to the linux build system and update MAINTAINERS file. Signed-off-by: Jitendra Vegiraju --- MAINTAINERS | 8 ++++++++ drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 +++++++++++ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + 3 files changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index a09bf30a057d..9ca631fe78f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5120,6 +5120,14 @@ N: brcmstb N: bcm7038 N: bcm7120 =20 +BROADCOM BCM8958X ETHERNET DRIVER +M: Jitendra Vegiraju +R: Broadcom internal kernel review list +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/stmicro/stmmac/dw25gmac.* +F: drivers/net/ethernet/stmicro/stmmac/dwmac-brcm.c + BROADCOM BCMBCA ARM ARCHITECTURE M: William Zhang M: Anand Gore diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethe= rnet/stmicro/stmmac/Kconfig index d3a6ab7383fc..94ab9f13d542 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -386,6 +386,17 @@ config DWMAC_LOONGSON This selects the LOONGSON PCI bus support for the stmmac driver, Support for ethernet controller on Loongson-2K1000 SoC and LS7A1000 bri= dge. =20 +config DWMAC_BRCM + tristate "Broadcom XGMAC support" + depends on STMMAC_ETH && PCI + depends on COMMON_CLK + select STMMAC_LIBPCI + help + Support for ethernet controllers on Broadcom BCM8958x SoCs. + This selects Broadcom XGMAC specific PCI bus support for the + stmmac driver. This driver provides the glue layer on top of the + stmmac driver required for the Broadcom BCM8958x SoC devices. + config DWMAC_MOTORCOMM tristate "Motorcomm PCI DWMAC support" depends on PCI diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/eth= ernet/stmicro/stmmac/Makefile index a99bb0dfe5ab..a50a1bb04b0c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -50,4 +50,5 @@ obj-$(CONFIG_STMMAC_PCI) +=3D stmmac-pci.o obj-$(CONFIG_DWMAC_INTEL) +=3D dwmac-intel.o obj-$(CONFIG_DWMAC_LOONGSON) +=3D dwmac-loongson.o obj-$(CONFIG_DWMAC_MOTORCOMM) +=3D dwmac-motorcomm.o +obj-$(CONFIG_DWMAC_BRCM) +=3D dwmac-brcm.o stmmac-pci-objs:=3D stmmac_pci.o --=20 2.34.1