Update all caliptra_isr with new DMA interrupts; fw updates so all sm…

…oke tests pass
chipsalliance · Jul 25, 2024 · 7e156a7 · 7e156a7
1 parent 2f8d8c0
commit 7e156a7
Show file tree

Hide file tree

Showing 57 changed files with 335 additions and 13 deletions.
diff --git a/src/integration/test_suites/c_intr_handler/caliptra_isr.h b/src/integration/test_suites/c_intr_handler/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -222,5 +224,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/caliptra_fmc/caliptra_isr.h b/src/integration/test_suites/caliptra_fmc/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -251,5 +253,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/caliptra_rt/caliptra_isr.h b/src/integration/test_suites/caliptra_rt/caliptra_isr.h
@@ -54,6 +54,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -247,5 +249,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/caliptra_top/caliptra_isr.h b/src/integration/test_suites/caliptra_top/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -231,5 +233,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/hello_world_iccm/caliptra_isr.h b/src/integration/test_suites/hello_world_iccm/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/infinite_loop/caliptra_isr.h b/src/integration/test_suites/infinite_loop/caliptra_isr.h
@@ -49,6 +49,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 
 //////////////////////////////////////////////////////////////////////////////
@@ -87,4 +89,8 @@ inline void service_soc_ifc_notif_intr () {return;}
 inline void service_sha512_acc_error_intr() {return;}
 inline void service_sha512_acc_notif_intr() {return;}
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
+
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/libs/clk_gate/clk_gate.c b/src/integration/test_suites/libs/clk_gate/clk_gate.c
@@ -19,7 +19,7 @@
 #include "printf.h"
 
 void set_mit0_and_halt_core(uint32_t mitb0, uint32_t mie_en) {
-    VPRINTF(LOW, "Enabling internal timer0 and halting core\n");
+    VPRINTF(LOW, "En int tmr0, hlt core\n");
     //Enable internal timer0
         __asm__ volatile ("csrwi    %0, %1" \
                         : /* output: none */        \
@@ -96,4 +96,4 @@ void halt_core() {
                     : /* output: none */        \
                     : "i" (0x7c6), "i" (0x03)  /* input : immediate  */ \
                     : /* clobbers: none */);
-}
+}
diff --git a/src/integration/test_suites/memCpy_ROM_to_dccm/caliptra_isr.h b/src/integration/test_suites/memCpy_ROM_to_dccm/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/memCpy_dccm_to_iccm/caliptra_isr.h b/src/integration/test_suites/memCpy_dccm_to_iccm/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/pv_hash_and_sign/caliptra_isr.h b/src/integration/test_suites/pv_hash_and_sign/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/pv_hash_reset/caliptra_isr.h b/src/integration/test_suites/pv_hash_reset/caliptra_isr.h
@@ -65,6 +65,8 @@ inline void service_soc_ifc_error_intr  () {printf("ERROR");}
 inline void service_soc_ifc_notif_intr  () {printf("ERROR");}
 inline void service_sha512_acc_error_intr() {printf("ERROR");}
 inline void service_sha512_acc_notif_intr() {printf("ERROR");}
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
 
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/randomized_pcr_signing/caliptra_isr.h b/src/integration/test_suites/randomized_pcr_signing/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_ahb_mux/caliptra_isr.h b/src/integration/test_suites/smoke_test_ahb_mux/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {return;}
+inline void service_axi_dma_notif_intr() {return;}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_cg_wdt/caliptra_isr.h b/src/integration/test_suites/smoke_test_cg_wdt/caliptra_isr.h
@@ -58,6 +58,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -128,5 +130,8 @@ inline void service_soc_ifc_notif_intr  () {
 inline void service_sha512_acc_error_intr() {printf("ERROR");}
 inline void service_sha512_acc_notif_intr() {printf("ERROR");}
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_clk_gating/caliptra_isr.h b/src/integration/test_suites/smoke_test_clk_gating/caliptra_isr.h
@@ -58,6 +58,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -145,5 +147,8 @@ inline void service_soc_ifc_notif_intr () {
 inline void service_sha512_acc_error_intr() {printf("ERROR");}
 inline void service_sha512_acc_notif_intr() {printf("ERROR");}
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_clk_gating/smoke_test_clk_gating.c b/src/integration/test_suites/smoke_test_clk_gating/smoke_test_clk_gating.c
@@ -137,9 +137,9 @@ void main() {
                       : /* clobbers: none */);
 
     //------------------------------------------------------
-    //Wake SOC up for APB tx and core using timer int later
+    //Wake SOC up for AXI tx and core using timer int later
     //------------------------------------------------------
-        printf("Wake up SOC clk on APB txns and later wake up core using timer interrupt\n");
+        printf("Wake up SOC clk on AXI txns and later wake up core using timer interrupt\n");
         //Machine intr enable reg (mie) - enable timer int 
         __asm__ volatile ("csrw    %0, %1" \
                       : /* output: none */        \

diff --git a/src/integration/test_suites/smoke_test_datavault_basic/caliptra_isr.h b/src/integration/test_suites/smoke_test_datavault_basic/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_datavault_lock/caliptra_isr.h b/src/integration/test_suites/smoke_test_datavault_lock/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_datavault_mini/caliptra_isr.h b/src/integration/test_suites/smoke_test_datavault_mini/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_datavault_reset/caliptra_isr.h b/src/integration/test_suites/smoke_test_datavault_reset/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_doe_cg/caliptra_isr.h b/src/integration/test_suites/smoke_test_doe_cg/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_doe_rand/caliptra_isr.h b/src/integration/test_suites/smoke_test_doe_rand/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H
diff --git a/src/integration/test_suites/smoke_test_doe_scan/caliptra_isr.h b/src/integration/test_suites/smoke_test_doe_scan/caliptra_isr.h
@@ -56,6 +56,8 @@ typedef struct {
     uint32_t soc_ifc_notif;
     uint32_t sha512_acc_error;
     uint32_t sha512_acc_notif;
+    uint32_t axi_dma_error;
+    uint32_t axi_dma_notif;
 } caliptra_intr_received_s;
 extern volatile caliptra_intr_received_s cptra_intr_rcv;
 
@@ -243,5 +245,8 @@ inline void service_sha512_acc_notif_intr() {
     }
 }
 
+inline void service_axi_dma_error_intr() {printf("ERROR");}
+inline void service_axi_dma_notif_intr() {printf("ERROR");}
+
 
 #endif //CALIPTRA_ISR_H