Skip to content

Commit 479658b

Browse files
glaserfglaserf
committed
[axi] Add aXcache, aXprot, aXqos, aXregion fields
Signed-off-by: Florian Glaser <glaserf@lowrisc.org>
1 parent 31599ca commit 479658b

5 files changed

Lines changed: 64 additions & 0 deletions

File tree

‎verification/cocotb/block/axi_adapter/test_bus_stress.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ async def initialize(dut, timeout=50):
3535
dut.aruser.value = 0
3636
dut.arid.value = 0
3737
dut.arlock.value = 0
38+
dut.arcache.value = 0
39+
dut.arprot.value = 0
40+
dut.arqos.value = 0
41+
dut.arregion.value = 0
3842
dut.arvalid.value = 0
3943
dut.rready.value = 0
4044
dut.awaddr.value = 0
@@ -44,6 +48,10 @@ async def initialize(dut, timeout=50):
4448
dut.awuser.value = 0
4549
dut.awid.value = 0
4650
dut.awlock.value = 0
51+
dut.awcache.value = 0
52+
dut.awprot.value = 0
53+
dut.awqos.value = 0
54+
dut.awregion.value = 0
4755
dut.awvalid.value = 0
4856
dut.wdata.value = 0
4957
dut.wstrb.value = 0

‎verification/cocotb/block/axi_adapter_id_filter/axi_utils.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ async def initialize_dut(dut, disable_id_filtering=False, priv_ids=None, timeout
5656
dut.aruser.value = 0
5757
dut.arid.value = 0
5858
dut.arlock.value = 0
59+
dut.arcache.value = 0
60+
dut.arprot.value = 0
61+
dut.arqos.value = 0
62+
dut.arregion.value = 0
5963
dut.arvalid.value = 0
6064
dut.rready.value = 0
6165
dut.awaddr.value = 0
@@ -65,6 +69,10 @@ async def initialize_dut(dut, disable_id_filtering=False, priv_ids=None, timeout
6569
dut.awuser.value = 0
6670
dut.awid.value = 0
6771
dut.awlock.value = 0
72+
dut.awcache.value = 0
73+
dut.awprot.value = 0
74+
dut.awqos.value = 0
75+
dut.awregion.value = 0
6876
dut.awvalid.value = 0
6977
dut.wdata.value = 0
7078
dut.wstrb.value = 0

‎verification/cocotb/block/hci_queues_axi/hci_queues_wrapper.sv‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ module hci_queues_wrapper
7777
input [AxiUserWidth-1:0] aruser,
7878
input logic [ AxiIdWidth-1:0] arid,
7979
input logic arlock,
80+
input logic [ 3:0] arcache,
81+
input logic [ 2:0] arprot,
82+
input logic [ 3:0] arqos,
83+
input logic [ 3:0] arregion,
8084
input logic arvalid,
8185
output logic arready,
8286

@@ -95,6 +99,10 @@ module hci_queues_wrapper
9599
input [AxiUserWidth-1:0] awuser,
96100
input logic [ AxiIdWidth-1:0] awid,
97101
input logic awlock,
102+
input logic [ 3:0] awcache,
103+
input logic [ 2:0] awprot,
104+
input logic [ 3:0] awqos,
105+
input logic [ 3:0] awregion,
98106
input logic awvalid,
99107
output logic awready,
100108

@@ -278,6 +286,10 @@ module hci_queues_wrapper
278286
assign s_axi_if.aruser = aruser;
279287
assign s_axi_if.arid = arid;
280288
assign s_axi_if.arlock = arlock;
289+
assign s_axi_if.arcache = arcache;
290+
assign s_axi_if.arprot = arprot;
291+
assign s_axi_if.arqos = arqos;
292+
assign s_axi_if.arregion = arregion;
281293
assign s_axi_if.arvalid = arvalid;
282294
assign arready = s_axi_if.arready;
283295

@@ -296,6 +308,10 @@ module hci_queues_wrapper
296308
assign s_axi_if.awuser = awuser;
297309
assign s_axi_if.awid = awid;
298310
assign s_axi_if.awlock = awlock;
311+
assign s_axi_if.awcache = awcache;
312+
assign s_axi_if.awprot = awprot;
313+
assign s_axi_if.awqos = awqos;
314+
assign s_axi_if.awregion = awregion;
299315
assign s_axi_if.awvalid = awvalid;
300316
assign awready = s_axi_if.awready;
301317

‎verification/cocotb/block/lib_adapter/axi_adapter_wrapper.sv‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ module axi_adapter_wrapper
3232
input logic [AxiUserWidth-1:0] aruser,
3333
input logic [ AxiIdWidth-1:0] arid,
3434
input logic arlock,
35+
input logic [ 3:0] arcache,
36+
input logic [ 2:0] arprot,
37+
input logic [ 3:0] arqos,
38+
input logic [ 3:0] arregion,
3539
input logic arvalid,
3640
output logic arready,
3741

@@ -51,6 +55,10 @@ module axi_adapter_wrapper
5155
input logic [AxiUserWidth-1:0] awuser,
5256
input logic [ AxiIdWidth-1:0] awid,
5357
input logic awlock,
58+
input logic [ 3:0] awcache,
59+
input logic [ 2:0] awprot,
60+
input logic [ 3:0] awqos,
61+
input logic [ 3:0] awregion,
5462
input logic awvalid,
5563
output logic awready,
5664

@@ -109,6 +117,10 @@ module axi_adapter_wrapper
109117
assign s_axi_if.aruser = aruser;
110118
assign s_axi_if.arid = arid;
111119
assign s_axi_if.arlock = arlock;
120+
assign s_axi_if.arcache = arcache;
121+
assign s_axi_if.arprot = arprot;
122+
assign s_axi_if.arqos = arqos;
123+
assign s_axi_if.arregion = arregion;
112124
assign s_axi_if.arvalid = arvalid;
113125
assign arready = s_axi_if.arready;
114126

@@ -128,6 +140,10 @@ module axi_adapter_wrapper
128140
assign s_axi_if.awuser = awuser;
129141
assign s_axi_if.awid = awid;
130142
assign s_axi_if.awlock = awlock;
143+
assign s_axi_if.awcache = awcache;
144+
assign s_axi_if.awprot = awprot;
145+
assign s_axi_if.awqos = awqos;
146+
assign s_axi_if.awregion = awregion;
131147
assign s_axi_if.awvalid = awvalid;
132148
assign awready = s_axi_if.awready;
133149

‎verification/cocotb/top/lib_i3c_top/i3c_test_wrapper.sv‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ module i3c_test_wrapper #(
4949
input logic [AxiUserWidth-1:0] aruser,
5050
input logic [ AxiIdWidth-1:0] arid,
5151
input logic arlock,
52+
input logic [ 3:0] arcache,
53+
input logic [ 2:0] arprot,
54+
input logic [ 3:0] arqos,
55+
input logic [ 3:0] arregion,
5256
input logic arvalid,
5357
output logic arready,
5458

@@ -67,6 +71,10 @@ module i3c_test_wrapper #(
6771
input logic [AxiUserWidth-1:0] awuser,
6872
input logic [ AxiIdWidth-1:0] awid,
6973
input logic awlock,
74+
input logic [ 3:0] awcache,
75+
input logic [ 2:0] awprot,
76+
input logic [ 3:0] awqos,
77+
input logic [ 3:0] awregion,
7078
input logic awvalid,
7179
output logic awready,
7280

@@ -196,6 +204,10 @@ assign s_axi_if.arlen = arlen;
196204
assign s_axi_if.aruser = aruser;
197205
assign s_axi_if.arid = arid;
198206
assign s_axi_if.arlock = arlock;
207+
assign s_axi_if.arcache = arcache;
208+
assign s_axi_if.arprot = arprot;
209+
assign s_axi_if.arqos = arqos;
210+
assign s_axi_if.arregion = arregion;
199211
assign s_axi_if.arvalid = arvalid;
200212
assign arready = s_axi_if.arready;
201213

@@ -214,6 +226,10 @@ assign s_axi_if.awlen = awlen;
214226
assign s_axi_if.awuser = awuser;
215227
assign s_axi_if.awid = awid;
216228
assign s_axi_if.awlock = awlock;
229+
assign s_axi_if.awcache = awcache;
230+
assign s_axi_if.awprot = awprot;
231+
assign s_axi_if.awqos = awqos;
232+
assign s_axi_if.awregion = awregion;
217233
assign s_axi_if.awvalid = awvalid;
218234
assign awready = s_axi_if.awready;
219235

0 commit comments

Comments
 (0)