mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
--- a/arch/mips/kernel/traps.c
|
|
+++ b/arch/mips/kernel/traps.c
|
|
@@ -1255,9 +1255,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;
|
|
}
|
|
--- a/arch/mips/include/asm/page.h
|
|
+++ b/arch/mips/include/asm/page.h
|
|
@@ -200,8 +200,10 @@ typedef struct { unsigned long pgprot; }
|
|
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
|
|
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
|
|
|
-#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
|
|
-#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
|
|
+#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \
|
|
+ PHYS_OFFSET)
|
|
+#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \
|
|
+ PHYS_OFFSET)
|
|
|
|
#include <asm-generic/memory_model.h>
|
|
#include <asm-generic/getorder.h>
|