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

Merge branch 'ethtool-consolidate-irq-coalescing-part-5' 

Jakub Kicinski says:

====================
ethtool: consolidate irq coalescing - part 5

Convert more drivers following the groundwork laid in a recent
patch set [1] and continued in [2], [3], [4]. The aim of the effort
is to consolidate irq coalescing parameter validation in the core.

This set converts further 15 drivers in drivers/net/ethernet.
One more conversion sets to come.

[1] https://lore.kernel.org/netdev/20200305051542.991898-1-kuba@kernel.org/
[2] https://lore.kernel.org/netdev/20200306010602.1620354-1-kuba@kernel.org/
[3] https://lore.kernel.org/netdev/20200310021512.1861626-1-kuba@kernel.org/
[4] https://lore.kernel.org/netdev/20200311223302.2171564-1-kuba@kernel.org/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0c907754 5b71256a

drivers/net/ethernet/jme.c

+3 −0
Original line number Diff line number Diff line
@@ -2839,6 +2839,9 @@ jme_set_eeprom(struct net_device *netdev, 
}



static const struct ethtool_ops jme_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_drvinfo            = jme_get_drvinfo,

	.get_regs_len		= jme_get_regs_len,

	.get_regs		= jme_get_regs,

drivers/net/ethernet/marvell/mv643xx_eth.c

+1 −0
Original line number Diff line number Diff line
@@ -1737,6 +1737,7 @@ static int mv643xx_eth_get_sset_count(struct net_device *dev, int sset) 
}



static const struct ethtool_ops mv643xx_eth_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,

	.get_drvinfo		= mv643xx_eth_get_drvinfo,

	.nway_reset		= phy_ethtool_nway_reset,

	.get_link		= ethtool_op_get_link,

drivers/net/ethernet/marvell/mvneta.c

+2 −0
Original line number Diff line number Diff line
@@ -4838,6 +4838,8 @@ static const struct net_device_ops mvneta_netdev_ops = { 
};



static const struct ethtool_ops mvneta_eth_tool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.nway_reset	= mvneta_ethtool_nway_reset,

	.get_link       = ethtool_op_get_link,

	.set_coalesce   = mvneta_ethtool_set_coalesce,

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+2 −0
Original line number Diff line number Diff line
@@ -4384,6 +4384,8 @@ static const struct net_device_ops mvpp2_netdev_ops = { 
};



static const struct ethtool_ops mvpp2_eth_tool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.nway_reset		= mvpp2_ethtool_nway_reset,

	.get_link		= ethtool_op_get_link,

	.set_coalesce		= mvpp2_ethtool_set_coalesce,

drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c

+2 −11
Original line number Diff line number Diff line
@@ -368,17 +368,6 @@ static int otx2_set_coalesce(struct net_device *netdev, 
	struct otx2_hw *hw = &pfvf->hw;

	int qidx;



	if (ec->use_adaptive_rx_coalesce || ec->use_adaptive_tx_coalesce ||

	    ec->rx_coalesce_usecs_irq || ec->rx_max_coalesced_frames_irq ||

	    ec->tx_coalesce_usecs_irq || ec->tx_max_coalesced_frames_irq ||

	    ec->stats_block_coalesce_usecs || ec->pkt_rate_low ||

	    ec->rx_coalesce_usecs_low || ec->rx_max_coalesced_frames_low ||

	    ec->tx_coalesce_usecs_low || ec->tx_max_coalesced_frames_low ||

	    ec->pkt_rate_high || ec->rx_coalesce_usecs_high ||

	    ec->rx_max_coalesced_frames_high || ec->tx_coalesce_usecs_high ||

	    ec->tx_max_coalesced_frames_high || ec->rate_sample_interval)

		return -EOPNOTSUPP;



	if (!ec->rx_max_coalesced_frames || !ec->tx_max_coalesced_frames)

		return 0;
@@ -674,6 +663,8 @@ static u32 otx2_get_link(struct net_device *netdev) 
}



static const struct ethtool_ops otx2_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_link		= otx2_get_link,

	.get_drvinfo		= otx2_get_drvinfo,

	.get_strings		= otx2_get_strings,

CRA Git | Maintained and supported by SUSTech CRA and CCSE