2 files changed, 15 insertions, 11 deletions

diff --git a/arch/tile/include/asm/cacheflush.h b/arch/tile/include/asm/cacheflush.h
index 12fb0fb330ee..e925f4bb498f 100644
--- a/arch/tile/include/asm/cacheflush.h
+++ b/arch/tile/include/asm/cacheflush.h
@@ -116,22 +116,28 @@ static inline void __finv_buffer(void *buffer, size_t size)
 }
 
 
-/* Invalidate a VA range, then memory fence. */
+/* Invalidate a VA range and wait for it to be complete. */
 static inline void inv_buffer(void *buffer, size_t size)
 {
         __inv_buffer(buffer, size);
-        mb_incoherent();
+        mb();
 }
 
-/* Flush a VA range, then memory fence. */
-static inline void flush_buffer(void *buffer, size_t size)
+/*
+ * Flush a locally-homecached VA range and wait for the evicted
+ * cachelines to hit memory.
+ */
+static inline void flush_buffer_local(void *buffer, size_t size)
 {
         __flush_buffer(buffer, size);
         mb_incoherent();
 }
 
-/* Flush & invalidate a VA range, then memory fence. */
-static inline void finv_buffer(void *buffer, size_t size)
+/*
+ * Flush and invalidate a locally-homecached VA range and wait for the
+ * evicted cachelines to hit memory.
+ */
+static inline void finv_buffer_local(void *buffer, size_t size)
 {
         __finv_buffer(buffer, size);
         mb_incoherent();
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)
         while (tile_net_lepp_free_comps(dev, true))
                 /* loop */;
 
-        /* Wipe the EPP queue. */
+        /* Wipe the EPP queue, and wait till the stores hit the EPP. */
         memset(priv->eq, 0, sizeof(lepp_queue_t));
-
-        /* Evict the EPP queue. */
-        finv_buffer(priv->eq, EQ_SIZE);
+        mb();
 
         return 0;
 }
@@ -2398,7 +2396,7 @@ static void tile_net_cleanup(void)
                         struct net_device *dev = tile_net_devs[i];
                         struct tile_net_priv *priv = netdev_priv(dev);
                         unregister_netdev(dev);
-                        finv_buffer(priv->eq, EQ_SIZE);
+                        finv_buffer_remote(priv->eq, EQ_SIZE, 0);
                         __free_pages(priv->eq_pages, EQ_ORDER);
                         free_netdev(dev);
                 }