ccm: Add support for DPPI to CCM

Add use of DPPI to CCM if DPPI is defined.

Signed-off-by: Sletnes Bjørlo, Aurora <[email protected]>

Author: auroraslb

src/HW_models/NRF_AES_CCM.c

@@ -34,7 +34,11 @@
 #include <stdbool.h>
 #include "time_machine_if.h"
 #include "NRF_HW_model_top.h"
+#if defined(PPI_PRESENT)
 #include "NRF_PPI.h"
+#elif defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 #include "irq_ctrl.h"
 #include "irq_sources.h"
 #include "bs_tracing.h"
@@ -180,7 +184,16 @@ static void nrf_ccm_decrypt_rx(bool crc_error) {
 
 static void signal_EVENTS_ENDKSGEN() {
   NRF_CCM_regs.EVENTS_ENDKSGEN = 1;
+
+#if !defined(DPPI_PRESENT)
   nrf_ppi_event(CCM_EVENTS_ENDKSGEN);
+#else
+  if (NRF_CCM_regs.PUBLISH_ENDKSGEN & CCM_PUBLISH_ENDKSGEN_EN_Msk)
+  {
+    uint8_t channel  = NRF_CCM_regs.PUBLISH_ENDKSGEN & CCM_PUBLISH_ENDKSGEN_CHIDX_Msk;
+    nrf_dppi_publish(channel);
+  }
+#endif
 
   if (CCM_INTEN & CCM_INTENSET_ENDKSGEN_Msk) {
     hw_irq_ctrl_set_irq(NRF5_IRQ_CCM_AAR_IRQn);
@@ -193,7 +206,16 @@ static void signal_EVENTS_ENDKSGEN() {
 
 static void signal_EVENTS_ENDCRYPT(){
   NRF_CCM_regs.EVENTS_ENDCRYPT = 1;
+
+#if !defined(DPPI_PRESENT)
   nrf_ppi_event(CCM_EVENTS_ENDCRYPT);
+#else
+  if (NRF_CCM_regs.PUBLISH_ENDCRYPT & CCM_PUBLISH_ENDCRYPT_EN_Msk)
+  {
+    uint8_t channel  = NRF_CCM_regs.PUBLISH_ENDCRYPT & CCM_PUBLISH_ENDCRYPT_CHIDX_Msk;
+    nrf_dppi_publish(channel);
+  }
+#endif
 
   if (CCM_INTEN & CCM_INTENSET_ENDCRYPT_Msk) {
     hw_irq_ctrl_set_irq(NRF5_IRQ_CCM_AAR_IRQn);
@@ -202,7 +224,16 @@ static void signal_EVENTS_ENDCRYPT(){
 
 /* static void signal_EVENTS_ERROR(){
 	NRF_CCM_regs.EVENTS_ERROR = 1;
-	NRF_PPI_Event(CCM_EVENTS_ERROR);
+
+#if !defined(DPPI_PRESENT)
+  nrf_ppi_event(CCM_EVENTS_ERROR);
+#else
+  if (NRF_CCM_regs.PUBLISH_ERROR & CCM_PUBLISH_ERROR_EN_Msk)
+  {
+    uint8_t channel  = NRF_CCM_regs.PUBLISH_ERROR & CCM_PUBLISH_ERROR_CHIDX_Msk;
+    nrf_dppi_publish(channel);
+  }
+#endif
 
 	if (CCM_INTEN & CCM_INTENSET_ERROR_Msk) {
 		hw_irq_ctrl_set_irq(NRF5_IRQ_CCM_AAR_IRQn);

src/nrfx/hal/nrf_ccm.c

@@ -8,6 +8,9 @@
 #include "hal/nrf_ccm.h"
 #include "bs_tracing.h"
 #include "NRF_AES_CCM.h"
+#if defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 
 void nrf_ccm_task_trigger(NRF_CCM_Type * p_reg, nrf_ccm_task_t task)
 {
@@ -34,3 +37,68 @@ void nrf_ccm_int_disable(NRF_CCM_Type * p_reg, uint32_t mask)
   nrf_ccm_regw_sideeffects_INTENCLR();
 }
 
+#if defined(DPPI_PRESENT)
+
+void nrf_ccm_subscriber_add(nrf_ccm_task_t task, uint8_t channel)
+{
+  switch(task) 
+  {
+    case NRF_CCM_TASK_KSGEN:
+      nrf_dppi_subscriber_add(channel, nrf_ccm_TASK_KSGEN);
+      break;
+    case NRF_CCM_TASK_CRYPT:
+      nrf_dppi_subscriber_add(channel, nrf_ccm_TASK_CRYPT);
+      break;
+    case NRF_CCM_TASK_STOP:
+      nrf_dppi_subscriber_add(channel, nrf_ccm_TASK_STOP);
+      break;
+#if defined(CCM_RATEOVERRIDE_RATEOVERRIDE_Pos) || defined(__NRFX_DOXYGEN__)
+    case NRF_CCM_TASK_RATEOVERRIDE:
+      nrf_dppi_subscriber_add(channel, nrf_ccm_TASK_RATEOVERRIDE);
+      break;
+#endif
+    default:
+      break;
+  }
+}
+
+void nrf_ccm_subscriber_remove(nrf_ccm_task_t task)
+{
+  switch(task) 
+  {
+    case NRF_CCM_TASK_KSGEN:
+      nrf_dppi_subscriber_remove(nrf_ccm_TASK_KSGEN);
+      break;
+    case NRF_CCM_TASK_CRYPT:
+      nrf_dppi_subscriber_remove(nrf_ccm_TASK_CRYPT);
+      break;
+    case NRF_CCM_TASK_STOP:
+      nrf_dppi_subscriber_remove(nrf_ccm_TASK_STOP);
+      break;
+#if defined(CCM_RATEOVERRIDE_RATEOVERRIDE_Pos) || defined(__NRFX_DOXYGEN__)
+    case NRF_CCM_TASK_RATEOVERRIDE:
+      nrf_dppi_subscriber_remove(nrf_ccm_TASK_RATEOVERRIDE);
+      break;
+#endif
+    default:
+      break;
+  }
+}
+
+void nrf_ccm_subscribe_set(NRF_CCM_Type * p_reg,
+                           nrf_ccm_task_t task,
+                           uint8_t        channel)
+{
+  *((volatile uint32_t *) ((uint8_t *) p_reg + (uint32_t) task + 0x80uL)) =
+            ((uint32_t)channel | CCM_SUBSCRIBE_KSGEN_EN_Msk);
+  nrf_ccm_subscriber_add(task, channel);
+}
+
+void nrf_ccm_subscribe_clear(NRF_CCM_Type * p_reg,
+                             nrf_ccm_task_t task)
+{
+  *((volatile uint32_t *) ((uint8_t *) p_reg + (uint32_t) task + 0x80uL)) = 0;
+  nrf_ccm_subscriber_remove(task);
+}
+
+#endif // defined(DPPI_PRESENT)