1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-21 07:41:43 +02:00
openwrt-xburst/target/linux/ar7/patches-2.6.32/100-board_support.patch
florian 27779065aa [ar7] add missing patch to arch/mips/kernel/traps.c to allow ar7 to setup its handler correctly (#6722)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19812 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-02-22 09:43:37 +00:00

29 lines
917 B
Diff

--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1256,9 +1256,22 @@ void *set_except_vector(int n, void *add
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
- *(u32 *)(ebase + 0x200) = 0x08000000 |
- (0x03ffffff & (handler >> 2));
- local_flush_icache_range(ebase + 0x200, ebase + 0x204);
+ if ((handler ^ (ebase + 4)) & 0xfc000000) {
+ /* lui k0, 0x0000 */
+ *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
+ /* ori k0, 0x0000 */
+ *(u32 *)(ebase + 0x204) =
+ 0x375a0000 | (handler & 0xffff);
+ /* jr k0 */
+ *(u32 *)(ebase + 0x208) = 0x03400008;
+ /* nop */
+ *(u32 *)(ebase + 0x20C) = 0x00000000;
+ flush_icache_range(ebase + 0x200, ebase + 0x210);
+ } else {
+ *(u32 *)(ebase + 0x200) =
+ 0x08000000 | (0x03ffffff & (handler >> 2));
+ flush_icache_range(ebase + 0x200, ebase + 0x204);
+ }
}
return (void *)old_handler;
}