patch-2.4.20 linux-2.4.20/arch/mips/mm/c-rm7k.c
Next file: linux-2.4.20/arch/mips/mm/c-sb1.c
Previous file: linux-2.4.20/arch/mips/mm/c-r5432.c
Back to the patch index
Back to the overall index
- Lines: 88
- Date:
Thu Nov 28 15:53:10 2002
- Orig file:
linux-2.4.19/arch/mips/mm/c-rm7k.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/mips/mm/c-rm7k.c linux-2.4.20/arch/mips/mm/c-rm7k.c
@@ -139,7 +139,7 @@
a += sc_lsize;
}
- if (!rm7k_tcache_enabled)
+ if (!rm7k_tcache_enabled)
return;
a = addr & ~(tc_pagesize - 1);
@@ -150,7 +150,7 @@
a += tc_pagesize;
}
}
-
+
static void
rm7k_dma_cache_inv(unsigned long addr, unsigned long size)
{
@@ -165,7 +165,7 @@
a += sc_lsize;
}
- if (!rm7k_tcache_enabled)
+ if (!rm7k_tcache_enabled)
return;
a = addr & ~(tc_pagesize - 1);
@@ -210,10 +210,10 @@
}
-/*
+/*
* This function is executed in the uncached segment KSEG1.
* It must not touch the stack, because the stack pointer still points
- * into KSEG0.
+ * into KSEG0.
*
* Three options:
* - Write it in assembly and guarantee that we don't use the stack.
@@ -228,12 +228,12 @@
static __init void setup_scache(void)
{
int register i;
-
+
set_cp0_config(1<<3 /* CONF_SE */);
set_taglo(0);
set_taghi(0);
-
+
for (i=0; i<scache_size; i+=sc_lsize) {
__asm__ __volatile__ (
".set noreorder\n\t"
@@ -265,7 +265,7 @@
func();
printk("Done\n");
}
-
+
static inline void probe_tcache(unsigned long config)
{
if ((config >> 17) & 1)
@@ -275,10 +275,10 @@
* magic necessary to turn it on, and blindly asking the CPU to
* start using it would may give cache errors.
*
- * Also, board-specific knowledge may allow us to use the
+ * Also, board-specific knowledge may allow us to use the
* CACHE Flash_Invalidate_T instruction if the tag RAM supports
* it, and may specify the size of the L3 cache so we don't have
- * to probe it.
+ * to probe it.
*/
printk(KERN_INFO "Tertiary cache present, %s enabled\n",
config&(1<<12) ? "already" : "not (yet)");
@@ -319,9 +319,7 @@
: "r" (addr), "i" (Index_Store_Tag_I), "i" (Fill));
}
-#ifndef CONFIG_MIPS_UNCACHED
- change_cp0_config(CONF_CM_CMASK, CONF_CM_CACHABLE_NONCOHERENT);
-#endif
+ change_cp0_config(CONF_CM_CMASK, CONF_CM_DEFAULT);
probe_icache(config);
probe_dcache(config);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)