Skip to content

Commit

Permalink
Change: Resize ALOCK to 1 bit. No more AXI3 capable
Browse files Browse the repository at this point in the history
  • Loading branch information
@dpretet
dpretet committed Mar 4, 2024
1 parent 99cb834 commit 2ff38a4
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 53 deletions.
16 changes: 8 additions & 8 deletions rtl/axicb_crossbar_lite_top.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ module axicb_crossbar_lite_top
.slv0_awlen (8'h0),
.slv0_awsize (3'b0),
.slv0_awburst (2'b0),
.slv0_awlock (2'b0),
.slv0_awlock (1'b0),
.slv0_awcache (4'b0),
.slv0_awprot (slv0_awprot),
.slv0_awqos (4'b0),
Expand All @@ -605,7 +605,7 @@ module axicb_crossbar_lite_top
.slv0_arlen (8'h0),
.slv0_arsize (3'h0),
.slv0_arburst (2'b0),
.slv0_arlock (2'b0),
.slv0_arlock (1'b0),
.slv0_arcache (4'h0),
.slv0_arprot (slv0_arprot),
.slv0_arqos (4'h0),
Expand All @@ -628,7 +628,7 @@ module axicb_crossbar_lite_top
.slv1_awlen (8'h0),
.slv1_awsize (3'b0),
.slv1_awburst (2'b0),
.slv1_awlock (2'b0),
.slv1_awlock (1'b0),
.slv1_awcache (4'b0),
.slv1_awprot (slv1_awprot),
.slv1_awqos (4'b0),
Expand All @@ -652,7 +652,7 @@ module axicb_crossbar_lite_top
.slv1_arlen (8'h0),
.slv1_arsize (3'h0),
.slv1_arburst (2'b0),
.slv1_arlock (2'b0),
.slv1_arlock (1'b0),
.slv1_arcache (4'h0),
.slv1_arprot (slv1_arprot),
.slv1_arqos (4'h0),
Expand All @@ -675,7 +675,7 @@ module axicb_crossbar_lite_top
.slv2_awlen (8'h0),
.slv2_awsize (3'b0),
.slv2_awburst (2'b0),
.slv2_awlock (2'b0),
.slv2_awlock (1'b0),
.slv2_awcache (4'b0),
.slv2_awprot (slv2_awprot),
.slv2_awqos (4'b0),
Expand All @@ -699,7 +699,7 @@ module axicb_crossbar_lite_top
.slv2_arlen (8'h0),
.slv2_arsize (3'h0),
.slv2_arburst (2'b0),
.slv2_arlock (2'b0),
.slv2_arlock (1'b0),
.slv2_arcache (4'h0),
.slv2_arprot (slv2_arprot),
.slv2_arqos (4'h0),
Expand All @@ -722,7 +722,7 @@ module axicb_crossbar_lite_top
.slv3_awlen (8'h0),
.slv3_awsize (3'b0),
.slv3_awburst (2'b0),
.slv3_awlock (2'b0),
.slv3_awlock (1'b0),
.slv3_awcache (4'b0),
.slv3_awprot (slv3_awprot),
.slv3_awqos (4'b0),
Expand All @@ -746,7 +746,7 @@ module axicb_crossbar_lite_top
.slv3_arlen (8'h0),
.slv3_arsize (3'h0),
.slv3_arburst (2'b0),
.slv3_arlock (2'b0),
.slv3_arlock (1'b0),
.slv3_arcache (4'h0),
.slv3_arprot (slv3_arprot),
.slv3_arqos (4'h0),
Expand Down
34 changes: 17 additions & 17 deletions rtl/axicb_crossbar_top.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv0_awlen,
input wire [3 -1:0] slv0_awsize,
input wire [2 -1:0] slv0_awburst,
input wire [2 -1:0] slv0_awlock,
input wire slv0_awlock,
input wire [4 -1:0] slv0_awcache,
input wire [3 -1:0] slv0_awprot,
input wire [4 -1:0] slv0_awqos,
Expand All @@ -261,7 +261,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv0_arlen,
input wire [3 -1:0] slv0_arsize,
input wire [2 -1:0] slv0_arburst,
input wire [2 -1:0] slv0_arlock,
input wire slv0_arlock,
input wire [4 -1:0] slv0_arcache,
input wire [3 -1:0] slv0_arprot,
input wire [4 -1:0] slv0_arqos,
Expand Down Expand Up @@ -289,7 +289,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv1_awlen,
input wire [3 -1:0] slv1_awsize,
input wire [2 -1:0] slv1_awburst,
input wire [2 -1:0] slv1_awlock,
input wire slv1_awlock,
input wire [4 -1:0] slv1_awcache,
input wire [3 -1:0] slv1_awprot,
input wire [4 -1:0] slv1_awqos,
Expand All @@ -313,7 +313,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv1_arlen,
input wire [3 -1:0] slv1_arsize,
input wire [2 -1:0] slv1_arburst,
input wire [2 -1:0] slv1_arlock,
input wire slv1_arlock,
input wire [4 -1:0] slv1_arcache,
input wire [3 -1:0] slv1_arprot,
input wire [4 -1:0] slv1_arqos,
Expand Down Expand Up @@ -341,7 +341,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv2_awlen,
input wire [3 -1:0] slv2_awsize,
input wire [2 -1:0] slv2_awburst,
input wire [2 -1:0] slv2_awlock,
input wire slv2_awlock,
input wire [4 -1:0] slv2_awcache,
input wire [3 -1:0] slv2_awprot,
input wire [4 -1:0] slv2_awqos,
Expand All @@ -365,7 +365,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv2_arlen,
input wire [3 -1:0] slv2_arsize,
input wire [2 -1:0] slv2_arburst,
input wire [2 -1:0] slv2_arlock,
input wire slv2_arlock,
input wire [4 -1:0] slv2_arcache,
input wire [3 -1:0] slv2_arprot,
input wire [4 -1:0] slv2_arqos,
Expand Down Expand Up @@ -393,7 +393,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv3_awlen,
input wire [3 -1:0] slv3_awsize,
input wire [2 -1:0] slv3_awburst,
input wire [2 -1:0] slv3_awlock,
input wire slv3_awlock,
input wire [4 -1:0] slv3_awcache,
input wire [3 -1:0] slv3_awprot,
input wire [4 -1:0] slv3_awqos,
Expand All @@ -417,7 +417,7 @@ module axicb_crossbar_top
input wire [8 -1:0] slv3_arlen,
input wire [3 -1:0] slv3_arsize,
input wire [2 -1:0] slv3_arburst,
input wire [2 -1:0] slv3_arlock,
input wire slv3_arlock,
input wire [4 -1:0] slv3_arcache,
input wire [3 -1:0] slv3_arprot,
input wire [4 -1:0] slv3_arqos,
Expand Down Expand Up @@ -445,7 +445,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst0_awlen,
output logic [3 -1:0] mst0_awsize,
output logic [2 -1:0] mst0_awburst,
output logic [2 -1:0] mst0_awlock,
output logic mst0_awlock,
output logic [4 -1:0] mst0_awcache,
output logic [3 -1:0] mst0_awprot,
output logic [4 -1:0] mst0_awqos,
Expand All @@ -469,7 +469,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst0_arlen,
output logic [3 -1:0] mst0_arsize,
output logic [2 -1:0] mst0_arburst,
output logic [2 -1:0] mst0_arlock,
output logic mst0_arlock,
output logic [4 -1:0] mst0_arcache,
output logic [3 -1:0] mst0_arprot,
output logic [4 -1:0] mst0_arqos,
Expand Down Expand Up @@ -497,7 +497,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst1_awlen,
output logic [3 -1:0] mst1_awsize,
output logic [2 -1:0] mst1_awburst,
output logic [2 -1:0] mst1_awlock,
output logic mst1_awlock,
output logic [4 -1:0] mst1_awcache,
output logic [3 -1:0] mst1_awprot,
output logic [4 -1:0] mst1_awqos,
Expand All @@ -521,7 +521,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst1_arlen,
output logic [3 -1:0] mst1_arsize,
output logic [2 -1:0] mst1_arburst,
output logic [2 -1:0] mst1_arlock,
output logic mst1_arlock,
output logic [4 -1:0] mst1_arcache,
output logic [3 -1:0] mst1_arprot,
output logic [4 -1:0] mst1_arqos,
Expand Down Expand Up @@ -549,7 +549,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst2_awlen,
output logic [3 -1:0] mst2_awsize,
output logic [2 -1:0] mst2_awburst,
output logic [2 -1:0] mst2_awlock,
output logic mst2_awlock,
output logic [4 -1:0] mst2_awcache,
output logic [3 -1:0] mst2_awprot,
output logic [4 -1:0] mst2_awqos,
Expand All @@ -573,7 +573,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst2_arlen,
output logic [3 -1:0] mst2_arsize,
output logic [2 -1:0] mst2_arburst,
output logic [2 -1:0] mst2_arlock,
output logic mst2_arlock,
output logic [4 -1:0] mst2_arcache,
output logic [3 -1:0] mst2_arprot,
output logic [4 -1:0] mst2_arqos,
Expand Down Expand Up @@ -601,7 +601,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst3_awlen,
output logic [3 -1:0] mst3_awsize,
output logic [2 -1:0] mst3_awburst,
output logic [2 -1:0] mst3_awlock,
output logic mst3_awlock,
output logic [4 -1:0] mst3_awcache,
output logic [3 -1:0] mst3_awprot,
output logic [4 -1:0] mst3_awqos,
Expand All @@ -625,7 +625,7 @@ module axicb_crossbar_top
output logic [8 -1:0] mst3_arlen,
output logic [3 -1:0] mst3_arsize,
output logic [2 -1:0] mst3_arburst,
output logic [2 -1:0] mst3_arlock,
output logic mst3_arlock,
output logic [4 -1:0] mst3_arcache,
output logic [3 -1:0] mst3_arprot,
output logic [4 -1:0] mst3_arqos,
Expand Down Expand Up @@ -698,7 +698,7 @@ module axicb_crossbar_top
// AXI4-lite signaling
localparam AWCH_W = (AXI_SIGNALING==0) ? AXI_ADDR_W + AXI_ID_W + 3 + AUSER_W :
// AXI4 signaling
AXI_ADDR_W + AXI_ID_W + 30 + AUSER_W;
AXI_ADDR_W + AXI_ID_W + 29 + AUSER_W;

localparam WCH_W = AXI_DATA_W + AXI_DATA_W/8 + WUSER_W;

Expand Down
4 changes: 2 additions & 2 deletions rtl/axicb_mst_if.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ module axicb_mst_if
output logic [8 -1:0] o_awlen,
output logic [3 -1:0] o_awsize,
output logic [2 -1:0] o_awburst,
output logic [2 -1:0] o_awlock,
output logic o_awlock,
output logic [4 -1:0] o_awcache,
output logic [3 -1:0] o_awprot,
output logic [4 -1:0] o_awqos,
Expand All @@ -106,7 +106,7 @@ module axicb_mst_if
output logic [8 -1:0] o_arlen,
output logic [3 -1:0] o_arsize,
output logic [2 -1:0] o_arburst,
output logic [2 -1:0] o_arlock,
output logic o_arlock,
output logic [4 -1:0] o_arcache,
output logic [3 -1:0] o_arprot,
output logic [4 -1:0] o_arqos,
Expand Down
4 changes: 2 additions & 2 deletions rtl/axicb_slv_if.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module axicb_slv_if
input wire [8 -1:0] i_awlen,
input wire [3 -1:0] i_awsize,
input wire [2 -1:0] i_awburst,
input wire [2 -1:0] i_awlock,
input wire i_awlock,
input wire [4 -1:0] i_awcache,
input wire [3 -1:0] i_awprot,
input wire [4 -1:0] i_awqos,
Expand All @@ -83,7 +83,7 @@ module axicb_slv_if
input wire [8 -1:0] i_arlen,
input wire [3 -1:0] i_arsize,
input wire [2 -1:0] i_arburst,
input wire [2 -1:0] i_arlock,
input wire i_arlock,
input wire [4 -1:0] i_arcache,
input wire [3 -1:0] i_arprot,
input wire [4 -1:0] i_arqos,
Expand Down
Loading

0 comments on commit 2ff38a4

Please sign in to comment.