Skip to content

Commit

Permalink
net: stmmac: use netif_tx_start|stop_all_queues() function
Browse files Browse the repository at this point in the history
[ Upstream commit 9f19306 ]

The current implementation of stmmac_stop_all_queues() and
stmmac_start_all_queues() will not work correctly when the value of
tx_queues_to_use is changed through ethtool -L DEVNAME rx N tx M command.

Also, netif_tx_start|stop_all_queues() are only needed in driver open()
and close() only.

Fixes: c22a3f4 net: stmmac: adding multiple napi mechanism

Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
elvinongbl authored and gregkh committed Oct 29, 2020
1 parent 148b49b commit 1122f2a
Showing 1 changed file with 1 addition and 32 deletions.
33 changes: 1 addition & 32 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,32 +175,6 @@ static void stmmac_enable_all_queues(struct stmmac_priv *priv)
}
}

/**
* stmmac_stop_all_queues - Stop all queues
* @priv: driver private structure
*/
static void stmmac_stop_all_queues(struct stmmac_priv *priv)
{
u32 tx_queues_cnt = priv->plat->tx_queues_to_use;
u32 queue;

for (queue = 0; queue < tx_queues_cnt; queue++)
netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, queue));
}

/**
* stmmac_start_all_queues - Start all queues
* @priv: driver private structure
*/
static void stmmac_start_all_queues(struct stmmac_priv *priv)
{
u32 tx_queues_cnt = priv->plat->tx_queues_to_use;
u32 queue;

for (queue = 0; queue < tx_queues_cnt; queue++)
netif_tx_start_queue(netdev_get_tx_queue(priv->dev, queue));
}

static void stmmac_service_event_schedule(struct stmmac_priv *priv)
{
if (!test_bit(STMMAC_DOWN, &priv->state) &&
Expand Down Expand Up @@ -2737,7 +2711,7 @@ static int stmmac_open(struct net_device *dev)
}

stmmac_enable_all_queues(priv);
stmmac_start_all_queues(priv);
netif_tx_start_all_queues(priv->dev);

return 0;

Expand Down Expand Up @@ -2778,8 +2752,6 @@ static int stmmac_release(struct net_device *dev)
phylink_stop(priv->phylink);
phylink_disconnect_phy(priv->phylink);

stmmac_stop_all_queues(priv);

stmmac_disable_all_queues(priv);

for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
Expand Down Expand Up @@ -4770,7 +4742,6 @@ int stmmac_suspend(struct device *dev)
mutex_lock(&priv->lock);

netif_device_detach(ndev);
stmmac_stop_all_queues(priv);

stmmac_disable_all_queues(priv);

Expand Down Expand Up @@ -4883,8 +4854,6 @@ int stmmac_resume(struct device *dev)

stmmac_enable_all_queues(priv);

stmmac_start_all_queues(priv);

mutex_unlock(&priv->lock);

if (!device_may_wakeup(priv->device)) {
Expand Down

0 comments on commit 1122f2a

Please sign in to comment.