[PATCH] c-r3k: Implement flush_cache_range()

[PATCH] c-r3k: Implement flush_cache_range()

[Maciej W. Rozycki]

 Contrary to the belief of some, the R3000 and related processors did have 
caches, both a data and an instruction cache.  Here is an implementation 
of r3k_flush_cache_page(), which is the processor-specific back-end for 
flush_cache_range(), done according to the spec in 
Documentation/cachetlb.txt.

 While at it, remove an unused local function: get_phys_page(), do some 
trivial formatting fixes and modernise debugging facilities.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
 Fine with checkpatch.pl and tested at the run time with an R3000A, fixing 
problems surrounding ptrace(PTRACE_POKEDATA, ...).

 Please apply,

  Maciej

patch-mips-2.6.23-20071011-r3000-flush_cache_page-3
diff -up --recursive --new-file linux-mips-2.6.23-20071011.macro/arch/mips/mm/c-r3k.c linux-mips-2.6.23-20071011/arch/mips/mm/c-r3k.c
--- linux-mips-2.6.23-20071011.macro/arch/mips/mm/c-r3k.c	2007-10-11 04:56:52.000000000 +0000
+++ linux-mips-2.6.23-20071011/arch/mips/mm/c-r3k.c	2007-10-17 10:38:20.000000000 +0000
@@ -7,7 +7,7 @@
  * Tx39XX R4k style caches added. HK
  * Copyright (C) 1998, 1999, 2000 Harald Koerfgen
  * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
- * Copyright (C) 2001, 2004  Maciej W. Rozycki
+ * Copyright (C) 2001, 2004, 2007  Maciej W. Rozycki
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -26,8 +26,6 @@
 static unsigned long icache_size, dcache_size;		/* Size in bytes */
 static unsigned long icache_lsize, dcache_lsize;	/* Size in bytes */
 
-#undef DEBUG_CACHE
-
 unsigned long __init r3k_cache_size(unsigned long ca_flags)
 {
 	unsigned long flags, status, dummy, size;
@@ -217,26 +215,6 @@ static void r3k_flush_dcache_range(unsig
 	write_c0_status(flags);
 }
 
-static inline unsigned long get_phys_page(unsigned long addr,
-					  struct mm_struct *mm)
-{
-	pgd_t *pgd;
-	pud_t *pud;
-	pmd_t *pmd;
-	pte_t *pte;
-	unsigned long physpage;
-
-	pgd = pgd_offset(mm, addr);
-	pud = pud_offset(pgd, addr);
-	pmd = pmd_offset(pud, addr);
-	pte = pte_offset(pmd, addr);
-
-	if ((physpage = pte_val(*pte)) & _PAGE_VALID)
-		return KSEG0ADDR(physpage & PAGE_MASK);
-
-	return 0;
-}
-
 static inline void r3k_flush_cache_all(void)
 {
 }
@@ -252,12 +230,40 @@ static void r3k_flush_cache_mm(struct mm
 }
 
 static void r3k_flush_cache_range(struct vm_area_struct *vma,
-	unsigned long start, unsigned long end)
+				  unsigned long start, unsigned long end)
 {
 }
 
-static void r3k_flush_cache_page(struct vm_area_struct *vma, unsigned long page, unsigned long pfn)
+static void r3k_flush_cache_page(struct vm_area_struct *vma,
+				 unsigned long addr, unsigned long pfn)
 {
+	unsigned long kaddr = KSEG0ADDR(pfn << PAGE_SHIFT);
+	int exec = vma->vm_flags & VM_EXEC;
+	struct mm_struct *mm = vma->vm_mm;
+	pgd_t *pgdp;
+	pud_t *pudp;
+	pmd_t *pmdp;
+	pte_t *ptep;
+
+	pr_debug("cpage[%08lx,%08lx]\n",
+		 cpu_context(smp_processor_id(), mm), addr);
+
+	/* No ASID => no such page in the cache.  */
+	if (cpu_context(smp_processor_id(), mm) == 0)
+		return;
+
+	pgdp = pgd_offset(mm, addr);
+	pudp = pud_offset(pgdp, addr);
+	pmdp = pmd_offset(pudp, addr);
+	ptep = pte_offset(pmdp, addr);
+
+	/* Invalid => no such page in the cache.  */
+	if (!(pte_val(*ptep) & _PAGE_PRESENT))
+		return;
+
+	r3k_flush_dcache_range(kaddr, kaddr + PAGE_SIZE);
+	if (exec)
+		r3k_flush_icache_range(kaddr, kaddr + PAGE_SIZE);
 }
 
 static void local_r3k_flush_data_cache_page(void *addr)
@@ -272,9 +278,7 @@ static void r3k_flush_cache_sigtramp(uns
 {
 	unsigned long flags;
 
-#ifdef DEBUG_CACHE
-	printk("csigtramp[%08lx]", addr);
-#endif
+	pr_debug("csigtramp[%08lx]\n", addr);
 
 	flags = read_c0_status();
 

Re: [PATCH] c-r3k: Implement flush_cache_range()

[Ralf Baechle]

On Wed, Oct 17, 2007 at 11:51:39AM +0100, Maciej W. Rozycki wrote:

>  Contrary to the belief of some, the R3000 and related processors did have 
> caches, both a data and an instruction cache.  Here is an implementation 
> of r3k_flush_cache_page(), which is the processor-specific back-end for 
> flush_cache_range(), done according to the spec in 
> Documentation/cachetlb.txt.
> 
>  While at it, remove an unused local function: get_phys_page(), do some 
> trivial formatting fixes and modernise debugging facilities.

Applied.

  Ralf