[flash_ctrl,dv] byte/word scrambling addr fix

FlashAddrWidth is in flash words (not bytes). Passing a byte address to
a function which expects word-addresses leads to a truncation of the three
most significant address bits. As a result, when accessing the upper part
of each flash bank the scrambling tweak was wrong which lead to a wrong
data encryption and hence also to a wrong ICV calculation for the expected
responses.

Signed-off-by: Michael Gautschi <[email protected]>
(cherry picked from commit d3aa4e9)

Author: gautschimi

hw/ip_templates/flash_ctrl/dv/env/flash_ctrl_env_pkg.sv

@@ -408,10 +408,7 @@ package flash_ctrl_env_pkg;
     bit [FlashDataWidth-1:0]                                    masked_data;
     bit [FlashNumRoundsHalf-1:0][FlashDataWidth-1:0]            scrambled_data;
 
-    // These parameters will be removed once it is included in mem_bkdr_util.sv
-    int                                                         addr_lsb = 3;
-
-    word_addr = byte_addr >> addr_lsb;
+    word_addr = byte_addr >> FlashDataByteWidth;
     mask = flash_galois_multiply(flash_addr_key, word_addr);
     masked_data = data ^ mask;
     crypto_dpi_prince_pkg::sv_dpi_prince_encrypt(.plaintext(masked_data), .key(flash_data_key),

hw/ip_templates/flash_ctrl/dv/env/flash_otf_item.sv

@@ -139,6 +139,7 @@ class flash_otf_item extends uvm_object;
       data = raw_fq[i][FlashDataWidth-1:0];
       if (ecc_en) begin
         data_with_icv = prim_secded_pkg::prim_secded_hamming_72_64_enc(raw_fq[i][63:0]);
+        `uvm_info("icv", $sformatf("ICV:%4b", data_with_icv[67:64]), UVM_DEBUG)
         if (add_icv_err) begin
           `uvm_info("icv_debug", $sformatf("before:%4b after:%4b",
                     data_with_icv[67:64], ~data_with_icv[67:64]), UVM_DEBUG)

hw/ip_templates/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson

@@ -348,7 +348,7 @@
       name: flash_ctrl_rw_evict_all_en
       uvm_test_seq: flash_ctrl_rw_evict_vseq
       run_opts: ["+scb_otf_en=1", "+ecc_mode=1", "+en_always_read=1",
-                 "+en_always_prog=1", "en_rnd_data=0"]
+                 "+en_always_prog=1", "+en_rnd_data=0"]
       reseed: 40
     }
     {

hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env_pkg.sv

@@ -408,10 +408,7 @@ package flash_ctrl_env_pkg;
     bit [FlashDataWidth-1:0]                                    masked_data;
     bit [FlashNumRoundsHalf-1:0][FlashDataWidth-1:0]            scrambled_data;
 
-    // These parameters will be removed once it is included in mem_bkdr_util.sv
-    int                                                         addr_lsb = 3;
-
-    word_addr = byte_addr >> addr_lsb;
+    word_addr = byte_addr >> FlashDataByteWidth;
     mask = flash_galois_multiply(flash_addr_key, word_addr);
     masked_data = data ^ mask;
     crypto_dpi_prince_pkg::sv_dpi_prince_encrypt(.plaintext(masked_data), .key(flash_data_key),

hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_otf_item.sv

@@ -139,6 +139,7 @@ class flash_otf_item extends uvm_object;
       data = raw_fq[i][FlashDataWidth-1:0];
       if (ecc_en) begin
         data_with_icv = prim_secded_pkg::prim_secded_hamming_72_64_enc(raw_fq[i][63:0]);
+        `uvm_info("icv", $sformatf("ICV:%4b", data_with_icv[67:64]), UVM_DEBUG)
         if (add_icv_err) begin
           `uvm_info("icv_debug", $sformatf("before:%4b after:%4b",
                     data_with_icv[67:64], ~data_with_icv[67:64]), UVM_DEBUG)

hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson

@@ -348,7 +348,7 @@
       name: flash_ctrl_rw_evict_all_en
       uvm_test_seq: flash_ctrl_rw_evict_vseq
       run_opts: ["+scb_otf_en=1", "+ecc_mode=1", "+en_always_read=1",
-                 "+en_always_prog=1", "en_rnd_data=0"]
+                 "+en_always_prog=1", "+en_rnd_data=0"]
       reseed: 40
     }
     {