config: add possibility to disable bypass functionality

Default AXI config disables loopback

Signed-off-by: Karol Gugala <[email protected]>

Author: kgugala

i3c_core_configs.yaml

@@ -49,6 +49,25 @@ axi:
   FrontendBusIdFiltering: True
   NumPrivIds: 4
   DisableInputFF: True
+  DisableLoopback: True
+
+axi_bypass:
+  CmdFifoDepth: 64
+  RxFifoDepth: 64
+  TxFifoDepth: 64
+  RespFifoDepth: 64
+  IbiFifoDepth: 64
+  IbiFifoExtSize: False
+  DatDepth: 128
+  DctDepth: 128
+  FrontendBusInterface: "AXI"
+  FrontendBusAddrWidth: 12
+  FrontendBusDataWidth: 32
+  FrontendBusUserWidth: 32
+  FrontendBusIdWidth: 8
+  FrontendBusIdFiltering: True
+  NumPrivIds: 4
+  DisableInputFF: True
 
 axi_ff:
   CmdFifoDepth: 64

src/i3c.sv

@@ -553,7 +553,11 @@ module i3c
   I3CCSR_pkg::I3CCSR__I3C_EC__SecFwRecoveryIf__in_t  hwif_rec_inp;
 
   logic bypass_i3c_core;
+`ifndef DISABLE_LOOPBACK
   assign bypass_i3c_core = hwif_out.I3C_EC.SoCMgmtIf.REC_INTF_CFG.REC_INTF_BYPASS.value;
+`else
+  assign bypass_i3c_core = '0;
+`endif
 
   controller #(
       .DatAw(DatAw),

src/i3c_defines.svh

@@ -20,5 +20,6 @@
   `define AXI_ID_FILTERING 1
   `define NUM_PRIV_IDS     4
   `define DISABLE_INPUT_FF 1
+  `define DISABLE_LOOPBACK 1
 
 `endif  // I3C_CONFIG

tools/i3c_config/common.py

@@ -78,6 +78,12 @@ def __init__(self, cfg: I3CGenericConfig) -> None:
                     self._defines["DISABLE_INPUT_FF"] = 1
                 continue
 
+            # Map "DisableLoopback"
+            if name == "DisableLoopback":
+                if bool(value):
+                    self._defines["DISABLE_LOOPBACK"] = 1
+                continue
+
             # For those parameters that map directly, change the name format:
             # PascalCase -> UPPER_SNAKE_CASE
             new_name = self._format_name(name).replace("FRONTEND_BUS", bus)

tools/i3c_config/i3c_core_config.schema.json

@@ -103,6 +103,10 @@
         "DisableInputFF": {
             "description": "Disable input synchronization flip-flops on SDA and SCL lines.",
             "type": "boolean"
+        },
+        "DisableLoopback": {
+            "description": "Disable recovery loopback mode allowing perforing OCP recovery flow from internal bus (instead of I3C).",
+            "type": "boolean"
         }
     },
     "if": {
@@ -181,4 +185,4 @@
             }
         ]
     }
-}
+}

verification/cocotb/top/i3c_axi/Makefile

@@ -11,7 +11,7 @@ TEST_FILES   = $(sort $(wildcard test_*.py))
 
 MODULE      ?= $(subst $(space),$(comma),$(subst .py,,$(TEST_FILES)))
 TOPLEVEL     = i3c_test_wrapper
-CFG_NAME 	 = axi
+CFG_NAME 	 = axi_bypass
 
 # Set appropriate bus interface via Cocotb's PLUSARGS:
 override PLUSARGS := $(strip +FrontendBusInterface=AXI $(PLUSARGS))