Commit 8792e82d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-10GbE-using-XGMAC' 



Jose Abreu says:

====================
net: stmmac: 10GbE using XGMAC

Support for 10Gb Link using XGMAC core plus some performance tweaks.

Tested in a PCI based setup.

iperf3 TCP results:
	TSO ON, MTU=1500, TX Queues = 1, RX Queues = 1, Flow Control ON
	Pinned CPU (-A), Zero-Copy (-Z)

[ ID] Interval           Transfer     Bitrate         Retr
[  5]   0.00-600.00 sec   643 GBytes  9.21 Gbits/sec    1             sender
[  5]   0.00-600.00 sec   643 GBytes  9.21 Gbits/sec                  receiver
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42e87024 41a4a5a2

drivers/net/ethernet/stmicro/stmmac/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config STMMAC_ETH

	tristate "STMicroelectronics 10/100/1000/EQOS Ethernet driver"

	tristate "STMicroelectronics 10/100/1000/EQOS/2500/5000/10000 Ethernet driver"

	depends on HAS_IOMEM && HAS_DMA

	select MII

	select PHYLINK

drivers/net/ethernet/stmicro/stmmac/common.h

+7 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ struct stmmac_safety_stats { 


/* Max/Min RI Watchdog Timer count value */

#define MAX_DMA_RIWT		0xff

#define MIN_DMA_RIWT		0x20

#define MIN_DMA_RIWT		0x10

/* Tx coalesce parameters */

#define STMMAC_COAL_TX_TIMER	1000

#define STMMAC_MAX_COAL_TX_TICK	100000
@@ -351,6 +351,7 @@ struct dma_features { 
	unsigned int frpsel;

	unsigned int frpbs;

	unsigned int frpes;

	unsigned int addr64;

};



/* GMAC TX FIFO is 8K, Rx FIFO is 16K */
@@ -392,8 +393,12 @@ struct mac_link { 
	u32 speed100;

	u32 speed1000;

	u32 speed2500;

	u32 speed10000;

	u32 duplex;

	struct {

		u32 speed2500;

		u32 speed5000;

		u32 speed10000;

	} xgmii;

};



struct mii_regs {

drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h

+13 −3
Original line number Diff line number Diff line
@@ -15,10 +15,14 @@ 
/* MAC Registers */

#define XGMAC_TX_CONFIG			0x00000000

#define XGMAC_CONFIG_SS_OFF		29

#define XGMAC_CONFIG_SS_MASK		GENMASK(30, 29)

#define XGMAC_CONFIG_SS_MASK		GENMASK(31, 29)

#define XGMAC_CONFIG_SS_10000		(0x0 << XGMAC_CONFIG_SS_OFF)

#define XGMAC_CONFIG_SS_2500		(0x2 << XGMAC_CONFIG_SS_OFF)

#define XGMAC_CONFIG_SS_1000		(0x3 << 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)

#define XGMAC_CONFIG_SS_5000		(0x5 << XGMAC_CONFIG_SS_OFF)

#define XGMAC_CONFIG_SS_2500		(0x6 << XGMAC_CONFIG_SS_OFF)

#define XGMAC_CONFIG_SS_10_MII		(0x7 << XGMAC_CONFIG_SS_OFF)

#define XGMAC_CONFIG_SARC		GENMASK(22, 20)

#define XGMAC_CONFIG_SARC_SHIFT		20

#define XGMAC_CONFIG_JD			BIT(16)
@@ -83,6 +87,7 @@ 
#define XGMAC_HWFEAT_GMIISEL		BIT(1)

#define XGMAC_HW_FEATURE1		0x00000120

#define XGMAC_HWFEAT_TSOEN		BIT(18)

#define XGMAC_HWFEAT_ADDR64		GENMASK(15, 14)

#define XGMAC_HWFEAT_TXFIFOSIZE		GENMASK(10, 6)

#define XGMAC_HWFEAT_RXFIFOSIZE		GENMASK(4, 0)

#define XGMAC_HW_FEATURE2		0x00000124
@@ -168,6 +173,7 @@ 
#define XGMAC_EN_LPI			BIT(15)

#define XGMAC_LPI_XIT_PKT		BIT(14)

#define XGMAC_AAL			BIT(12)

#define XGMAC_EAME			BIT(11)

#define XGMAC_BLEN			GENMASK(7, 1)

#define XGMAC_BLEN256			BIT(7)

#define XGMAC_BLEN128			BIT(6)
@@ -177,6 +183,10 @@ 
#define XGMAC_BLEN8			BIT(2)

#define XGMAC_BLEN4			BIT(1)

#define XGMAC_UNDEF			BIT(0)

#define XGMAC_TX_EDMA_CTRL		0x00003040

#define XGMAC_TDPS			GENMASK(29, 0)

#define XGMAC_RX_EDMA_CTRL		0x00003044

#define XGMAC_RDPS			GENMASK(29, 0)

#define XGMAC_DMA_CH_CONTROL(x)		(0x00003100 + (0x80 * (x)))

#define XGMAC_PBLx8			BIT(16)

#define XGMAC_DMA_CH_TX_CONTROL(x)	(0x00003104 + (0x80 * (x)))

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c

+8 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static void dwxgmac2_core_init(struct mac_device_info *hw, 


		switch (hw->ps) {

		case SPEED_10000:

			tx |= hw->link.speed10000;

			tx |= hw->link.xgmii.speed10000;

			break;

		case SPEED_2500:

			tx |= hw->link.speed2500;
@@ -381,11 +381,13 @@ int dwxgmac2_setup(struct stmmac_priv *priv) 
		mac->mcast_bits_log2 = ilog2(mac->multicast_filter_bins);



	mac->link.duplex = 0;

	mac->link.speed10 = 0;

	mac->link.speed100 = 0;

	mac->link.speed1000 = XGMAC_CONFIG_SS_1000;

	mac->link.speed2500 = XGMAC_CONFIG_SS_2500;

	mac->link.speed10000 = XGMAC_CONFIG_SS_10000;

	mac->link.speed10 = XGMAC_CONFIG_SS_10_MII;

	mac->link.speed100 = XGMAC_CONFIG_SS_100_MII;

	mac->link.speed1000 = XGMAC_CONFIG_SS_1000_GMII;

	mac->link.speed2500 = XGMAC_CONFIG_SS_2500_GMII;

	mac->link.xgmii.speed2500 = XGMAC_CONFIG_SS_2500;

	mac->link.xgmii.speed5000 = XGMAC_CONFIG_SS_5000;

	mac->link.xgmii.speed10000 = XGMAC_CONFIG_SS_10000;

	mac->link.speed_mask = XGMAC_CONFIG_SS_MASK;



	mac->mii.addr = XGMAC_MDIO_ADDR;

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c

+2 −2
Original line number Diff line number Diff line
@@ -242,8 +242,8 @@ static void dwxgmac2_get_addr(struct dma_desc *p, unsigned int *addr) 


static void dwxgmac2_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des0 = cpu_to_le32(addr);

	p->des1 = 0;

	p->des0 = cpu_to_le32(lower_32_bits(addr));

	p->des1 = cpu_to_le32(upper_32_bits(addr));

}



static void dwxgmac2_clear(struct dma_desc *p)

CRA Git | Maintained and supported by SUSTech CRA and CCSE