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

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

Jakub Kicinski says:

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

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

This set is the sixth and last installment. It converts the remaining
8 drivers in drivers/net/ethernet. The last patch makes declaring
supported IRQ coalescing parameters a requirement.

[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/
[5] https://lore.kernel.org/netdev/20200313040803.2367590-1-kuba@kernel.org/


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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 01a6a62e 9000edb7

drivers/net/ethernet/sfc/ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -232,9 +232,6 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev, 
	bool adaptive, rx_may_override_tx;

	int rc;



	if (coalesce->use_adaptive_tx_coalesce)

		return -EINVAL;



	efx_get_irq_moderation(efx, &tx_usecs, &rx_usecs, &adaptive);



	if (coalesce->rx_coalesce_usecs != rx_usecs)
@@ -1138,6 +1135,9 @@ static int efx_ethtool_set_fecparam(struct net_device *net_dev, 
}



const struct ethtool_ops efx_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USECS_IRQ |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_drvinfo		= efx_ethtool_get_drvinfo,

	.get_regs_len		= efx_ethtool_get_regs_len,

	.get_regs		= efx_ethtool_get_regs,

drivers/net/ethernet/sfc/falcon/ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -603,9 +603,6 @@ static int ef4_ethtool_set_coalesce(struct net_device *net_dev, 
	bool adaptive, rx_may_override_tx;

	int rc;



	if (coalesce->use_adaptive_tx_coalesce)

		return -EINVAL;



	ef4_get_irq_moderation(efx, &tx_usecs, &rx_usecs, &adaptive);



	if (coalesce->rx_coalesce_usecs != rx_usecs)
@@ -1311,6 +1308,9 @@ static int ef4_ethtool_get_module_info(struct net_device *net_dev, 
}



const struct ethtool_ops ef4_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USECS_IRQ |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_drvinfo		= ef4_ethtool_get_drvinfo,

	.get_regs_len		= ef4_ethtool_get_regs_len,

	.get_regs		= ef4_ethtool_get_regs,

drivers/net/ethernet/socionext/netsec.c

+2 −0
Original line number Diff line number Diff line
@@ -589,6 +589,8 @@ static void netsec_et_set_msglevel(struct net_device *dev, u32 datum) 
}



static const struct ethtool_ops netsec_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_drvinfo		= netsec_et_get_drvinfo,

	.get_link_ksettings	= phy_ethtool_get_link_ksettings,

	.set_link_ksettings	= phy_ethtool_set_link_ksettings,

drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c

+2 −15
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ static int xlgmac_ethtool_get_coalesce(struct net_device *netdev, 
{

	struct xlgmac_pdata *pdata = netdev_priv(netdev);



	memset(ec, 0, sizeof(struct ethtool_coalesce));

	ec->rx_coalesce_usecs = pdata->rx_usecs;

	ec->rx_max_coalesced_frames = pdata->rx_frames;

	ec->tx_max_coalesced_frames = pdata->tx_frames;
@@ -167,20 +166,6 @@ static int xlgmac_ethtool_set_coalesce(struct net_device *netdev, 
	unsigned int rx_frames, rx_riwt, rx_usecs;

	unsigned int tx_frames;



	/* Check for not supported parameters */

	if ((ec->rx_coalesce_usecs_irq) || (ec->rx_max_coalesced_frames_irq) ||

	    (ec->tx_coalesce_usecs) || (ec->tx_coalesce_usecs_high) ||

	    (ec->tx_max_coalesced_frames_irq) || (ec->tx_coalesce_usecs_irq) ||

	    (ec->stats_block_coalesce_usecs) ||  (ec->pkt_rate_low) ||

	    (ec->use_adaptive_rx_coalesce) || (ec->use_adaptive_tx_coalesce) ||

	    (ec->rx_max_coalesced_frames_low) || (ec->rx_coalesce_usecs_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_max_coalesced_frames_high) ||

	    (ec->rate_sample_interval))

		return -EOPNOTSUPP;



	rx_usecs = ec->rx_coalesce_usecs;

	rx_riwt = hw_ops->usec_to_riwt(pdata, rx_usecs);

	rx_frames = ec->rx_max_coalesced_frames;
@@ -257,6 +242,8 @@ static void xlgmac_ethtool_get_ethtool_stats(struct net_device *netdev, 
}



static const struct ethtool_ops xlgmac_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_drvinfo = xlgmac_ethtool_get_drvinfo,

	.get_link = ethtool_op_get_link,

	.get_msglevel = xlgmac_ethtool_get_msglevel,

drivers/net/ethernet/tehuti/tehuti.c

+2 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,8 @@ static void bdx_get_ethtool_stats(struct net_device *netdev, 
static void bdx_set_ethtool_ops(struct net_device *netdev)

{

	static const struct ethtool_ops bdx_ethtool_ops = {

		.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

					     ETHTOOL_COALESCE_MAX_FRAMES,

		.get_drvinfo = bdx_get_drvinfo,

		.get_link = ethtool_op_get_link,

		.get_coalesce = bdx_get_coalesce,

CRA Git | Maintained and supported by SUSTech CRA and CCSE