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

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

Jakub Kicinski says:

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

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

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

None of the drivers here checked all unsupported parameters.

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


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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 314a9cbb d13f1167

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -826,6 +826,8 @@ static int ena_set_tunable(struct net_device *netdev, 
}



static const struct ethtool_ops ena_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_link_ksettings	= ena_get_link_ksettings,

	.get_drvinfo		= ena_get_drvinfo,

	.get_msglevel		= ena_get_msglevel,

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+3 −12
Original line number Diff line number Diff line
@@ -386,21 +386,10 @@ static int aq_ethtool_set_coalesce(struct net_device *ndev, 


	cfg = aq_nic_get_cfg(aq_nic);



	/* This is not yet supported

	 */

	if (coal->use_adaptive_rx_coalesce || coal->use_adaptive_tx_coalesce)

		return -EOPNOTSUPP;



	/* Atlantic only supports timing based coalescing

	 */

	if (coal->rx_max_coalesced_frames > 1 ||

	    coal->rx_coalesce_usecs_irq ||

	    coal->rx_max_coalesced_frames_irq)

		return -EOPNOTSUPP;



	if (coal->tx_max_coalesced_frames > 1 ||

	    coal->tx_coalesce_usecs_irq ||

	    coal->tx_max_coalesced_frames_irq)

	    coal->tx_max_coalesced_frames > 1)

		return -EOPNOTSUPP;



	/* We do not support frame counting. Check this
@@ -742,6 +731,8 @@ static int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags) 
}



const struct ethtool_ops aq_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_link            = aq_ethtool_get_link,

	.get_regs_len        = aq_ethtool_get_regs_len,

	.get_regs            = aq_ethtool_get_regs,

drivers/net/ethernet/broadcom/bcmsysport.c

+4 −2
Original line number Diff line number Diff line
@@ -623,8 +623,7 @@ static int bcm_sysport_set_coalesce(struct net_device *dev, 
		return -EINVAL;



	if ((ec->tx_coalesce_usecs == 0 && ec->tx_max_coalesced_frames == 0) ||

	    (ec->rx_coalesce_usecs == 0 && ec->rx_max_coalesced_frames == 0) ||

	    ec->use_adaptive_tx_coalesce)

	    (ec->rx_coalesce_usecs == 0 && ec->rx_max_coalesced_frames == 0))

		return -EINVAL;



	for (i = 0; i < dev->num_tx_queues; i++)
@@ -2209,6 +2208,9 @@ static int bcm_sysport_set_rxnfc(struct net_device *dev, 
}



static const struct ethtool_ops bcm_sysport_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_drvinfo		= bcm_sysport_get_drvinfo,

	.get_msglevel		= bcm_sysport_get_msglvl,

	.set_msglevel		= bcm_sysport_set_msglvl,

drivers/net/ethernet/broadcom/bnx2.c

+5 −0
Original line number Diff line number Diff line
@@ -7812,6 +7812,11 @@ static int bnx2_set_channels(struct net_device *dev, 
}



static const struct ethtool_ops bnx2_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USECS_IRQ |

				     ETHTOOL_COALESCE_MAX_FRAMES_IRQ |

				     ETHTOOL_COALESCE_STATS_BLOCK_USECS,

	.get_drvinfo		= bnx2_get_drvinfo,

	.get_regs_len		= bnx2_get_regs_len,

	.get_regs		= bnx2_get_regs,

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -3656,6 +3656,7 @@ static int bnx2x_get_ts_info(struct net_device *dev, 
}



static const struct ethtool_ops bnx2x_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,

	.get_drvinfo		= bnx2x_get_drvinfo,

	.get_regs_len		= bnx2x_get_regs_len,

	.get_regs		= bnx2x_get_regs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE