commit 0f19c5d10e12bbdd35bd06b0edb9e3a8e9e6f1aa
author Timothy Chen <timothytim@google.com> Fri Apr 15 19:10:34 2022 -0700
committer tjaychen <timothytim@google.com> Mon Apr 18 18:04:21 2022 -0700
tree c64cc206242a0c451456c658592ca42c6ea1686a
parent 5d8701c33986cbe05324bb8d189d53fd0b7855da

[flash_ctrl] Fix for host direct read.

- fixes #12167

The host region decoding forgot to include the 'en' bit, causing
host read attributes to sometimes differ from the controller attributes.

Signed-off-by: Timothy Chen <timothytim@google.com>

hw/ip/flash_ctrl/rtl/flash_phy.sv

diff --git a/hw/ip/flash_ctrl/rtl/flash_phy.sv b/hw/ip/flash_ctrl/rtl/flash_phy.sv
index f7ed895..ea87b85 100644
--- a/hw/ip/flash_ctrl/rtl/flash_phy.sv
+++ b/hw/ip/flash_ctrl/rtl/flash_phy.sv
@@ -172,8 +172,12 @@
   assign unused_cfg = region_cfg;
 
   // only scramble/ecc attributes are looked at
-  assign host_scramble_en = prim_mubi_pkg::mubi4_test_true_loose(region_cfg.scramble_en);
-  assign host_ecc_en = prim_mubi_pkg::mubi4_test_true_loose(region_cfg.ecc_en);
+  import prim_mubi_pkg::mubi4_test_true_strict;
+  import prim_mubi_pkg::mubi4_and_hi;
+
+  assign host_scramble_en = mubi4_test_true_strict(
+                              mubi4_and_hi(region_cfg.scramble_en, region_cfg.en));
+  assign host_ecc_en = mubi4_test_true_strict(mubi4_and_hi(region_cfg.ecc_en, region_cfg.en));
 
   // Prim flash to flash_phy_core connections
   flash_phy_pkg::flash_phy_prim_flash_req_t [NumBanks-1:0] prim_flash_req;