Don't assume PRV1/2 and IE1/2 are reset

[riscv-tests.git] / isa / rv64si / ipi.S

diff --git a/isa/rv64si/ipi.S b/isa/rv64si/ipi.S
index 8db016369aeb87aac96c959c7f501e25c2d5b72d..e45c66321f424bdeebae728930c2252b584ae028 100644 (file)
--- a/isa/rv64si/ipi.S
+++ b/isa/rv64si/ipi.S
@@ -1,3 +1,5 @@
+# See LICENSE for license details.
+
 #*****************************************************************************
 # ipi.S
 #-----------------------------------------------------------------------------
@@ -8,36 +10,35 @@
 #include "riscv_test.h"
 #include "test_macros.h"
 
-RVTEST_RV64S
+RVTEST_RV64M
 RVTEST_CODE_BEGIN
 
-  # clear pending IPIs then enable interrupts
-  la a0, handler
-  mtpcr a0, evec
-  mtpcr x0, clear_ipi
-  mfpcr a0, status
-  li a1, SR_EI | (1 << (IRQ_IPI + SR_IM_SHIFT))
-  or a0, a0, a1
-  mtpcr a0, status
+  # enable interrupts
+  csrs mstatus, MSTATUS_IE
 
-  # wait for all cores to boot
+  # get a unique core id
   la a0, coreid
   li a1, 1
-  amoadd.w x0, a1, 0(a0)
-  lw a3, 4(x0)
-  1: lw a1, 0(a0)
-  blt a1, a3, 1b
+  amoadd.w a2, a1, (a0)
+  
+  # for now, only run this on core 0
+  1:li a3, 1
+  bgeu a2, a3, 1b
+  
+  # wait for all cores to boot
+  1: lw a1, (a0)
+  bltu a1, a3, 1b
 
   # IPI dominoes
-  mfpcr a0, hartid
+  csrr a0, hartid
   1: bnez a0, 1b
   add a0, a0, 1
   rem a0, a0, a3
-  mtpcr a0, send_ipi
-  1: b 1b
+  csrw send_ipi, a0
+  1: j 1b
 
-  handler:
-  mfpcr a0, hartid
+mtvec:
+  csrr a0, hartid
   bnez a0, 2f
   RVTEST_PASS
 
@@ -45,8 +46,8 @@ RVTEST_CODE_BEGIN
 
   2: add a0, a0, 1
   rem a0, a0, a3
-  mtpcr a0, send_ipi
-  1: b 1b
+  csrw send_ipi, a0
+  1: j 1b
 
 RVTEST_CODE_END