Commit db2f2842 authored by Ong Boon Leong's avatar Ong Boon Leong Committed by David S. Miller
Browse files

net: stmmac: add per-queue TX & RX coalesce ethtool support 



Extending the driver to support per-queue RX and TX coalesce settings in
order to support below commands:

To show per-queue coalesce setting:-
 $ ethtool --per-queue <DEVNAME> queue_mask <MASK> --show-coalesce

To set per-queue coalesce setting:-
 $ ethtool --per-queue <DEVNAME> queue_mask <MASK> --coalesce \
     [rx-usecs N] [rx-frames M] [tx-usecs P] [tx-frames Q]

Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ef4f409

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

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void dwmac1000_get_hw_feature(void __iomem *ioaddr, 
}



static void dwmac1000_rx_watchdog(void __iomem *ioaddr, u32 riwt,

				  u32 number_chan)

				  u32 queue)

{

	writel(riwt, ioaddr + DMA_RX_WATCHDOG);

}

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

+2 −5
Original line number Diff line number Diff line
@@ -210,12 +210,9 @@ static void dwmac4_dump_dma_regs(void __iomem *ioaddr, u32 *reg_space) 
		_dwmac4_dump_dma_regs(ioaddr, i, reg_space);

}



static void dwmac4_rx_watchdog(void __iomem *ioaddr, u32 riwt, u32 number_chan)

static void dwmac4_rx_watchdog(void __iomem *ioaddr, u32 riwt, u32 queue)

{

	u32 chan;



	for (chan = 0; chan < number_chan; chan++)

		writel(riwt, ioaddr + DMA_CHAN_RX_WATCHDOG(chan));

	writel(riwt, ioaddr + DMA_CHAN_RX_WATCHDOG(queue));

}



static void dwmac4_dma_rx_chan_op_mode(void __iomem *ioaddr, int mode,

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

+2 −5
Original line number Diff line number Diff line
@@ -441,12 +441,9 @@ static void dwxgmac2_get_hw_feature(void __iomem *ioaddr, 
	dma_cap->frpsel = (hw_cap & XGMAC_HWFEAT_FRPSEL) >> 3;

}



static void dwxgmac2_rx_watchdog(void __iomem *ioaddr, u32 riwt, u32 nchan)

static void dwxgmac2_rx_watchdog(void __iomem *ioaddr, u32 riwt, u32 queue)

{

	u32 i;



	for (i = 0; i < nchan; i++)

		writel(riwt & XGMAC_RWT, ioaddr + XGMAC_DMA_CH_Rx_WATCHDOG(i));

	writel(riwt & XGMAC_RWT, ioaddr + XGMAC_DMA_CH_Rx_WATCHDOG(queue));

}



static void dwxgmac2_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan)

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

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct stmmac_dma_ops { 
	void (*get_hw_feature)(void __iomem *ioaddr,

			       struct dma_features *dma_cap);

	/* Program the HW RX Watchdog */

	void (*rx_watchdog)(void __iomem *ioaddr, u32 riwt, u32 number_chan);

	void (*rx_watchdog)(void __iomem *ioaddr, u32 riwt, u32 queue);

	void (*set_tx_ring_len)(void __iomem *ioaddr, u32 len, u32 chan);

	void (*set_rx_ring_len)(void __iomem *ioaddr, u32 len, u32 chan);

	void (*set_rx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);

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

+4 −4
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ struct stmmac_flow_entry { 


struct stmmac_priv {

	/* Frequently used values are kept adjacent for cache effect */

	u32 tx_coal_frames;

	u32 tx_coal_timer;

	u32 rx_coal_frames;

	u32 tx_coal_frames[MTL_MAX_TX_QUEUES];

	u32 tx_coal_timer[MTL_MAX_TX_QUEUES];

	u32 rx_coal_frames[MTL_MAX_TX_QUEUES];



	int tx_coalesce;

	int hwts_tx_en;
@@ -160,7 +160,7 @@ struct stmmac_priv { 


	unsigned int dma_buf_sz;

	unsigned int rx_copybreak;

	u32 rx_riwt;

	u32 rx_riwt[MTL_MAX_TX_QUEUES];

	int hwts_rx_en;



	void __iomem *ioaddr;