[topgen] Only create rstmgr if there an instance

Signed-off-by: Robert Schilling <[email protected]>

util/topgen.py

@@ -855,8 +855,9 @@ def _process_top(
     if lib.find_module(completecfg['module'], 'pwrmgr'):
         generate_pwrmgr(completecfg, out_path)
 
-    # Generate rstmgr
-    generate_rstmgr(completecfg, out_path)
+    # Generate rstmgr if there is an instance
+    if lib.find_module(completecfg['module'], 'rstmgr'):
+        generate_rstmgr(completecfg, out_path)
 
     # Generate ac_range_check
     generate_ac_range_check(completecfg, out_path)

util/topgen/lib.py

@@ -886,7 +886,9 @@ def __init__(self, top_info, name_to_block: Dict[str, IpBlock], enum_type, array
         if find_module(self.top['module'], 'pwrmgr'):
             self._init_pwrmgr_wakeups()
             self._init_pwrmgr_reset_requests()
-        self._init_rstmgr_sw_rsts()
+        # Only generate rstmgr mappings if there is a rstmgr
+        if find_module(self.top['module'], 'rstmgr'):
+            self._init_rstmgr_sw_rsts()
         # Only generate clkmgr mappings if there is a clkmgr
         if find_module(self.top['module'], 'clkmgr'):
             self._init_clkmgr_clocks()

util/topgen/templates/toplevel.h.tpl

@@ -9,6 +9,7 @@ has_pwrmgr = lib.find_module(top['module'], 'pwrmgr')
 has_pinmux = lib.find_module(top['module'], 'pinmux')
 has_alert_handler = lib.find_module(top['module'], 'alert_handler') or top['name'] == 'englishbreakfast'
 has_clkmgr = lib.find_module(top['module'], 'clkmgr')
+has_rstmgr = lib.find_module(top['module'], 'rstmgr')
 %>\
 
 #ifndef ${helper.header_macro_prefix}_TOP_${top["name"].upper()}_H_
@@ -198,11 +199,13 @@ ${helper.muxed_pads.render()}
  */
 ${helper.pwrmgr_wakeups.render()}
 % endif
+% if has_rstmgr:
 
 /**
  * Reset Manager Software Controlled Resets
  */
 ${helper.rstmgr_sw_rsts.render()}
+% endif
 % if has_pwrmgr:
 
 /**

util/topgen/templates/toplevel.rs.tpl

@@ -9,6 +9,7 @@ has_pwrmgr = lib.find_module(top['module'], 'pwrmgr')
 has_pinmux = lib.find_module(top['module'], 'pinmux')
 has_alert_handler = lib.find_module(top['module'], 'alert_handler') or top['name'] == 'englishbreakfast'
 has_clkmgr = lib.find_module(top['module'], 'clkmgr')
+has_rstmgr = lib.find_module(top['module'], 'rstmgr')
 %>\
 ${helper.file_header.render()}
 // This file was generated automatically.
@@ -155,9 +156,11 @@ ${helper.muxed_pads.render(gen_cast=True)}
 /// Power Manager Wakeup Signals
 ${helper.pwrmgr_wakeups.render()}
 % endif
+% if has_rstmgr:
 
 /// Reset Manager Software Controlled Resets
 ${helper.rstmgr_sw_rsts.render()}
+% endif
 % if has_pwrmgr:
 
 /// Power Manager Reset Request Signals

util/topgen/validate.py

@@ -632,15 +632,6 @@ def check_clocks_resets(top, ipobjs, ip_idxs, xbarobjs, xbar_idxs):
 
     error = 0
 
-    # there should only be one each of pwrmgr/clkmgr/rstmgr
-    pwrmgrs = [m for m in top['module'] if m['type'] == 'pwrmgr']
-    clkmgrs = [m for m in top['module'] if m['type'] == 'clkmgr']
-    rstmgrs = [m for m in top['module'] if m['type'] == 'rstmgr']
-
-    if len(pwrmgrs) == 1 * len(clkmgrs) == 1 * len(rstmgrs) != 1:
-        log.error("Incorrect number of pwrmgr/clkmgr/rstmgr")
-        error += 1
-
     # all defined clock/reset nets
     reset_nets = [reset['name'] for reset in top['resets']['nodes']]
     clock_srcs = list(top['clocks'].all_srcs.keys())