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

Merge branch 'ethtool-consolidate-irq-coalescing-other-drivers' 

Jakub Kicinski says:

====================
ethtool: consolidate irq coalescing - other drivers

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

This set converts all the drivers outside of drivers/net/ethernet.

Only vmxnet3 them was checking unsupported parameters.

The aim is to merge this via the net-next tree so we can
convert all drivers and make the checking mandatory.

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


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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae9e82cc fad99303

arch/um/drivers/vector_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -1508,6 +1508,7 @@ static int vector_set_coalesce(struct net_device *netdev, 
}



static const struct ethtool_ops vector_net_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_TX_USECS,

	.get_drvinfo	= vector_net_get_drvinfo,

	.get_link	= ethtool_op_get_link,

	.get_ts_info	= ethtool_op_get_ts_info,

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

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



static const struct ethtool_ops ipoib_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |

				     ETHTOOL_COALESCE_RX_MAX_FRAMES,

	.get_link_ksettings	= ipoib_get_link_ksettings,

	.get_drvinfo		= ipoib_get_drvinfo,

	.get_coalesce		= ipoib_get_coalesce,

drivers/net/tun.c

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



static const struct ethtool_ops tun_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_MAX_FRAMES,

	.get_drvinfo	= tun_get_drvinfo,

	.get_msglevel	= tun_get_msglevel,

	.set_msglevel	= tun_set_msglevel,

drivers/net/usb/r8152.c

+1 −0
Original line number Diff line number Diff line
@@ -6345,6 +6345,7 @@ static int rtl8152_set_ringparam(struct net_device *netdev, 
}



static const struct ethtool_ops ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,

	.get_drvinfo = rtl8152_get_drvinfo,

	.get_link = ethtool_op_get_link,

	.nway_reset = rtl8152_nway_reset,

drivers/net/vmxnet3/vmxnet3_ethtool.c

+3 −21
Original line number Diff line number Diff line
@@ -780,27 +780,6 @@ vmxnet3_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec) 
	if (!VMXNET3_VERSION_GE_3(adapter))

		return -EOPNOTSUPP;



	if (ec->rx_coalesce_usecs_irq ||

	    ec->rx_max_coalesced_frames_irq ||

	    ec->tx_coalesce_usecs ||

	    ec->tx_coalesce_usecs_irq ||

	    ec->tx_max_coalesced_frames_irq ||

	    ec->stats_block_coalesce_usecs ||

	    ec->use_adaptive_tx_coalesce ||

	    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 -EINVAL;

	}



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

	    (ec->use_adaptive_rx_coalesce == 0) &&

	    (ec->tx_max_coalesced_frames == 0) &&
@@ -891,6 +870,9 @@ done: 
}



static const struct ethtool_ops vmxnet3_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_drvinfo       = vmxnet3_get_drvinfo,

	.get_regs_len      = vmxnet3_get_regs_len,

	.get_regs          = vmxnet3_get_regs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE