Hello!

This patch will boot up to multi-user mode in exchange for "Abort trap".
Crossing fingers,

NOW:
https://gist.githubusercontent.com/nullnilaki/f836c396361c4bfc482c/raw/3c8d3d500008a6aa3aa761bf7fde96816b19e930/PowerIndigo2.log

Apply patch:
https://gist.githubusercontent.com/nullnilaki/49507b2e4cd0368e8cdf/raw/822d81762d83f0886273b6d8139b9c96225cd519/PowerIndigo2.log

----------------------------------------------------------------------------------
--- /usr/src/sys/arch/mips64/mips64.orig/exception_tfp.S    Sun Sep 20
04:12:11 2015
+++ /usr/src/sys/arch/mips64/mips64/exception_tfp.S    Sun Sep 20 04:49:18 2015
@@ -90,16 +90,19 @@
      NOP
     DMFC0    k1, COP_0_UBASE        # PCB_SEGTAB(CI_CURPROCPADDR(curcpu))
     MFC0_HAZARD
+        PTR_SRL k0, SEGSHIFT
     PTR_SLL    k0, LOGREGSZ
     PTR_ADDU k1, k0
     PTR_L    k1, 0(k1)        # get pointer to page table
     DMFC0    k0, COP_0_WORK0        # saved COP_0_VADDR
     MFC0_HAZARD
     beqz    k1, _inv_seg
-     PTR_SRL k0, PAGE_SHIFT - 2
-    andi    k0, ((NPTEPG / 2) - 1) << 2
+         PTR_SRL k0, PAGE_SHIFT
+        andi    k0, NPTEPG - 1
     PTR_ADDU k1, k0
     lwu    k0, 0(k1)        # get pte
+        dsll    k0, k0, 24
+        dsrl    k0, k0, 24
     DMTC0    k0, COP_0_TLB_LO
     MTC0_HAZARD
     TLBW
@@ -163,6 +166,8 @@
     MFC0_HAZARD
     PTR_ADDU k1, k0
     lwu    k0, 0(k1)        # get pte
+        dsll    k0, k0, 24
+        dsrl    k0, k0, 24
     DMTC0    k0, COP_0_TLB_LO
     MTC0_HAZARD
     TLBW
@@ -221,12 +226,14 @@
     MFC0_HAZARD
     PTR_ADDU k1, k0
     lwu    k0, 0(k1)        # get pte
-    andi    k1, k0, PG_V
-    beqz    k1, k_general        # if not valid
-     NOP
+        dsll    k0, k0, 24
+        dsrl    k0, k0, 24
+        DMTC0   k0, COP_0_TLB_LO
+        MTC0_HAZARD
+        and     k0, k0, PG_V
+        beqz    k0, k_general           # if not valid
+         NOP

-    DMTC0    k0, COP_0_TLB_LO
-    MTC0_HAZARD
     TLBW
     ERET
     .set    at
----------------------------------------------------------------------------------

__
Naruaki Etomi
nullnil...@gmail.com

Reply via email to