Przeglądaj źródła

amd-xgbe: Use device workqueue instead of system workqueue

The driver creates, flushes and destroys a device workqueue but queues
work to the system workqueue. Switch from using the system workqueue to
the device workqueue.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Lendacky, Thomas 10 lat temu
rodzic
commit
afb43e8a0a
1 zmienionych plików z 6 dodań i 5 usunięć
  1. 6 5
      drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+ 6 - 5
drivers/net/ethernet/amd/xgbe/xgbe-drv.c

@@ -365,7 +365,7 @@ static irqreturn_t xgbe_isr(int irq, void *data)
 
 
 		/* Restart the device on a Fatal Bus Error */
 		/* Restart the device on a Fatal Bus Error */
 		if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, FBE))
 		if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, FBE))
-			schedule_work(&pdata->restart_work);
+			queue_work(pdata->dev_workqueue, &pdata->restart_work);
 
 
 		/* Clear all interrupt signals */
 		/* Clear all interrupt signals */
 		XGMAC_DMA_IOWRITE(channel, DMA_CH_SR, dma_ch_isr);
 		XGMAC_DMA_IOWRITE(channel, DMA_CH_SR, dma_ch_isr);
@@ -387,7 +387,8 @@ static irqreturn_t xgbe_isr(int irq, void *data)
 				/* Read Tx Timestamp to clear interrupt */
 				/* Read Tx Timestamp to clear interrupt */
 				pdata->tx_tstamp =
 				pdata->tx_tstamp =
 					hw_if->get_tx_tstamp(pdata);
 					hw_if->get_tx_tstamp(pdata);
-				schedule_work(&pdata->tx_tstamp_work);
+				queue_work(pdata->dev_workqueue,
+					   &pdata->tx_tstamp_work);
 			}
 			}
 		}
 		}
 	}
 	}
@@ -453,7 +454,7 @@ static void xgbe_service_timer(unsigned long data)
 {
 {
 	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;
 	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;
 
 
-	schedule_work(&pdata->service_work);
+	queue_work(pdata->dev_workqueue, &pdata->service_work);
 
 
 	mod_timer(&pdata->service_timer, jiffies + HZ);
 	mod_timer(&pdata->service_timer, jiffies + HZ);
 }
 }
@@ -894,7 +895,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
 	netif_tx_start_all_queues(netdev);
 	netif_tx_start_all_queues(netdev);
 
 
 	xgbe_start_timers(pdata);
 	xgbe_start_timers(pdata);
-	schedule_work(&pdata->service_work);
+	queue_work(pdata->dev_workqueue, &pdata->service_work);
 
 
 	DBGPR("<--xgbe_start\n");
 	DBGPR("<--xgbe_start\n");
 
 
@@ -1536,7 +1537,7 @@ static void xgbe_tx_timeout(struct net_device *netdev)
 	struct xgbe_prv_data *pdata = netdev_priv(netdev);
 	struct xgbe_prv_data *pdata = netdev_priv(netdev);
 
 
 	netdev_warn(netdev, "tx timeout, device restarting\n");
 	netdev_warn(netdev, "tx timeout, device restarting\n");
-	schedule_work(&pdata->restart_work);
+	queue_work(pdata->dev_workqueue, &pdata->restart_work);
 }
 }
 
 
 static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
 static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,