commit 49ea637de7e8cb04a960a94732b65ef6eae9dbb6
author Michael Schaffner <msf@opentitan.org> Fri Jan 15 15:30:30 2021 -0800
committer Michael Schaffner <msf@google.com> Fri Jan 15 18:26:50 2021 -0800
tree b186d7f3ac9c3c544de5a31cbbf50951165ab682
parent b552f456a7aacc6180390e0af3afff3abdbe5d5a

[otp_ctrl] Fix a DAI/KDI concurrency issue

Fix #4852

The scrambling datapath mutex was accidentally released in the KDI when
requesting data from EDN.

Signed-off-by: Michael Schaffner <msf@opentitan.org>

hw/ip/otp_ctrl/rtl/otp_ctrl_kdi.sv

diff --git a/hw/ip/otp_ctrl/rtl/otp_ctrl_kdi.sv b/hw/ip/otp_ctrl/rtl/otp_ctrl_kdi.sv
index 95703e3..8a6d9a3 100644
--- a/hw/ip/otp_ctrl/rtl/otp_ctrl_kdi.sv
+++ b/hw/ip/otp_ctrl/rtl/otp_ctrl_kdi.sv
@@ -371,6 +371,7 @@
       ///////////////////////////////////////////////////////////////////
       // Fetch random data to ingest for key derivation.
       FetchEntropySt: begin
+        scrmbl_mtx_req_o = 1'b1;
         edn_req_o = 1'b1;
         if (edn_ack_i) begin
           nonce_reg_en = 1'b1;