Commit ca8df5b8 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

net: enetc: convert to use .get_rx_ring_count 



Convert the enetc driver to use the new .get_rx_ring_count
ethtool operation instead of implementing .get_rxnfc for handling
ETHTOOL_GRXRINGS command. This simplifies the code in two ways:

1. For enetc_get_rxnfc(): Remove the ETHTOOL_GRXRINGS case from the
   switch statement while keeping other cases for classifier rules.

2. For enetc4_get_rxnfc(): Remove it completely and use
   enetc_get_rxnfc() instead.

Now on, enetc_get_rx_ring_count() is the callback that returns the
number of RX rings for enetc driver.

Also, remove the documentation around enetc4_get_rxnfc(), which was not
matching what the function did(?!).

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20251128-gxring_freescale-v1-3-22a978abf29e@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b2d63392

drivers/net/ethernet/freescale/enetc/enetc_ethtool.c

+11 −26
Original line number Diff line number Diff line
@@ -633,6 +633,13 @@ static int enetc_set_cls_entry(struct enetc_si *si, 
	return enetc_set_fs_entry(si, &rfse, fs->location);

}



static u32 enetc_get_rx_ring_count(struct net_device *ndev)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);



	return priv->num_rx_rings;

}



static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc,

			   u32 *rule_locs)

{
@@ -640,9 +647,6 @@ static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc, 
	int i, j;



	switch (rxnfc->cmd) {

	case ETHTOOL_GRXRINGS:

		rxnfc->data = priv->num_rx_rings;

		break;

	case ETHTOOL_GRXCLSRLCNT:

		/* total number of entries */

		rxnfc->data = priv->si->num_fs_entries;
@@ -681,27 +685,6 @@ static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc, 
	return 0;

}



/* i.MX95 ENETC does not support RFS table, but we can use ingress port

 * filter table to implement Wake-on-LAN filter or drop the matched flow,

 * so the implementation will be different from enetc_get_rxnfc() and

 * enetc_set_rxnfc(). Therefore, add enetc4_get_rxnfc() for ENETC v4 PF.

 */

static int enetc4_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc,

			    u32 *rule_locs)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);



	switch (rxnfc->cmd) {

	case ETHTOOL_GRXRINGS:

		rxnfc->data = priv->num_rx_rings;

		break;

	default:

		return -EOPNOTSUPP;

	}



	return 0;

}



static int enetc_set_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);
@@ -1335,6 +1318,7 @@ const struct ethtool_ops enetc_pf_ethtool_ops = { 
	.get_rmon_stats = enetc_get_rmon_stats,

	.get_eth_ctrl_stats = enetc_get_eth_ctrl_stats,

	.get_eth_mac_stats = enetc_get_eth_mac_stats,

	.get_rx_ring_count = enetc_get_rx_ring_count,

	.get_rxnfc = enetc_get_rxnfc,

	.set_rxnfc = enetc_set_rxnfc,

	.get_rxfh_key_size = enetc_get_rxfh_key_size,
@@ -1363,7 +1347,7 @@ const struct ethtool_ops enetc4_ppm_ethtool_ops = { 
				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_eth_mac_stats = enetc_ppm_get_eth_mac_stats,

	.get_rxnfc = enetc4_get_rxnfc,

	.get_rx_ring_count = enetc_get_rx_ring_count,

	.get_rxfh_key_size = enetc_get_rxfh_key_size,

	.get_rxfh_indir_size = enetc_get_rxfh_indir_size,

	.get_rxfh = enetc_get_rxfh,
@@ -1386,6 +1370,7 @@ const struct ethtool_ops enetc_vf_ethtool_ops = { 
	.get_sset_count = enetc_get_sset_count,

	.get_strings = enetc_get_strings,

	.get_ethtool_stats = enetc_get_ethtool_stats,

	.get_rx_ring_count = enetc_get_rx_ring_count,

	.get_rxnfc = enetc_get_rxnfc,

	.set_rxnfc = enetc_set_rxnfc,

	.get_rxfh_indir_size = enetc_get_rxfh_indir_size,
@@ -1413,7 +1398,7 @@ const struct ethtool_ops enetc4_pf_ethtool_ops = { 
	.set_wol = enetc_set_wol,

	.get_pauseparam = enetc_get_pauseparam,

	.set_pauseparam = enetc_set_pauseparam,

	.get_rxnfc = enetc4_get_rxnfc,

	.get_rx_ring_count = enetc_get_rx_ring_count,

	.get_rxfh_key_size = enetc_get_rxfh_key_size,

	.get_rxfh_indir_size = enetc_get_rxfh_indir_size,

	.get_rxfh = enetc_get_rxfh,