From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 13 May 2011 18:56:50 +0000 (+0200)
Subject: 	Flush caches on DMA memory.
X-Git-Tag: 1.99~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19e1c41bbf0638f0504f8cb6faf25c852c49db21;p=thirdparty%2Fgrub.git

	Flush caches on DMA memory.

	* grub-core/kern/mips/cache.S (grub_arch_sync_dma_caches): New function.
	* grub-core/bus/pci.c (grub_memalign_dma32): Flush caches.
	(grub_dma_free): Likewise.
	* include/grub/cache.h (grub_arch_sync_dma_caches): New declaration.
---

diff --git a/ChangeLog b/ChangeLog
index 5b73d8884..49873303c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Flush caches on DMA memory.
+
+	* grub-core/kern/mips/cache.S (grub_arch_sync_dma_caches): New function.
+	* grub-core/bus/pci.c (grub_memalign_dma32): Flush caches.
+	(grub_dma_free): Likewise.
+	* include/grub/cache.h (grub_arch_sync_dma_caches): New declaration.
+
 2011-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/boot/mips/yeeloong/fwstart.S: Add explicit set mips3
diff --git a/grub-core/bus/pci.c b/grub-core/bus/pci.c
index 07d20e3f5..766b6d7f1 100644
--- a/grub-core/bus/pci.c
+++ b/grub-core/bus/pci.c
@@ -20,6 +20,8 @@
 #include <grub/dl.h>
 #include <grub/pci.h>
 #include <grub/mm.h>
+#include <grub/mm_private.h>
+#include <grub/cache.h>
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
@@ -28,12 +30,19 @@ GRUB_MOD_LICENSE ("GPLv3+");
 struct grub_pci_dma_chunk *
 grub_memalign_dma32 (grub_size_t align, grub_size_t size)
 {
-  return grub_memalign (align, size);
+  void *ret = grub_memalign (align, size);
+  if (!ret)
+    return 0;
+  grub_arch_sync_dma_caches (ret, size);
+  return ret;
 }
 
+/* FIXME: evil.  */
 void
 grub_dma_free (struct grub_pci_dma_chunk *ch)
 {
+  grub_size_t size = (((struct grub_mm_header *) ch) - 1)->size * GRUB_MM_ALIGN;
+  grub_arch_sync_dma_caches (ch, size);
   grub_free (ch);
 }
 /* #endif */
diff --git a/grub-core/kern/mips/cache.S b/grub-core/kern/mips/cache.S
index 999872f6b..a4aa06fb0 100644
--- a/grub-core/kern/mips/cache.S
+++ b/grub-core/kern/mips/cache.S
@@ -8,3 +8,38 @@ FUNCTION (grub_cpu_flush_cache)
 FUNCTION (grub_arch_sync_caches)
 #include "cache_flush.S"
 	j $ra
+
+FUNCTION (grub_arch_sync_dma_caches)
+	move $t2, $a0
+	addu $t3, $a0, $a1
+	srl $t2, $t2, 5
+	sll $t2, $t2, 5
+	addu $t3, $t3, 0x1f
+	srl $t3, $t3, 5
+	sll $t3, $t3, 5
+	move $t0, $t2
+	subu $t1, $t3, $t2
+1:
+	cache 1, 0($t0)
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, 1b
+	 addiu $t0, $t0, 0x1
+	sync
+	move $t0, $t2
+	subu $t1, $t3, $t2
+2:
+	cache 0, 0($t0)
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, 2b
+	 addiu $t0, $t0, 0x1
+	sync
+	move $t0, $t2
+	subu $t1, $t3, $t2
+2:
+	cache 23, 0($t0)
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, 2b
+	 addiu $t0, $t0, 0x1
+	sync
+
+	jr $ra
\ No newline at end of file
diff --git a/include/grub/cache.h b/include/grub/cache.h
index 4f913f5c8..292830566 100644
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -37,4 +37,14 @@ grub_arch_sync_caches (void *address __attribute__ ((unused)),
 void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);
 #endif
 
+#ifdef _mips
+void EXPORT_FUNC(grub_arch_sync_dma_caches) (void *address, grub_size_t len);
+#else
+static inline void
+grub_arch_sync_dma_caches (void *address __attribute__ ((unused)),
+			   grub_size_t len __attribute__ ((unused)))
+{
+}
+#endif
+
 #endif /* ! GRUB_CACHE_HEADER */