[alert_handler, pwrmgr, rstmgr] Port recent hjson changes in templates to IP
This commit ports some recent changes from the hjson templates back into
the IP hjson. Without this commit, topgen fails during the initial run as
the auto-generated hjson is not yet available.
Signed-off-by: Pirmin Vogel <vogelpi@lowrisc.org>
diff --git a/hw/ip/alert_handler/data/alert_handler.hjson b/hw/ip/alert_handler/data/alert_handler.hjson
index 63637b0..df261b2 100644
--- a/hw/ip/alert_handler/data/alert_handler.hjson
+++ b/hw/ip/alert_handler/data/alert_handler.hjson
@@ -114,21 +114,20 @@
default: " 1'b0",
act: "rcv",
},
- // TODO: wire up once all endpoints support the intersig feature.
- // { struct: "esc_rx"
- // type: "uni"
- // name: "esc_rx"
- // act: "rcv"
- // width: "4", // N_ESC_SEV
- // package: "prim_esc_pkg"
- // },
- // { struct: "esc_tx"
- // type: "uni"
- // name: "esc_tx"
- // act: "req"
- // width: "4", // N_ESC_SEV
- // package: "prim_esc_pkg"
- // },
+ { struct: "esc_rx"
+ type: "uni"
+ name: "esc_rx"
+ act: "rcv"
+ width: "4", // N_ESC_SEV
+ package: "prim_esc_pkg"
+ },
+ { struct: "esc_tx"
+ type: "uni"
+ name: "esc_tx"
+ act: "req"
+ width: "4", // N_ESC_SEV
+ package: "prim_esc_pkg"
+ },
]
# interrupt registers for the classes
interrupt_list: [
diff --git a/hw/ip/pwrmgr/data/pwrmgr.hjson b/hw/ip/pwrmgr/data/pwrmgr.hjson
index fad07de..a203da2 100644
--- a/hw/ip/pwrmgr/data/pwrmgr.hjson
+++ b/hw/ip/pwrmgr/data/pwrmgr.hjson
@@ -61,6 +61,20 @@
package: "pwrmgr_pkg",
},
+ { struct: "esc_tx",
+ type: "uni",
+ name: "esc_rst_tx",
+ act: "rcv",
+ package: "prim_esc_pkg",
+ },
+
+ { struct: "esc_rx",
+ type: "uni",
+ name: "esc_rst_rx",
+ act: "req",
+ package: "prim_esc_pkg",
+ },
+
{ struct: "pwr_cpu",
type: "uni",
name: "pwr_cpu",
diff --git a/hw/ip/rstmgr/data/rstmgr.hjson b/hw/ip/rstmgr/data/rstmgr.hjson
index 730a307..3e72e61 100644
--- a/hw/ip/rstmgr/data/rstmgr.hjson
+++ b/hw/ip/rstmgr/data/rstmgr.hjson
@@ -80,6 +80,13 @@
package: "alert_pkg",
},
+ { struct: "crashdump",
+ type: "uni",
+ name: "cpu_dump",
+ act: "rcv",
+ package: "rv_core_ibex_pkg",
+ },
+
// Exported resets
{ struct: "rstmgr_ast_out",
type: "uni",
