[ot] hw/opentitan: ot_rstmgr, ot_pwrmgr: replace dedicated API with IRQ line

Reset request is now managed with an IRQ line, not a dedicated function call.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>

Author: rivos-eblot

hw/opentitan/ot_pwrmgr.c

@@ -239,16 +239,16 @@ struct OtPwrMgrState {
     IbexIRQ cpu_enable;
     IbexIRQ pwr_lc_req;
     IbexIRQ pwr_otp_req;
+    IbexIRQ reset_req;
 
     OtPwrMgrFastState f_state;
     OtPwrMgrSlowState s_state;
     OtPwrMgrEvents fsm_events;
 
     uint32_t *regs;
-    OtPwrMgrResetReq reset_req;
+    OtPwrMgrResetReq reset_request;
 
     char *ot_id;
-    OtRstMgrState *rstmgr;
     uint8_t num_rom;
     uint8_t version;
     bool main; /* main power manager (for machines w/ multiple PwrMgr) */
@@ -500,16 +500,16 @@ static void ot_pwrmgr_rst_req(void *opaque, int irq, int level)
         }
         s->regs[R_RESET_STATUS] |= rstbit;
 
-        g_assert(s->reset_req.domain == OT_PWRMGR_NO_DOMAIN);
+        g_assert(s->reset_request.domain == OT_PWRMGR_NO_DOMAIN);
 
-        s->reset_req.domain = OT_PWRMGR_SLOW_DOMAIN;
+        s->reset_request.domain = OT_PWRMGR_SLOW_DOMAIN;
 
         int req = PWRMGR_RESET_DISPATCH[s->version][src];
         if (req < 0) {
             /* not yet implemented */
             g_assert_not_reached();
         }
-        s->reset_req.req = req;
+        s->reset_request.req = req;
 
         trace_ot_pwrmgr_reset_req(s->ot_id, "scheduling reset", src);
 
@@ -538,10 +538,10 @@ static void ot_pwrmgr_sw_rst_req(void *opaque, int irq, int level)
 
         s->regs[R_RESET_STATUS] |= rstbit;
 
-        g_assert(s->reset_req.domain == OT_PWRMGR_NO_DOMAIN);
+        g_assert(s->reset_request.domain == OT_PWRMGR_NO_DOMAIN);
 
-        s->reset_req.req = OT_RSTMGR_RESET_SW;
-        s->reset_req.domain = OT_PWRMGR_FAST_DOMAIN;
+        s->reset_request.req = OT_RSTMGR_RESET_SW;
+        s->reset_request.domain = OT_PWRMGR_FAST_DOMAIN;
 
         trace_ot_pwrmgr_reset_req(s->ot_id, "scheduling SW reset", 0);
 
@@ -643,9 +643,10 @@ static void ot_pwrmgr_fast_fsm_tick(OtPwrMgrState *s)
         /* fallthrough */
     case OT_PWR_FAST_ST_RESET_PREP:
         PWR_CHANGE_FAST_STATE(s, RESET_WAIT);
-        ot_rstmgr_reset_req(s->rstmgr, (bool)s->reset_req.domain,
-                            s->reset_req.req);
-        s->reset_req.domain = OT_PWRMGR_NO_DOMAIN;
+        ibex_irq_set(&s->reset_req,
+                     OT_RSTMGR_RESET_REQUEST(s->reset_request.domain,
+                                             s->reset_request.req));
+        s->reset_request.domain = OT_PWRMGR_NO_DOMAIN;
         break;
     /* NOLINTNEXTLINE */
     case OT_PWR_FAST_ST_RESET_WAIT:
@@ -880,8 +881,6 @@ static Property ot_pwrmgr_properties[] = {
     DEFINE_PROP_UINT8("version", OtPwrMgrState, version, UINT8_MAX),
     DEFINE_PROP_BOOL("fetch-ctrl", OtPwrMgrState, fetch_ctrl, false),
     DEFINE_PROP_BOOL("main", OtPwrMgrState, main, true),
-    DEFINE_PROP_LINK("rstmgr", OtPwrMgrState, rstmgr, TYPE_OT_RSTMGR,
-                     OtRstMgrState *),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -917,8 +916,6 @@ static void ot_pwrmgr_reset_enter(Object *obj, ResetType type)
         c->parent_phases.enter(obj, type);
     }
 
-    assert(s->rstmgr);
-
     timer_del(s->cdc_sync);
     memset(s->regs, 0, REGS_SIZE);
 
@@ -938,6 +935,7 @@ static void ot_pwrmgr_reset_enter(Object *obj, ResetType type)
     ibex_irq_set(&s->pwr_otp_req, 0);
     ibex_irq_set(&s->pwr_lc_req, 0);
     ibex_irq_set(&s->alert, 0);
+    ibex_irq_set(&s->reset_req, 0);
 }
 
 static void ot_pwrmgr_reset_exit(Object *obj)
@@ -991,6 +989,7 @@ static void ot_pwrmgr_init(Object *obj)
     ibex_qdev_init_irq(obj, &s->pwr_otp_req, OT_PWRMGR_OTP_REQ);
     ibex_qdev_init_irq(obj, &s->cpu_enable, OT_PWRMGR_CPU_EN);
     ibex_qdev_init_irq(obj, &s->strap, OT_PWRMGR_STRAP);
+    ibex_qdev_init_irq(obj, &s->reset_req, OT_PWRMGR_RST_REQ);
 
     s->cdc_sync = timer_new_ns(OT_VIRTUAL_CLOCK, &ot_pwrmgr_cdc_sync, s);
 

hw/opentitan/ot_rstmgr.c

@@ -200,19 +200,6 @@ static const char *OT_RST_MGR_REQUEST_NAMES[] = {
         OT_RST_MGR_REQUEST_NAMES[(_req_)] : \
         "?"
 
-/* -------------------------------------------------------------------------- */
-/* Public API */
-/* -------------------------------------------------------------------------- */
-
-void ot_rstmgr_reset_req(OtRstMgrState *s, bool fastclk, OtRstMgrResetReq req)
-{
-    s->regs[R_RESET_INFO] = 1u << req;
-
-    trace_ot_rstmgr_reset_req(REQ_NAME(req), req, fastclk);
-
-    qemu_bh_schedule(s->bus_reset_bh);
-}
-
 /* -------------------------------------------------------------------------- */
 /* Private implementation */
 /* -------------------------------------------------------------------------- */
@@ -303,6 +290,30 @@ static void ot_rstmgr_update_sw_reset(OtRstMgrState *s, unsigned devix)
     g_free(desc.path);
 }
 
+static void ot_rstmgr_reset_req(void *opaque, int irq, int level)
+{
+    OtRstMgrState *s = opaque;
+
+    if (!level) {
+        /* reset line released */
+        return;
+    }
+
+    g_assert(irq == 0);
+
+    bool fastclk = ((unsigned)level >> 8u) & 1u;
+
+    level &= 0xff;
+    g_assert(level < OT_RSTMGR_RESET_COUNT);
+
+    OtRstMgrResetReq req = (OtRstMgrResetReq)level;
+    s->regs[R_RESET_INFO] = 1u << req;
+
+    trace_ot_rstmgr_reset_req(REQ_NAME(req), req, fastclk);
+
+    qemu_bh_schedule(s->bus_reset_bh);
+}
+
 static uint64_t ot_rstmgr_regs_read(void *opaque, hwaddr addr, unsigned size)
 {
     OtRstMgrState *s = opaque;
@@ -550,6 +561,9 @@ static void ot_rstmgr_init(Object *obj)
     ibex_qdev_init_irq(obj, &s->sw_reset, OT_RSTMGR_SW_RST);
     ibex_qdev_init_irqs(obj, s->alerts, OT_DEVICE_ALERT, PARAM_NUM_ALERTS);
 
+    qdev_init_gpio_in_named(DEVICE(obj), &ot_rstmgr_reset_req,
+                            OT_RSTMGR_RST_REQ, 1);
+
     s->bus_reset_bh = qemu_bh_new(&ot_rstmgr_reset_bus, s);
 }
 

include/hw/opentitan/ot_pwrmgr.h

@@ -57,6 +57,7 @@ typedef enum {
 #define OT_PWRMGR_OTP_REQ TYPE_OT_PWRMGR "-otp-req"
 #define OT_PWRMGR_CPU_EN  TYPE_OT_PWRMGR "-cpu-en"
 #define OT_PWRMGR_STRAP   TYPE_OT_PWRMGR "-strap"
+#define OT_PWRMGR_RST_REQ TYPE_OT_PWRMGR "-reset-req"
 
 /* input lines */
 #define OT_PWRMGR_LC_RSP  TYPE_OT_PWRMGR "-lc-rsp"

include/hw/opentitan/ot_rstmgr.h

@@ -49,12 +49,10 @@ typedef enum {
     OT_RSTMGR_RESET_COUNT,
 } OtRstMgrResetReq;
 
-/*
- * Request a system reset
- *
- * @fastclk true for fast clock domain, @c false for aon/slow clock
- * @req type of reset request
- */
-void ot_rstmgr_reset_req(OtRstMgrState *s, bool fastclk, OtRstMgrResetReq req);
+#define OT_RSTMGR_RESET_REQUEST(_fast_, _req_) \
+    ((int)((1u << 31u) | (((int)(bool)_fast_) << 8u) | _req_))
+
+/* input lines */
+#define OT_RSTMGR_RST_REQ TYPE_OT_RSTMGR "-reset-req"
 
 #endif /* HW_OPENTITAN_OT_RSTMGR_H */