commit e50c0a8fa60da9ac0e0a70caa8a3a803815c1f2f
author Ralf Baechle <ralf@linux-mips.org> Tue May 31 11:49:19 2005 +0000
committer Ralf Baechle <ralf@linux-mips.org> Sat Oct 29 19:31:17 2005 +0100
tree 1928e8b0a4b7fb615e5a9f65dc934ba2e74cb9cd
parent 10f650db1bcc193ea07d4f8c2f07315da38ea0c4

Support the MIPS32 / MIPS64 DSP ASE.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/branch.c

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 56aea5f..374de83 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -22,7 +22,7 @@
  */
 int __compute_return_epc(struct pt_regs *regs)
 {
-	unsigned int *addr, bit, fcr31;
+	unsigned int *addr, bit, fcr31, dspcontrol;
 	long epc;
 	union mips_instruction insn;
 
@@ -99,6 +99,18 @@
 				epc += 8;
 			regs->cp0_epc = epc;
 			break;
+		case bposge32_op:
+			if (!cpu_has_dsp)
+				goto sigill;
+
+			dspcontrol = rddsp(0x01);
+
+			if (dspcontrol >= 32) {
+				epc = epc + 4 + (insn.i_format.simmediate << 2);
+			} else
+				epc += 8;
+			regs->cp0_epc = epc;
+			break;
 		}
 		break;
 
@@ -200,4 +212,9 @@
 	printk("%s: unaligned epc - sending SIGBUS.\n", current->comm);
 	force_sig(SIGBUS, current);
 	return -EFAULT;
+
+sigill:
+	printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm);
+	force_sig(SIGBUS, current);
+	return -EFAULT;
 }