mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-26 06:34:05 +02:00
add even more workarounds for bcm4710, remove -fno-delayed-branch from kernel cflags -- not needed anymore
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1132 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
parent
476017a138
commit
5ae1a8826d
@ -187,7 +187,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
|
||||
touch $(LINUX_DIR)/.depend_done
|
||||
|
||||
$(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
|
||||
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) CFLAGS_KERNEL="-fno-delayed-branch " $(LINUX_FORMAT)
|
||||
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_FORMAT)
|
||||
|
||||
$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
|
||||
cp -fa $< $@
|
||||
@ -198,7 +198,7 @@ $(LINUX_IMAGE): $(LINUX_KERNEL)
|
||||
|
||||
$(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE)
|
||||
rm -rf $(LINUX_BUILD_DIR)/modules
|
||||
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) CFLAGS_KERNEL="-fno-delayed-branch " modules
|
||||
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules
|
||||
$(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install
|
||||
touch $(LINUX_DIR)/.modules_done
|
||||
|
||||
|
||||
@ -106,3 +106,17 @@ diff -urN linux.old/arch/mips/mm/tlbex-r4k.S linux.dev/arch/mips/mm/tlbex-r4k.S
|
||||
GET_PGD(k0, k1) # get pgd pointer
|
||||
mfc0 k0, CP0_BADVADDR # Get faulting address
|
||||
srl k0, k0, _PGDIR_SHIFT # get pgd only bits
|
||||
diff -urN linux.old/arch/mips/kernel/entry.S linux.dev/arch/mips/kernel/entry.S
|
||||
--- linux.old/arch/mips/kernel/entry.S 2003-08-25 13:44:40.000000000 +0200
|
||||
+++ linux.dev/arch/mips/kernel/entry.S 2005-06-01 20:10:36.000000000 +0200
|
||||
@@ -100,6 +100,10 @@
|
||||
* and R4400 SC and MC versions.
|
||||
*/
|
||||
NESTED(except_vec3_generic, 0, sp)
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ nop
|
||||
+ nop
|
||||
+#endif
|
||||
#if R5432_CP0_INTERRUPT_WAR
|
||||
mfc0 k0, CP0_INDEX
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
|
||||
--- linux.old/arch/mips/mm/c-r4k.c 2005-05-28 17:42:06.000000000 +0200
|
||||
+++ linux.dev/arch/mips/mm/c-r4k.c 2005-05-29 18:26:34.000000000 +0200
|
||||
--- linux.old/arch/mips/mm/c-r4k.c 2005-06-01 18:42:44.000000000 +0200
|
||||
+++ linux.dev/arch/mips/mm/c-r4k.c 2005-06-01 18:49:07.000000000 +0200
|
||||
@@ -14,6 +14,12 @@
|
||||
#include <linux/mm.h>
|
||||
#include <linux/bitops.h>
|
||||
@ -26,7 +26,29 @@ diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
|
||||
while (1) {
|
||||
/* Hit_Writeback_Inv_D */
|
||||
protected_writeback_dcache_line(addr);
|
||||
@@ -509,6 +520,10 @@
|
||||
@@ -405,6 +416,10 @@
|
||||
else {
|
||||
addr = start & ~(ic_lsize - 1);
|
||||
aend = (end - 1) & ~(ic_lsize - 1);
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_FILL_TLB(addr);
|
||||
+ BCM4710_FILL_TLB(aend);
|
||||
+#endif
|
||||
while (1) {
|
||||
/* Hit_Invalidate_I */
|
||||
protected_flush_icache_line(addr);
|
||||
@@ -487,6 +502,10 @@
|
||||
|
||||
a = addr & ~(sc_lsize - 1);
|
||||
end = (addr + size - 1) & ~(sc_lsize - 1);
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_FILL_TLB(a);
|
||||
+ BCM4710_FILL_TLB(end);
|
||||
+#endif
|
||||
while (1) {
|
||||
flush_scache_line(a); /* Hit_Writeback_Inv_SD */
|
||||
if (a == end)
|
||||
@@ -509,6 +528,10 @@
|
||||
R4600_HIT_CACHEOP_WAR_IMPL;
|
||||
a = addr & ~(dc_lsize - 1);
|
||||
end = (addr + size - 1) & ~(dc_lsize - 1);
|
||||
@ -37,7 +59,18 @@ diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
|
||||
while (1) {
|
||||
flush_dcache_line(a); /* Hit_Writeback_Inv_D */
|
||||
if (a == end)
|
||||
@@ -576,6 +591,10 @@
|
||||
@@ -537,6 +560,10 @@
|
||||
|
||||
a = addr & ~(sc_lsize - 1);
|
||||
end = (addr + size - 1) & ~(sc_lsize - 1);
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_FILL_TLB(a);
|
||||
+ BCM4710_FILL_TLB(end);
|
||||
+#endif
|
||||
while (1) {
|
||||
flush_scache_line(a); /* Hit_Writeback_Inv_SD */
|
||||
if (a == end)
|
||||
@@ -576,6 +603,10 @@
|
||||
unsigned long ic_lsize = current_cpu_data.icache.linesz;
|
||||
unsigned long dc_lsize = current_cpu_data.dcache.linesz;
|
||||
|
||||
@ -49,8 +82,8 @@ diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
|
||||
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
|
||||
protected_flush_icache_line(addr & ~(ic_lsize - 1));
|
||||
diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kcache.h
|
||||
--- linux.old/include/asm-mips/r4kcache.h 2005-05-28 17:42:06.000000000 +0200
|
||||
+++ linux.dev/include/asm-mips/r4kcache.h 2005-05-29 18:34:46.000000000 +0200
|
||||
--- linux.old/include/asm-mips/r4kcache.h 2005-06-01 18:42:43.000000000 +0200
|
||||
+++ linux.dev/include/asm-mips/r4kcache.h 2005-06-01 19:07:11.000000000 +0200
|
||||
@@ -15,6 +15,25 @@
|
||||
#include <asm/asm.h>
|
||||
#include <asm/cacheops.h>
|
||||
@ -86,7 +119,17 @@ diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kca
|
||||
|
||||
static inline void flush_icache_line_indexed(unsigned long addr)
|
||||
{
|
||||
@@ -47,6 +68,10 @@
|
||||
@@ -32,6 +53,9 @@
|
||||
|
||||
static inline void flush_dcache_line_indexed(unsigned long addr)
|
||||
{
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+#endif
|
||||
cache_op(Index_Writeback_Inv_D, addr);
|
||||
}
|
||||
|
||||
@@ -47,6 +71,10 @@
|
||||
|
||||
static inline void flush_dcache_line(unsigned long addr)
|
||||
{
|
||||
@ -97,7 +140,55 @@ diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kca
|
||||
cache_op(Hit_Writeback_Inv_D, addr);
|
||||
}
|
||||
|
||||
@@ -196,7 +221,13 @@
|
||||
@@ -91,6 +119,9 @@
|
||||
*/
|
||||
static inline void protected_writeback_dcache_line(unsigned long addr)
|
||||
{
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+#endif
|
||||
__asm__ __volatile__(
|
||||
".set noreorder\n\t"
|
||||
".set mips3\n"
|
||||
@@ -148,8 +179,12 @@
|
||||
unsigned long ws, addr;
|
||||
|
||||
for (ws = 0; ws < ws_end; ws += ws_inc)
|
||||
- for (addr = start; addr < end; addr += 0x200)
|
||||
+ for (addr = start; addr < end; addr += 0x200) {
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+#endif
|
||||
cache16_unroll32(addr|ws,Index_Writeback_Inv_D);
|
||||
+ }
|
||||
}
|
||||
|
||||
static inline void blast_dcache16_page(unsigned long page)
|
||||
@@ -158,6 +193,9 @@
|
||||
unsigned long end = start + PAGE_SIZE;
|
||||
|
||||
do {
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+#endif
|
||||
cache16_unroll32(start,Hit_Writeback_Inv_D);
|
||||
start += 0x200;
|
||||
} while (start < end);
|
||||
@@ -173,8 +211,12 @@
|
||||
unsigned long ws, addr;
|
||||
|
||||
for (ws = 0; ws < ws_end; ws += ws_inc)
|
||||
- for (addr = start; addr < end; addr += 0x200)
|
||||
+ for (addr = start; addr < end; addr += 0x200) {
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+#endif
|
||||
cache16_unroll32(addr|ws,Index_Writeback_Inv_D);
|
||||
+ }
|
||||
}
|
||||
|
||||
static inline void blast_icache16(void)
|
||||
@@ -196,7 +238,13 @@
|
||||
unsigned long start = page;
|
||||
unsigned long end = start + PAGE_SIZE;
|
||||
|
||||
@ -111,7 +202,7 @@ diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kca
|
||||
cache16_unroll32(start,Hit_Invalidate_I);
|
||||
start += 0x200;
|
||||
} while (start < end);
|
||||
@@ -291,8 +322,12 @@
|
||||
@@ -291,8 +339,12 @@
|
||||
unsigned long ws, addr;
|
||||
|
||||
for (ws = 0; ws < ws_end; ws += ws_inc)
|
||||
@ -125,7 +216,7 @@ diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kca
|
||||
}
|
||||
|
||||
static inline void blast_dcache32_page(unsigned long page)
|
||||
@@ -300,6 +335,9 @@
|
||||
@@ -300,7 +352,13 @@
|
||||
unsigned long start = page;
|
||||
unsigned long end = start + PAGE_SIZE;
|
||||
|
||||
@ -133,9 +224,13 @@ diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kca
|
||||
+ __asm__ __volatile__("nop;nop;nop;nop");
|
||||
+#endif
|
||||
do {
|
||||
+#ifdef CONFIG_BCM4710
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+#endif
|
||||
cache32_unroll32(start,Hit_Writeback_Inv_D);
|
||||
start += 0x400;
|
||||
@@ -339,6 +377,9 @@
|
||||
} while (start < end);
|
||||
@@ -339,6 +397,9 @@
|
||||
unsigned long start = page;
|
||||
unsigned long end = start + PAGE_SIZE;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user