[top] Move alert handler to periphs and attach escalation clock to ibex
Signed-off-by: Michael Schaffner <msf@opentitan.org>
diff --git a/hw/top_earlgrey/data/top_earlgrey.hjson b/hw/top_earlgrey/data/top_earlgrey.hjson
index bdd27dd..158521c 100755
--- a/hw/top_earlgrey/data/top_earlgrey.hjson
+++ b/hw/top_earlgrey/data/top_earlgrey.hjson
@@ -82,7 +82,7 @@
// The powerup and proc groups are unique.
// The powerup group of clocks do not feed through the clock
// controller as they manage clock controller behavior
- // The proc group is not peripheral, and direclty hardwired
+ // The proc group is not peripheral, and directly hardwired
groups: [
// the powerup group is used exclusively by clk/pwr/rstmgr
@@ -228,6 +228,28 @@
reset_connections: {rst_ni: "lc_io_div4"},
base_addr: "0x40140000",
},
+ { name: "alert_handler",
+ type: "alert_handler",
+ clock_srcs: {clk_i: "io_div4"},
+ clock_group: "timers",
+ reset_connections: {rst_ni: "sys_io_div4"},
+ base_addr: "0x40150000",
+ generated: "true" // Indicate this module is generated in the topgen
+ localparam: {
+ EscCntDw: 32,
+ AccuCntDw: 16,
+ LfsrSeed: "0x7FFFFFFF"
+ }
+ },
+ // dummy module to capture the alert handler escalation signals
+ // and test them by converting them into IRQs
+ { name: "nmi_gen",
+ type: "nmi_gen",
+ clock_srcs: {clk_i: "io_div4"},
+ clock_group: "timers",
+ reset_connections: {rst_ni: "sys_io_div4"},
+ base_addr: "0x40160000",
+ }
{ name: "pwrmgr",
type: "pwrmgr",
clock_srcs: {clk_i: "io_div4", clk_slow_i: "aon"},
@@ -362,28 +384,6 @@
reset_connections: {rst_ni: "sys"},
base_addr: "0x41180000",
},
- { name: "alert_handler",
- type: "alert_handler",
- clock_srcs: {clk_i: "main"},
- clock_group: "secure",
- reset_connections: {rst_ni: "sys"},
- base_addr: "0x411b0000",
- generated: "true" // Indicate this module is generated in the topgen
- localparam: {
- EscCntDw: 32,
- AccuCntDw: 16,
- LfsrSeed: "0x7FFFFFFF"
- }
- },
- // dummy module to capture the alert handler escalation signals
- // and test them by converting them into IRQs
- { name: "nmi_gen",
- type: "nmi_gen",
- clock_srcs: {clk_i: "main"},
- clock_group: "secure",
- reset_connections: {rst_ni: "sys"},
- base_addr: "0x411c0000",
- },
{ name: "otbn",
type: "otbn",
clock_srcs: {clk_i: "main"},
