From c558762552547a6cc88a668a02336a092add9386 Mon Sep 17 00:00:00 2001 From: Lorenzo Leone Date: Wed, 25 Sep 2024 18:15:20 +0200 Subject: [PATCH] HW: Fix iso cfg parameter --- hw/chimera_clu_domain.sv | 52 +++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/hw/chimera_clu_domain.sv b/hw/chimera_clu_domain.sv index 213984f..75226f1 100644 --- a/hw/chimera_clu_domain.sv +++ b/hw/chimera_clu_domain.sv @@ -89,14 +89,14 @@ module chimera_clu_domain .axi_req_t (narrow_in_req_t), .axi_resp_t (narrow_in_resp_t) ) i_iso_narrow_in_cluster ( - .clk_i (soc_clk_i), - .rst_sync_ni(rst_sync_ni[extClusterIdx]), - .slv_req_i (narrow_in_req_i[extClusterIdx]), - .slv_resp_o (narrow_in_resp_o[extClusterIdx]), - .mst_req_o (narrow_in_isolated_req[extClusterIdx]), - .mst_resp_i (narrow_in_isolated_resp[extClusterIdx]), - .isolate_i (isolate_i[extClusterIdx]), - .isolated_o (isolated_narrow_in[extClusterIdx]) + .clk_i (soc_clk_i), + .rst_ni (rst_sync_ni[extClusterIdx]), + .slv_req_i (narrow_in_req_i[extClusterIdx]), + .slv_resp_o(narrow_in_resp_o[extClusterIdx]), + .mst_req_o (narrow_in_isolated_req[extClusterIdx]), + .mst_resp_i(narrow_in_isolated_resp[extClusterIdx]), + .isolate_i (isolate_i[extClusterIdx]), + .isolated_o(isolated_narrow_in[extClusterIdx]) ); // Add AXI isolation at the Narrow Output Interface. @@ -117,14 +117,14 @@ module chimera_clu_domain .axi_req_t (narrow_out_req_t), .axi_resp_t (narrow_out_resp_t) ) i_iso_narrow_out_cluster ( - .clk_i (soc_clk_i), - .rst_sync_ni(rst_sync_ni[extClusterIdx]), - .slv_req_i (narrow_out_isolated_req[narrowOutIdx]), - .slv_resp_o (narrow_out_isolated_resp[narrowOutIdx]), - .mst_req_o (narrow_out_req_o[narrowOutIdx]), - .mst_resp_i (narrow_out_resp_i[narrowOutIdx]), - .isolate_i (isolate_i[extClusterIdx]), - .isolated_o (isolated_narrow_out[narrowOutIdx]) + .clk_i (soc_clk_i), + .rst_ni (rst_sync_ni[extClusterIdx]), + .slv_req_i (narrow_out_isolated_req[narrowOutIdx]), + .slv_resp_o(narrow_out_isolated_resp[narrowOutIdx]), + .mst_req_o (narrow_out_req_o[narrowOutIdx]), + .mst_resp_i(narrow_out_resp_i[narrowOutIdx]), + .isolate_i (isolate_i[extClusterIdx]), + .isolated_o(isolated_narrow_out[narrowOutIdx]) ); end : gen_iso_narrow_out @@ -140,14 +140,14 @@ module chimera_clu_domain .axi_req_t (wide_out_req_t), .axi_resp_t (wide_out_resp_t) ) i_iso_wide_cluster ( - .clk_i (soc_clk_i), - .rst_sync_ni(rst_sync_ni[extClusterIdx]), - .slv_req_i (wide_out_isolated_req[extClusterIdx]), - .slv_resp_o (wide_out_isolated_resp[extClusterIdx]), - .mst_req_o (wide_out_req_o[extClusterIdx]), - .mst_resp_i (wide_out_resp_i[extClusterIdx]), - .isolate_i (isolate_i[extClusterIdx]), - .isolated_o (isolated_wide_out[extClusterIdx]) + .clk_i (soc_clk_i), + .rst_ni (rst_sync_ni[extClusterIdx]), + .slv_req_i (wide_out_isolated_req[extClusterIdx]), + .slv_resp_o(wide_out_isolated_resp[extClusterIdx]), + .mst_req_o (wide_out_req_o[extClusterIdx]), + .mst_resp_i(wide_out_resp_i[extClusterIdx]), + .isolate_i (isolate_i[extClusterIdx]), + .isolated_o(isolated_wide_out[extClusterIdx]) ); assign isolate_o[extClusterIdx] = isolated_narrow_in[extClusterIdx] & @@ -165,9 +165,11 @@ module chimera_clu_domain assign narrow_out_req_o[2*extClusterIdx+1] = narrow_out_isolated_req[2*extClusterIdx+1]; assign narrow_out_isolated_resp[2*extClusterIdx+1] = narrow_out_resp_i[2*extClusterIdx+1]; - assign narrow_in_isolated_req[extClusterIdx] = wide_out_isolated_req[extClusterIdx]; + assign wide_out_req_o[extClusterIdx] = wide_out_isolated_req[extClusterIdx]; assign wide_out_isolated_resp[extClusterIdx] = wide_out_resp_i[extClusterIdx]; + assign isolate_o[extClusterIdx] = '0; + end : gen_no_cluster_iso chimera_cluster #(