[topgen] Support ipgen_params for clkmgr

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

Author: Razer6

util/ipgen/clkmgr_gen.py

@@ -9,7 +9,7 @@
 
 from basegen.typing import ConfigT, ParamsT
 from topgen.clocks import Clocks, ClockSignal
-from topgen.lib import find_module
+from topgen.lib import find_module, get_ipgen_params
 
 
 class ClockMeasureConfig(NamedTuple):
@@ -47,7 +47,9 @@ def get_clkmgr_params(top: ConfigT) -> ParamsT:
     with_alert_handler = find_module(top['module'],
                                      'alert_handler') is not None
 
-    return {
+    clkmgr = find_module(top["module"], "clkmgr")
+    ipgen_params = get_ipgen_params(clkmgr)
+    ipgen_params.update({
         "src_clks":
         OrderedDict({name: vars(obj)
                      for name, obj in clocks.srcs.items()}),
@@ -68,7 +70,8 @@ def get_clkmgr_params(top: ConfigT) -> ParamsT:
         len(clocks.groups),
         "with_alert_handler":
         with_alert_handler,
-    }
+    })
+    return ipgen_params
 
 
 def get_all_srcs(src_clks: ConfigT, derived_clks: ConfigT) -> ConfigT:

util/topgen.py

@@ -41,7 +41,7 @@
 from topgen.clocks import Clocks
 from topgen.gen_dv import gen_dv
 from topgen.gen_top_docs import gen_top_docs
-from topgen.lib import find_module, find_modules, load_cfg, write_file_secure
+from topgen.lib import find_module, find_modules, load_cfg, write_file_secure, get_ipgen_params
 from topgen.merge import (
     amend_alert, amend_interrupt, amend_pinmux_io, amend_racl,
     amend_reset_request, amend_resets, amend_wkup, commit_alert_modules,
@@ -284,11 +284,6 @@ def generate_ipgen(top: ConfigT, module: ConfigT, params: ParamsT,
     ipgen_render(module["template_type"], topname, params, out_path)
 
 
-def get_ipgen_params(module: ConfigT) -> ParamsT:
-    """Return ipgen params, if defined for this module"""
-    return deepcopy(module.get("ipgen_params", {}))
-
-
 def _get_alert_handler_params(top: ConfigT, name: str) -> ParamsT:
     """Returns parameters for alert_hander ipgen from top config."""
     # default values

util/topgen/lib.py

@@ -13,7 +13,7 @@
 
 import hjson
 from basegen.lib import Name
-from basegen.typing import ConfigT
+from basegen.typing import ConfigT, ParamsT
 from mako.template import Template
 from reggen.ip_block import IpBlock
 from version_file import VersionInformation
@@ -667,6 +667,11 @@ def is_ipgen(module: ConfigT) -> bool:
     return module.get('attr') in ["ipgen"]
 
 
+def get_ipgen_params(module: ConfigT) -> ParamsT:
+    """Return ipgen params, if defined for this module"""
+    return deepcopy(module.get("ipgen_params", {}))
+
+
 def is_top_reggen(module: ConfigT) -> bool:
     """Returns an indication where a particular module is NOT generated
        and requires top level specific reggen