On Tue, Mar 11, 2025 at 01:38:24PM +0800, Wei Fang wrote:
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h
> b/drivers/net/ethernet/freescale/enetc/enetc.h
> index a3ce324c716c..ecf79338cd79 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc.h
> +++ b/drivers/net/ethernet/freescale/enetc/enetc.h
> @@ -543,6 +543,8 @@ void enetc_set_rss_key(struct enetc_si *si, const u8
> *bytes);
> int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
> int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
> int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
> +int enetc4_get_rss_table(struct enetc_si *si, u32 *table, int count);
> +int enetc4_set_rss_table(struct enetc_si *si, const u32 *table, int count);
>
> static inline void *enetc_cbd_alloc_data_mem(struct enetc_si *si,
> struct enetc_cbd *cbd,
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
> b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
> index f991e1aae85c..53dbd5d71859 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
> @@ -693,6 +693,14 @@ static void enetc4_pf_set_rx_mode(struct net_device
> *ndev)
> queue_work(si->workqueue, &si->rx_mode_task);
> }
>
> +static int enetc4_pf_set_features(struct net_device *ndev,
> + netdev_features_t features)
> +{
> + enetc_set_features(ndev, features);
> +
> + return 0;
> +}
> +
> static const struct net_device_ops enetc4_ndev_ops = {
> .ndo_open = enetc_open,
> .ndo_stop = enetc_close,
> @@ -700,6 +708,7 @@ static const struct net_device_ops enetc4_ndev_ops = {
> .ndo_get_stats = enetc_get_stats,
> .ndo_set_mac_address = enetc_pf_set_mac_addr,
> .ndo_set_rx_mode = enetc4_pf_set_rx_mode,
> + .ndo_set_features = enetc4_pf_set_features,
> };
>
> static struct phylink_pcs *
> @@ -1108,6 +1117,8 @@ static void enetc4_pf_netdev_destroy(struct enetc_si
> *si)
> static const struct enetc_si_ops enetc4_psi_ops = {
> .setup_cbdr = enetc4_setup_cbdr,
> .teardown_cbdr = enetc4_teardown_cbdr,
> + .get_rss_table = enetc4_get_rss_table,
> + .set_rss_table = enetc4_set_rss_table,
> };
>
> static int enetc4_pf_wq_task_init(struct enetc_si *si)
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
> b/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
> index 4e5125331d7b..1a74b93f1fd3 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
> @@ -299,3 +299,17 @@ int enetc_set_rss_table(struct enetc_si *si, const u32
> *table, int count)
> return enetc_cmd_rss_table(si, (u32 *)table, count, false);
> }
> EXPORT_SYMBOL_GPL(enetc_set_rss_table);
> +
> +int enetc4_get_rss_table(struct enetc_si *si, u32 *table, int count)
> +{
> + return ntmp_rsst_query_or_update_entry(&si->ntmp.cbdrs,
> + table, count, true);
> +}
> +EXPORT_SYMBOL_GPL(enetc4_get_rss_table);
> +
> +int enetc4_set_rss_table(struct enetc_si *si, const u32 *table, int count)
> +{
> + return ntmp_rsst_query_or_update_entry(&si->ntmp.cbdrs,
> + (u32 *)table, count, false);
> +}
> +EXPORT_SYMBOL_GPL(enetc4_set_rss_table);
I don't understand the logic for placing enetc4_get_rss_table() and
enetc4_set_rss_table() in enetc_cbdr.c (built as part of fsl-enetc-core-y)?
It's not core code, it's used only by NETC v4.
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> index 1a8fae3c406b..bc65135925b8 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> @@ -625,6 +625,24 @@ static int enetc_get_rxnfc(struct net_device *ndev,
> struct ethtool_rxnfc *rxnfc,
> return 0;
> }
>
> +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;
> + case ETHTOOL_GRXFH:
> + return enetc_get_rsshash(rxnfc);
These rxnfc commands seem implemented identically to the corresponding
subset from enetc_get_rxnfc(). Rather than duplicating those, could you
rather return -EOPNOTSUPP for the unsupported ones on NETC v4, and reuse
enetc_get_rxnfc()?
> + 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);
> @@ -685,22 +703,29 @@ static int enetc_get_rss_key_base(struct enetc_si *si)
> return ENETC4_PRSSKR(0);
> }
>
> +static void enetc_get_rss_key(struct enetc_si *si, const u8 *key)
> +{
> + int base = enetc_get_rss_key_base(si);
> + struct enetc_hw *hw = &si->hw;
> + int i;
> +
> + for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
> + ((u32 *)key)[i] = enetc_port_rd(hw, base + i * 4);
> +}
I would have expected that this refactoring of code into
enetc_get_rss_key() would be done as part of the previous change:
"net: enetc: make enetc_set_rss_key() reusable".
> +
> static int enetc_get_rxfh(struct net_device *ndev,
> struct ethtool_rxfh_param *rxfh)
> {
> struct enetc_ndev_priv *priv = netdev_priv(ndev);
> struct enetc_si *si = priv->si;
> - struct enetc_hw *hw = &si->hw;
> - int err = 0, i;
> + int err = 0;
>
> /* return hash function */
> rxfh->hfunc = ETH_RSS_HASH_TOP;
>
> /* return hash key */
> - if (rxfh->key && hw->port)
> - for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
> - ((u32 *)rxfh->key)[i] = enetc_port_rd(hw,
> - ENETC_PRSSK(i));
> + if (rxfh->key && enetc_si_is_pf(si))
> + enetc_get_rss_key(si, rxfh->key);
>
> /* return RSS table */
> if (rxfh->indir)
> @@ -1249,6 +1274,11 @@ 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_rxfh_key_size = enetc_get_rxfh_key_size,
> + .get_rxfh_indir_size = enetc_get_rxfh_indir_size,
> + .get_rxfh = enetc_get_rxfh,
> + .set_rxfh = enetc_set_rxfh,
> };
>
> void enetc_set_ethtool_ops(struct net_device *ndev)
