linux-mips
[Top] [All Lists]

[PATCH 3/4] MIPS: deal with larger physical offset

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH 3/4] MIPS: deal with larger physical offset
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 3 Jan 2010 21:17:26 +0100
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:reply-to:content-type :content-transfer-encoding:message-id; bh=kX57BdFPQTXbW/keEsNrQH+alTpJGe7jMIFG1/seobQ=; b=H17V+m4iFridvPE2hR6ZVDIZ90ppcHqzv9FBRHIAURHlNhKtoCeGQPjv+eWWBL4tLK NhPPk+/RYk3cqBRfFVDVhSmZnmrXiXhfN34qy1GjNT7sQb6hP2FUX6wMj8s5WTUDwZSy Guvegs77fuej839CABSZPHz1bsy7jdqgmANZw=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to:reply-to :content-type:content-transfer-encoding:message-id; b=sY3k5wa9hqdyanCcHZ7ycUyuC7G4PCjEQEY4SXkkXpa3LvNlS/GujE3u3To06OChsj 2ghwi1L5C1q5IdtffnSPOesby+kx/zoqpHuzYOV4C1mzhSSgCH2n30Ex+5a7n4X8OyEg VmA5V2Yo2ZSvpU7PIS6oMfvdhlh8Ep7+zavbU=
Reply-to: Florian Fainelli <florian@openwrt.org>
Sender: linux-mips-bounce@linux-mips.org
AR7 has a larger physical offset than other MIPS based
systems and therefore needs to setup handlers differently.
This version uses uasm instead of the hand crafted assembly
previously sent. This modification is also required for
running the kernel in mapped address space.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Eugene Konev <ejka@imfi.kspu.ru>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 308e434..dbf52ab 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -51,6 +51,8 @@
 #include <asm/stacktrace.h>
 #include <asm/irq.h>
 
+#include "../mm/uasm.h"
+
 extern void check_wait(void);
 extern asmlinkage void r4k_wait(void);
 extern asmlinkage void rollback_handle_int(void);
@@ -1283,9 +1285,18 @@ void *set_except_vector(int n, void *addr)
 
        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);
+               unsigned long jump_mask = ~((1 << 28) - 1);
+               u32 *buf = (u32 *)(ebase + 0x200);
+               unsigned int k0 = 26;
+               if((handler & jump_mask) == ((ebase + 0x200) & jump_mask)) {
+                       uasm_i_j(&buf, handler & jump_mask);
+                       uasm_i_nop(&buf);
+               } else {
+                       UASM_i_LA(&buf, k0, handler);
+                       uasm_i_jr(&buf, k0);
+                       uasm_i_nop(&buf);
+               }
+               local_flush_icache_range(ebase + 0x200, (unsigned long)buf);
        }
        return (void *)old_handler;
 }

<Prev in Thread] Current Thread [Next in Thread>