[csrng/rtl] fifo_o port variation Slightly different port order on fifos. Signed-off-by: Mark Branstad <mark.branstad@wdc.com>
diff --git a/hw/ip/csrng/rtl/csrng_block_encrypt.sv b/hw/ip/csrng/rtl/csrng_block_encrypt.sv index 26a5663..d07cd17 100644 --- a/hw/ip/csrng/rtl/csrng_block_encrypt.sv +++ b/hw/ip/csrng/rtl/csrng_block_encrypt.sv
@@ -99,13 +99,13 @@ .key_len_i ( aes_pkg::AES_256 ), .crypt_i ( aes_cipher_core_enable ), .crypt_o ( ), + .alert_o ( ), // TODO: Prop to top .dec_key_gen_i ( 1'b0 ), // Disable .dec_key_gen_o ( ), .key_clear_i ( 1'b0 ), // Disable .key_clear_o ( ), .data_out_clear_i ( 1'b0 ), // Disable .data_out_clear_o ( ), - .alert_o ( ), // Currently unused. .prd_clearing_i ( '0 ), .force_zero_masks_i ( 1'b0 ), .data_in_mask_o ( ), @@ -137,8 +137,8 @@ .rvalid_o (sfifo_blkenc_not_empty), .rready_i (sfifo_blkenc_pop), .rdata_o (sfifo_blkenc_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_blkenc_push = block_encrypt_req_i && sfifo_blkenc_not_full;
diff --git a/hw/ip/csrng/rtl/csrng_cmd_stage.sv b/hw/ip/csrng/rtl/csrng_cmd_stage.sv index e480f14..2f84d9b 100644 --- a/hw/ip/csrng/rtl/csrng_cmd_stage.sv +++ b/hw/ip/csrng/rtl/csrng_cmd_stage.sv
@@ -124,8 +124,8 @@ .rvalid_o (sfifo_cmd_not_empty), .rready_i (sfifo_cmd_pop), .rdata_o (sfifo_cmd_rdata), - .depth_o (sfifo_cmd_depth), - .full_o () + .full_o (), + .depth_o (sfifo_cmd_depth) ); assign sfifo_cmd_wdata = cmd_stage_bus_i; @@ -319,8 +319,8 @@ .rvalid_o (sfifo_genbits_not_empty), .rready_i (sfifo_genbits_pop), .rdata_o (sfifo_genbits_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () // sfifo_genbits_depth) ); assign sfifo_genbits_wdata = {genbits_fips_i,genbits_bus_i};
diff --git a/hw/ip/csrng/rtl/csrng_ctr_drbg_cmd.sv b/hw/ip/csrng/rtl/csrng_ctr_drbg_cmd.sv index 78396b6..069c157 100644 --- a/hw/ip/csrng/rtl/csrng_ctr_drbg_cmd.sv +++ b/hw/ip/csrng/rtl/csrng_ctr_drbg_cmd.sv
@@ -134,8 +134,8 @@ .rvalid_o (sfifo_cmdreq_not_empty), .rready_i (sfifo_cmdreq_pop), .rdata_o (sfifo_cmdreq_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign fips_modified = (ctr_drbg_cmd_ccmd_i == INS) ? ctr_drbg_cmd_entropy_fips_i : @@ -222,8 +222,8 @@ .rvalid_o (sfifo_rcstage_not_empty), .rready_i (sfifo_rcstage_pop), .rdata_o (sfifo_rcstage_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_rcstage_push = sfifo_cmdreq_pop; @@ -257,8 +257,8 @@ .rvalid_o (sfifo_keyvrc_not_empty), .rready_i (sfifo_keyvrc_pop), .rdata_o (sfifo_keyvrc_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_keyvrc_push = sfifo_rcstage_pop;
diff --git a/hw/ip/csrng/rtl/csrng_ctr_drbg_gen.sv b/hw/ip/csrng/rtl/csrng_ctr_drbg_gen.sv index e6502f8..a918563 100644 --- a/hw/ip/csrng/rtl/csrng_ctr_drbg_gen.sv +++ b/hw/ip/csrng/rtl/csrng_ctr_drbg_gen.sv
@@ -231,8 +231,8 @@ .rvalid_o (sfifo_genreq_not_empty), .rready_i (sfifo_genreq_pop), .rdata_o (sfifo_genreq_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign genreq_ccmd_modified = (ctr_drbg_gen_ccmd_i == GEN) ? GENB : INV; @@ -342,8 +342,8 @@ .rvalid_o (sfifo_adstage_not_empty), .rready_i (sfifo_adstage_pop), .rdata_o (sfifo_adstage_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); // assign sfifo_adstage_push = sfifo_genreq_pop; @@ -376,8 +376,8 @@ .rvalid_o (sfifo_bencack_not_empty), .rready_i (sfifo_bencack_pop), .rdata_o (sfifo_bencack_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign bencack_ccmd_modified = (block_encrypt_ccmd_i == GENB) ? GENU : INV; @@ -428,8 +428,8 @@ .rvalid_o (sfifo_rcstage_not_empty), .rready_i (sfifo_rcstage_pop), .rdata_o (sfifo_rcstage_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_rcstage_push = sfifo_adstage_pop; @@ -464,8 +464,8 @@ .rvalid_o (sfifo_genbits_not_empty), .rready_i (sfifo_genbits_pop), .rdata_o (sfifo_genbits_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_genbits_push = sfifo_rcstage_pop;
diff --git a/hw/ip/csrng/rtl/csrng_ctr_drbg_upd.sv b/hw/ip/csrng/rtl/csrng_ctr_drbg_upd.sv index 629b247..64fef2b 100644 --- a/hw/ip/csrng/rtl/csrng_ctr_drbg_upd.sv +++ b/hw/ip/csrng/rtl/csrng_ctr_drbg_upd.sv
@@ -260,8 +260,8 @@ .rvalid_o (sfifo_updreq_not_empty), .rready_i (sfifo_updreq_pop), .rdata_o (sfifo_updreq_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_updreq_push = sfifo_updreq_not_full && ctr_drbg_upd_req_i; @@ -356,8 +356,8 @@ .rvalid_o (sfifo_bencreq_not_empty), .rready_i (sfifo_bencreq_pop), .rdata_o (sfifo_bencreq_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_bencreq_pop = block_encrypt_req_o && block_encrypt_rdy_i; @@ -397,8 +397,8 @@ .rvalid_o (sfifo_bencack_not_empty), .rready_i (sfifo_bencack_pop), .rdata_o (sfifo_bencack_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_bencack_push = sfifo_bencack_not_full && block_encrypt_ack_i; @@ -430,8 +430,8 @@ .rvalid_o (sfifo_pdata_not_empty), .rready_i (sfifo_pdata_pop), .rdata_o (sfifo_pdata_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_pdata_wdata = sfifo_updreq_pdata; @@ -523,8 +523,8 @@ .rvalid_o (sfifo_final_not_empty), .rready_i (sfifo_final_pop), .rdata_o (sfifo_final_rdata), - .depth_o (), - .full_o () + .full_o (), + .depth_o () ); assign sfifo_final_wdata = {updated_key_and_v,concat_inst_id_q,concat_ccmd_q};