@@ -248,7 +248,6 @@ struct stmmac_priv {
enum stmmac_state {
STMMAC_DOWN,
STMMAC_RESET_REQUESTED,
- STMMAC_SERVICE_SCHED,
};
int stmmac_mdio_unregister(struct net_device *ndev);
@@ -176,9 +176,7 @@ static void stmmac_enable_all_queues(struct stmmac_priv *priv)
static void stmmac_service_event_schedule(struct stmmac_priv *priv)
{
- if (!test_bit(STMMAC_DOWN, &priv->state) &&
- !test_and_set_bit(STMMAC_SERVICE_SCHED, &priv->state))
- queue_work(priv->wq, &priv->service_task);
+ queue_work(priv->wq, &priv->service_task);
}
static void stmmac_global_err(struct stmmac_priv *priv)
@@ -4683,7 +4681,6 @@ static void stmmac_service_task(struct work_struct *work)
service_task);
stmmac_reset_subtask(priv);
- clear_bit(STMMAC_SERVICE_SCHED, &priv->state);
}
/**
Indeed CMWQ guaranties that each particular work item is non-reenatrant, while using the atomic bitmask operation statement may cause a requested event being missed if for instance some event happens while the service task is being executed (see the STMMAC_SERVICE_SCHED flag semantic). Similarly the service task can be requested for being executed while the STMMAC core is in the down state. (Though for now there is no such sub-task defined in the driver). So to speak just drop the conditional service task execution and queue the corresponding work anytime it's requested, while the service sub-tasks shall determine whether they really need to be performed in particular situations. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-)