bypass: assert payload_available on image activation

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

Author: kgugala

src/recovery/recovery_executor.sv

@@ -840,7 +840,7 @@ module recovery_executor
   // The payload_available signal must reset if recovery FIFO indicates empty.
   logic payload_high_en, bypass_xfer_done;
   assign payload_high_en = bypass_i3c_core_i ?
-                            (bypass_xfer_done | hwif_socmgmt_i.REC_INTF_CFG.REC_PAYLOAD_DONE.value) :
+                            (bypass_xfer_done | hwif_socmgmt_i.REC_INTF_CFG.REC_PAYLOAD_DONE.value | image_activated_o) :
                             fifo_xfer_done;
   assign bypass_xfer_done = (state_q == FifoWrite) & (state_d == Done);
 

verification/cocotb/top/lib_i3c_top/test_bypass.py

@@ -428,12 +428,18 @@ async def test_image_activated(dut):
     tb = await initialize(dut)
 
     image_activated = dut.xi3c_wrapper.recovery_image_activated_o
+    payload_available = dut.xi3c_wrapper.recovery_payload_available_o
 
     # Check if image_activated is deasserted
     assert not bool(
         image_activated.value
     ), "Upon initialization image_activated should be deasserted"
 
+    # Check if payload_available is deasserted
+    assert not bool(
+        payload_available.value
+    ), "Upon initialization payload_availablei should be deasserted"
+
     # Write 0xF to byte 2 of RECOVERY_CTRL
     await tb.write_csr_field(
         tb.reg_map.I3C_EC.SOCMGMTIF.REC_INTF_REG_W1C_ACCESS.base_addr,
@@ -447,6 +453,14 @@ async def test_image_activated(dut):
         image_activated.value
     ), "Upon writing 0xF to RECOVERY_CTRL byte 2 image_activated should be asserted"
 
+    # payload_available is asserted one clk cycle after image activation
+    await RisingEdge(tb.clk)
+    # Check if payload_available is asserted
+    assert bool(
+        payload_available.value
+    ), "Upon writing 0xF to RECOVERY_CTRL byte 2 payload_available should be asserted"
+
+
     # Write 0xFF to byte 2 of RECOVERY_CTRL from the HCI side
     await tb.write_csr_field(
         tb.reg_map.I3C_EC.SECFWRECOVERYIF.RECOVERY_CTRL.base_addr,