[ot] hw/opentitan: ot_aon_timer: Connect watchdog bark NMI

The aon timer should send an NMI signal to Ibex when its watchdog timer
barks. Now that the NMI functionality is in place, we can appropriately
hook up this signal, which should appear before the equivalent IRQ.

Signed-off-by: Alex Jones <[email protected]>

Author: AlexJones0

hw/opentitan/ot_aon_timer.c

@@ -203,8 +203,8 @@ static void ot_aon_timer_update_irqs(OtAonTimerState *s)
     trace_ot_aon_timer_irqs(s->ot_id, wkup, bark, s->wdog_bite);
 
     ibex_irq_set(&s->irq_wkup, wkup);
-    ibex_irq_set(&s->irq_bark, bark);
     ibex_irq_set(&s->nmi_bark, bark);
+    ibex_irq_set(&s->irq_bark, bark);
     ibex_irq_set(&s->pwrmgr_wkup, wkup);
     ibex_irq_set(&s->pwrmgr_bite, s->wdog_bite);
 }

hw/riscv/ot_earlgrey.c

@@ -791,6 +791,8 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
                              OT_PWRMGR_WKUP, OT_PWRMGR_WAKEUP_AON_TIMER),
             OT_EG_SOC_SIGNAL(OT_AON_TIMER_BITE, 0, PWRMGR, \
                              OT_PWRMGR_RST, OT_EG_RESET_AON_TIMER),
+            OT_EG_SOC_SIGNAL(OT_AON_TIMER_BARK, 0, IBEX_WRAPPER, \
+                             OT_IBEX_WRAPPER_NMI, OT_IBEX_NMI_WDOG),
             OT_EG_SOC_GPIO_ALERT(0, 31)
         ),
         .prop = IBEXDEVICEPROPDEFS(