[aes/rtl] Replace `aes_col_set()` function
The implementation of this function causes problems with some tools.
This commit removes this function, and instead uses `aes_tranpose()`
to implement the same functionality.
This commit resolves #1079 reported by @rasmus-madsen.
Signed-off-by: Pirmin Vogel <vogelpi@lowrisc.org>
diff --git a/hw/ip/aes/rtl/aes_core.sv b/hw/ip/aes/rtl/aes_core.sv
index 2353366..7ebe92d 100644
--- a/hw/ip/aes/rtl/aes_core.sv
+++ b/hw/ip/aes/rtl/aes_core.sv
@@ -91,11 +91,8 @@
assign data_in_qe = {reg2hw.data_in[3].qe, reg2hw.data_in[2].qe,
reg2hw.data_in[1].qe, reg2hw.data_in[0].qe};
- always_comb begin : conv_data_in_to_state
- for (int i=0; i<4; i++) begin
- state_init = aes_col_set(data_in[i], i);
- end
- end
+ // Convert input data to state (every input data word contains one state column)
+ assign state_init = aes_transpose(data_in);
assign mode = mode_e'(reg2hw.ctrl.mode.q);
@@ -235,11 +232,8 @@
endcase
end
- always_comb begin : conv_key_words_to_bytes
- for (int i=0; i<4; i++) begin
- key_bytes = aes_col_set(key_words[i], i);
- end
- end
+ // Convert words to bytes (every key word contains one column)
+ assign key_bytes = aes_transpose(key_words);
aes_mix_columns aes_key_mix_columns (
.mode_i ( AES_DEC ),
diff --git a/hw/ip/aes/rtl/aes_pkg.sv b/hw/ip/aes/rtl/aes_pkg.sv
index e0dd165..004bb5d 100644
--- a/hw/ip/aes/rtl/aes_pkg.sv
+++ b/hw/ip/aes/rtl/aes_pkg.sv
@@ -110,11 +110,4 @@
end
endfunction
-// Set single column in state matrix
-function automatic logic [3:0][3:0][7:0] aes_col_set(input logic [3:0][7:0] in, int idx);
- for (int i=0; i<4; i++) begin
- aes_col_set[i][idx] = in[i];
- end
-endfunction
-
endpackage
