On Wed, 5 Mar 2025 08:00:16 -0500 Faizal Rahim <faizal.abdul.ra...@linux.intel.com> wrote:
> The upcoming patch will extract verification logic into a new module, > MMSV (MAC Merge Software Verification). MMSV will handle most FPE fields, > except frag_size. It introduces its own lock (mmsv->lock), replacing > fpe_cfg->lock. > > Since frag_size handling remains in the driver, the existing rtnl_lock() > is sufficient. Move frag_size handling out of spin_lock_irq_save() to keep > the upcoming patch a pure refactoring without behavior changes. > > Signed-off-by: Faizal Rahim <faizal.abdul.ra...@linux.intel.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > index 918a32f8fda8..cfe5aea24549 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > @@ -1216,6 +1216,10 @@ static int stmmac_get_mm(struct net_device *ndev, > if (!stmmac_fpe_supported(priv)) > return -EOPNOTSUPP; > > + state->rx_min_frag_size = ETH_ZLEN; > + frag_size = stmmac_fpe_get_add_frag_size(priv); > + state->tx_min_frag_size = ethtool_mm_frag_size_add_to_min(frag_size); > + > spin_lock_irqsave(&priv->fpe_cfg.lock, flags); > > state->max_verify_time = STMMAC_FPE_MM_MAX_VERIFY_TIME_MS; > @@ -1224,7 +1228,6 @@ static int stmmac_get_mm(struct net_device *ndev, > state->verify_time = priv->fpe_cfg.verify_time; > state->tx_enabled = priv->fpe_cfg.tx_enabled; > state->verify_status = priv->fpe_cfg.status; > - state->rx_min_frag_size = ETH_ZLEN; > > /* FPE active if common tx_enabled and > * (verification success or disabled(forced)) > @@ -1236,9 +1239,6 @@ static int stmmac_get_mm(struct net_device *ndev, > else > state->tx_active = false; > > - frag_size = stmmac_fpe_get_add_frag_size(priv); > - state->tx_min_frag_size = ethtool_mm_frag_size_add_to_min(frag_size); > - > spin_unlock_irqrestore(&priv->fpe_cfg.lock, flags); > > return 0; > @@ -1258,6 +1258,8 @@ static int stmmac_set_mm(struct net_device *ndev, > struct ethtool_mm_cfg *cfg, > if (err) > return err; > > + stmmac_fpe_set_add_frag_size(priv, frag_size); > + > /* Wait for the verification that's currently in progress to finish */ > timer_shutdown_sync(&fpe_cfg->verify_timer); > > @@ -1271,7 +1273,6 @@ static int stmmac_set_mm(struct net_device *ndev, > struct ethtool_mm_cfg *cfg, > if (!cfg->verify_enabled) > fpe_cfg->status = ETHTOOL_MM_VERIFY_STATUS_DISABLED; > > - stmmac_fpe_set_add_frag_size(priv, frag_size); > stmmac_fpe_apply(priv); > > spin_unlock_irqrestore(&fpe_cfg->lock, flags); Reviewed-by: Furong Xu <0x1...@gmail.com>
