Commit 76ccf528 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'stmmac-ETF-support' 



Jose Abreu says:

====================
net: stmmac: ETF support

This series adds the support for ETF scheduler in stmmac.

1) Starts adding the support by implementing Enhanced Descriptors in stmmac
main core. This is needed for ETF feature in XGMAC and QoS cores.

2) Integrates the ETF logic into stmmac TC core.

3) and 4) adds the HW specific support for ETF in XGMAC and QoS cores. The
IP feature is called TBS (Time Based Scheduling).

5) Enables ETF in GMAC5 IPK PCI entry for all Queues except Queue 0.

6) Adds the new TBS feature and even more information into the debugFS
HW features file.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ab9837b5 28c1cf73

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

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ struct dma_features { 
	unsigned int estdep;

	unsigned int estsel;

	unsigned int fpesel;

	unsigned int tbssel;

};



/* RX Buffer size must be multiple of 4/8/16 bytes */

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

+9 −0
Original line number Diff line number Diff line
@@ -171,6 +171,15 @@ struct dma_extended_desc { 
	__le32 des7;	/* Tx/Rx Timestamp High */

};



/* Enhanced descriptor for TBS */

struct dma_edesc {

	__le32 des4;

	__le32 des5;

	__le32 des6;

	__le32 des7;

	struct dma_desc basic;

};



/* Transmit checksum insertion control */

#define	TX_CIC_FULL	3	/* Include IP header and pseudoheader */

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

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ enum power_event { 


/* MAC HW features3 bitmap */

#define GMAC_HW_FEAT_ASP		GENMASK(29, 28)

#define GMAC_HW_FEAT_TBSSEL		BIT(27)

#define GMAC_HW_FEAT_FPESEL		BIT(26)

#define GMAC_HW_FEAT_ESTWID		GENMASK(21, 20)

#define GMAC_HW_FEAT_ESTDEP		GENMASK(19, 17)

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

+10 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/stmmac.h>

#include "common.h"

#include "dwmac4.h"

#include "dwmac4_descs.h"



static int dwmac4_wrback_get_tx_status(void *data, struct stmmac_extra_stats *x,
@@ -505,6 +506,14 @@ static void dwmac4_set_sec_addr(struct dma_desc *p, dma_addr_t addr) 
	p->des3 = cpu_to_le32(upper_32_bits(addr) | RDES3_BUFFER2_VALID_ADDR);

}



static void dwmac4_set_tbs(struct dma_edesc *p, u32 sec, u32 nsec)

{

	p->des4 = cpu_to_le32((sec & TDES4_LT) | TDES4_LTV);

	p->des5 = cpu_to_le32(nsec & TDES5_LT);

	p->des6 = 0;

	p->des7 = 0;

}



const struct stmmac_desc_ops dwmac4_desc_ops = {

	.tx_status = dwmac4_wrback_get_tx_status,

	.rx_status = dwmac4_wrback_get_rx_status,
@@ -534,6 +543,7 @@ const struct stmmac_desc_ops dwmac4_desc_ops = { 
	.set_vlan = dwmac4_set_vlan,

	.get_rx_header_len = dwmac4_get_rx_header_len,

	.set_sec_addr = dwmac4_set_sec_addr,

	.set_tbs = dwmac4_set_tbs,

};



const struct stmmac_mode_ops dwmac4_ring_mode_ops = {

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

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ 
#define TDES3_CONTEXT_TYPE		BIT(30)

#define	TDES3_CONTEXT_TYPE_SHIFT	30



/* TDES4 */

#define TDES4_LTV			BIT(31)

#define TDES4_LT			GENMASK(7, 0)



/* TDES5 */

#define TDES5_LT			GENMASK(31, 8)



/* TDS3 use for both format (read and write back) */

#define TDES3_OWN			BIT(31)

#define TDES3_OWN_SHIFT			31

CRA Git | Maintained and supported by SUSTech CRA and CCSE