qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 14:22:25 +02:00
Code

detect ar7 at runtime in set_except_vector and remove useless volatile

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8824 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
matteo 2007-09-17 12:45:38 +00:00
parent f07284d46f
commit 351a3d1a64
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
target/linux/ar7/patches-2.6.22/100-board_support.patch
View File

@ -26,31 +26,35 @@ diff -urN linux-2.6.22/arch/mips/Kconfig linux-2.6.22.new/arch/mips/Kconfig
diff -urN linux-2.6.22/arch/mips/kernel/traps.c linux-2.6.22.new/arch/mips/kernel/traps.c diff -urN linux-2.6.22/arch/mips/kernel/traps.c linux-2.6.22.new/arch/mips/kernel/traps.c
--- linux-2.6.22/arch/mips/kernel/traps.c 2007-07-09 01:32:17.000000000 +0200 --- linux-2.6.22/arch/mips/kernel/traps.c 2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.new/arch/mips/kernel/traps.c 2007-07-11 02:32:39.000000000 +0200 +++ linux-2.6.22.new/arch/mips/kernel/traps.c 2007-07-11 02:32:39.000000000 +0200
@@ -1075,9 +1075,23 @@ void *set_except_vector(int n, void *addr) @@ -1074,11 +1074,23 @@ void *set_except_vector(int n, void *addr)
unsigned long old_handler = exception_handlers[n];
exception_handlers[n] = handler; exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) { - if (n == 0 && cpu_has_divec) {
+#ifdef CONFIG_AR7 - *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
+ /* lui k0, 0x0000 */ - (0x03ffffff & (handler >> 2));
+ *(volatile u32 *)(ebase + 0x200) = - flush_icache_range(ebase + 0x200, ebase + 0x204);
+ 0x3c1a0000 | (handler >> 16); - }
+ /* ori k0, 0x0000 */ + if (n == 0 && cpu_has_divec)
+ *(volatile u32 *)(ebase + 0x204) = + if ((handler ^ (ebase + 4)) & 0xfc000000) {
+ 0x375a0000 | (handler & 0xffff); + /* lui k0, 0x0000 */
+ /* jr k0 */ + *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
+ *(volatile u32 *)(ebase + 0x208) = 0x03400008; + /* ori k0, 0x0000 */
+ /* nop */ + *(u32 *)(ebase + 0x204) =
+ *(volatile u32 *)(ebase + 0x20C) = 0x00000000; + 0x375a0000 | (handler & 0xffff);
+ flush_icache_range(ebase + 0x200, ebase + 0x210); + /* jr k0 */
+#else + *(u32 *)(ebase + 0x208) = 0x03400008;
*(volatile u32 *)(ebase + 0x200) = 0x08000000 | + /* nop */
(0x03ffffff & (handler >> 2)); + *(u32 *)(ebase + 0x20C) = 0x00000000;
flush_icache_range(ebase + 0x200, ebase + 0x204); + flush_icache_range(ebase + 0x200, ebase + 0x210);
+#endif + } else {
} + *(volatile u32 *)(ebase + 0x200) =
+ 0x08000000 | (0x03ffffff & (handler >> 2));
+ flush_icache_range(ebase + 0x200, ebase + 0x204);
+ }
return (void *)old_handler; return (void *)old_handler;
} }
diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile
--- linux-2.6.22/arch/mips/Makefile 2007-07-09 01:32:17.000000000 +0200 --- linux-2.6.22/arch/mips/Makefile 2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.new/arch/mips/Makefile 2007-07-11 02:32:39.000000000 +0200 +++ linux-2.6.22.new/arch/mips/Makefile 2007-07-11 02:32:39.000000000 +0200