Commit f8affba7 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-stmmac-dwmac-imx-time-based-scheduling-support' 

Esben Haabendal says:

====================
net: stmmac: dwmac-imx: Time Based Scheduling support

This small patch series allows using TBS support of the i.MX Ethernet QOS
controller for etf qdisc offload.
It achieves this in a similar manner that it is done in dwmac-intel.c,
dwmac-mediatek.c and stmmac_pci.c.

Changes since v1:

- Simplified for loop by starting at index 1.
- Fixed problem with indentation.
====================

Link: https://lore.kernel.org/r/cover.1706256158.git.esben@geanix.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 60365049 3b12ec8f

drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c

+4 −0
Original line number Diff line number Diff line
@@ -353,6 +353,10 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
	if (data->flags & STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY)

		plat_dat->flags |= STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY;



	/* Default TX Q0 to use TSO and rest TXQ for TBS */

	for (int i = 1; i < plat_dat->tx_queues_to_use; i++)

		plat_dat->tx_queues_cfg[i].tbs_en = 1;



	plat_dat->host_dma_width = dwmac->ops->addr_width;

	plat_dat->init = imx_dwmac_init;

	plat_dat->exit = imx_dwmac_exit;

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

+3 −0
Original line number Diff line number Diff line
@@ -3932,6 +3932,9 @@ static int __stmmac_open(struct net_device *dev, 
	priv->rx_copybreak = STMMAC_RX_COPYBREAK;



	buf_sz = dma_conf->dma_buf_sz;

	for (int i = 0; i < MTL_MAX_TX_QUEUES; i++)

		if (priv->dma_conf.tx_queue[i].tbs & STMMAC_TBS_EN)

			dma_conf->tx_queue[i].tbs = priv->dma_conf.tx_queue[i].tbs;

	memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf));



	stmmac_reset_queues_param(priv);