[reggen] Generate constants for only the main block

Some IP blocks have more than one register set.  `regtool` doesn't
understand there may be multiple multiple register blocks and it
generates constants for all of them and overlays their offsets (ie:
there may be multiple registers at offset 0).

1. Allow `regtool` to filter regblocks so that we can generate separate
outputs per register block.
2. Generate only the main reglbock for flash_ctrl, otp_ctrl and
   rom_ctrl.

Signed-off-by: Chris Frantz <[email protected]>

hw/ip/flash_ctrl/data/BUILD

@@ -11,6 +11,7 @@ autogen_hjson_header(
     srcs = [
         "flash_ctrl.hjson",
     ],
+    node = "core",
 )
 
 filegroup(

hw/ip/otp_ctrl/data/BUILD

@@ -67,6 +67,7 @@ autogen_hjson_header(
     srcs = [
         "otp_ctrl.hjson",
     ],
+    node = "core",
 )
 
 exports_files(["otp_ctrl_mmap.hjson"])

hw/ip/rom_ctrl/data/BUILD

@@ -11,6 +11,7 @@ autogen_hjson_header(
     srcs = [
         "rom_ctrl.hjson",
     ],
+    node = "regs",
 )
 
 filegroup(

hw/top_earlgrey/ip/flash_ctrl/data/autogen/BUILD

@@ -11,6 +11,7 @@ autogen_hjson_header(
     srcs = [
         "flash_ctrl.hjson",
     ],
+    node = "core",
 )
 
 filegroup(

rules/autogen.bzl

@@ -11,6 +11,10 @@ from hjson register descriptions.
 
 def _hjson_header(ctx):
     header = ctx.actions.declare_file("{}.h".format(ctx.label.name))
+    node = []
+    if ctx.attr.node:
+        node.append("--node={}".format(ctx.attr.node))
+
     ctx.actions.run(
         outputs = [header],
         inputs = ctx.files.srcs + [ctx.executable._regtool],
@@ -19,7 +23,7 @@ def _hjson_header(ctx):
             "-q",
             "-o",
             header.path,
-        ] + [src.path for src in ctx.files.srcs],
+        ] + node + [src.path for src in ctx.files.srcs],
         executable = ctx.executable._regtool,
     )
 
@@ -33,7 +37,7 @@ def _hjson_header(ctx):
             "-q",
             "-o",
             tock.path,
-        ] + [src.path for src in ctx.files.srcs],
+        ] + node + [src.path for src in ctx.files.srcs],
         executable = ctx.executable._regtool,
     )
 
@@ -53,6 +57,9 @@ autogen_hjson_header = rule(
     implementation = _hjson_header,
     attrs = {
         "srcs": attr.label_list(allow_files = True),
+        "node": attr.string(
+            doc = "Register block node to generate",
+        ),
         "version_stamp": attr.label(
             default = "//util:full_version_file",
             allow_single_file = True,

util/BUILD

@@ -68,6 +68,7 @@ py_binary(
         "//util/reggen:gen_rust",
         "//util/reggen:gen_sec_cm_testplan",
         "//util/reggen:gen_selfdoc",
+        "//util/reggen:gen_tock",
         "//util/reggen:ip_block",
         "//util/reggen:version",
         requirement("tabulate"),

util/reggen/gen_tock.py

@@ -123,7 +123,8 @@ def data_type(name: str, val: int, as_hex: bool) -> str:
 filler_no = 0
 
 
-def possibly_gen_filler(regout: TextIO, highest_address: Set[int], next_address: int) -> None:
+def possibly_gen_filler(regout: TextIO, highest_address: Set[int],
+                        next_address: int) -> None:
     r"""Tock requires any gaps between registers do be declared as a reserved field.
     """
 
@@ -214,13 +215,15 @@ def gen_field_definitions(
         if field.auto_split:
             for sub_field_id in range(field.bits.lsb, field.bits.width()):
                 genout(fieldout, "\n{} OFFSET({}) NUMBITS({}) [],",
-                       "{}_{}".format(field.name.upper(), sub_field_id), sub_field_id, 1)
+                       "{}_{}".format(field.name.upper(),
+                                      sub_field_id), sub_field_id, 1)
         else:
-            genout(fieldout, "\n{} OFFSET({}) NUMBITS({}) [", field.name.upper(),
-                   field.bits.lsb, field.bits.width())
+            genout(fieldout, "\n{} OFFSET({}) NUMBITS({}) [",
+                   field.name.upper(), field.bits.lsb, field.bits.width())
             if getattr(field, 'enum', None) is not None:
                 for enum in field.enum:
-                    genout(fieldout, "\n{} = {},", sanitize_name(enum.name).upper(), enum.value)
+                    genout(fieldout, "\n{} = {},",
+                           sanitize_name(enum.name).upper(), enum.value)
                 genout(fieldout, "\n],")
             else:
                 genout(fieldout, "],")
@@ -387,7 +390,10 @@ def gen_tock(block: IpBlock, outfile: TextIO, src_file: Optional[str],
     # both Apache and MIT licenses.
     # Since these generated files are meant to be imported into the Tock
     # codebase, emit a header acceptable to Tock's license checker.
-    genout(outfile, "// Licensed under the Apache License, Version 2.0 or the MIT License.\n")
+    genout(
+        outfile,
+        "// Licensed under the Apache License, Version 2.0 or the MIT License.\n"
+    )
     genout(outfile, "// SPDX-License-Identifier: Apache-2.0 OR MIT\n")
     genout(outfile, "// Copyright lowRISC contributors {}.\n", dt.year)
     genout(outfile, '\n')
@@ -406,7 +412,10 @@ def gen_tock(block: IpBlock, outfile: TextIO, src_file: Optional[str],
 
     for access in sorted(access_type):
         genout(outfile, "use kernel::utilities::registers::{};\n", access)
-    genout(outfile, "use kernel::utilities::registers::{{register_bitfields, register_structs}};\n")
+    genout(
+        outfile,
+        "use kernel::utilities::registers::{{register_bitfields, register_structs}};\n"
+    )
 
     outfile.write(indent(paramstr))
     outfile.write(indent(regstr))