aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tile/tilepro.c
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2011-05-02 16:36:48 -0400
committerChris Metcalf <cmetcalf@tilera.com>2011-05-04 14:41:20 -0400
commitd07bd86d82622247dba8cc29974d3860f857ea33 (patch)
treed6f1c7059c125e61ac7956e4c4bc4d58416a5096 /drivers/net/tile/tilepro.c
parent5386e735897afd8bcd332caf21a5f68d9e0e81c6 (diff)
arch/tile: clarify flush_buffer()/finv_buffer() function names
They are only applicable for locally-homecached memory ranges, so change their names to {flush,finv}_buffer_local(). Change inv_buffer() to just do an mf instead of any kind of fancier barrier, since you're obviously not going to be waiting for anything once the local homecache is invalidated. Fix tilepro.c network driver not to bother calling finv_buffer when stopping the EPP, but just mf after memset to ensure that it will not see any packet data after we finish stopping; use finv_buffer_remote() when doing exit-time cleanup. This also fixes a (not very interesting) generic Linux build failure where drivers/scsi/st.c declares its own flush_buffer(). Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'drivers/net/tile/tilepro.c')
-rw-r--r--drivers/net/tile/tilepro.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/tile/tilepro.c b/drivers/net/tile/tilepro.c
index 0825db6d883f..314f7e79c640 100644
--- a/drivers/net/tile/tilepro.c
+++ b/drivers/net/tile/tilepro.c
@@ -1658,11 +1658,9 @@ static int tile_net_stop(struct net_device *dev)
1658 while (tile_net_lepp_free_comps(dev, true)) 1658 while (tile_net_lepp_free_comps(dev, true))
1659 /* loop */; 1659 /* loop */;
1660 1660
1661 /* Wipe the EPP queue. */ 1661 /* Wipe the EPP queue, and wait till the stores hit the EPP. */
1662 memset(priv->eq, 0, sizeof(lepp_queue_t)); 1662 memset(priv->eq, 0, sizeof(lepp_queue_t));
1663 1663 mb();
1664 /* Evict the EPP queue. */
1665 finv_buffer(priv->eq, EQ_SIZE);
1666 1664
1667 return 0; 1665 return 0;
1668} 1666}
@@ -2398,7 +2396,7 @@ static void tile_net_cleanup(void)
2398 struct net_device *dev = tile_net_devs[i]; 2396 struct net_device *dev = tile_net_devs[i];
2399 struct tile_net_priv *priv = netdev_priv(dev); 2397 struct tile_net_priv *priv = netdev_priv(dev);
2400 unregister_netdev(dev); 2398 unregister_netdev(dev);
2401 finv_buffer(priv->eq, EQ_SIZE); 2399 finv_buffer_remote(priv->eq, EQ_SIZE, 0);
2402 __free_pages(priv->eq_pages, EQ_ORDER); 2400 __free_pages(priv->eq_pages, EQ_ORDER);
2403 free_netdev(dev); 2401 free_netdev(dev);
2404 } 2402 }