Re: [PATCH v2 RFC net-next 13/18] net: mvpp2: add ethtool flow control configuration support

Russell King - ARM Linux admin
2021-01-24T12:36:59Z

On Sun, Jan 24, 2021 at 01:44:02PM +0200, stefanc@marvell.com wrote:
> @@ -6407,6 +6490,29 @@ static void mvpp2_mac_link_up(struct phylink_config *config,
> val);
> }
>
> + if (tx_pause && port->priv->global_tx_fc) {
> + port->tx_fc = true;
> + mvpp2_rxq_enable_fc(port);
> + if (port->priv->percpu_pools) {
> + for (i = 0; i < port->nrxqs; i++)
> + mvpp2_bm_pool_update_fc(port, &port->priv->bm_pools[i], true);
> + } else {
> + mvpp2_bm_pool_update_fc(port, port->pool_long, true);
> + mvpp2_bm_pool_update_fc(port, port->pool_short, true);
> + }
> +
> + } else if (port->priv->global_tx_fc) {
> + port->tx_fc = false;
> + mvpp2_rxq_disable_fc(port);
> + if (port->priv->percpu_pools) {
> + for (i = 0; i < port->nrxqs; i++)
> + mvpp2_bm_pool_update_fc(port, &port->priv->bm_pools[i], false);
> + } else {
> + mvpp2_bm_pool_update_fc(port, port->pool_long, false);
> + mvpp2_bm_pool_update_fc(port, port->pool_short, false);
> + }
> + }
> +

It seems this can be written more succinctly:

if (port->priv->global_tx_fc) {
port->tx_fc = tx_pause;
if (tx_pause)
mvpp2_rxq_enable_fc(port);
else
mvpp2_rxq_disable_fc(port);
if (port->priv->percpu_pools) {
for (i = 0; i < port->nrxqs; i++)
mvpp2_bm_pool_update_fc(port,
&port->priv->bm_pools[i],
tx_pause);
} else {
mvpp2_bm_pool_update_fc(port, port->pool_long,
tx_pause);
mvpp2_bm_pool_update_fc(port, port->pool_short,
tx_pause);
}
}

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!