[vsg] fix _i/_o usage on sram_arbiter
Signed-off-by: Scott Johnson <scottdj@google.com>
diff --git a/hw/ip/prim/rtl/prim_sram_arbiter.sv b/hw/ip/prim/rtl/prim_sram_arbiter.sv
index 8a22aa4..bd80349 100644
--- a/hw/ip/prim/rtl/prim_sram_arbiter.sv
+++ b/hw/ip/prim/rtl/prim_sram_arbiter.sv
@@ -20,24 +20,24 @@
input clk_i,
input rst_ni,
- input [ N-1:0] req,
- input [SramAw-1:0] req_addr [N],
- input req_write [N],
- input [SramDw-1:0] req_wdata [N],
- output logic [ N-1:0] gnt,
+ input [ N-1:0] req_i,
+ input [SramAw-1:0] req_addr_i [N],
+ input req_write_i[N],
+ input [SramDw-1:0] req_wdata_i[N],
+ output logic [ N-1:0] gnt_o,
- output logic [ N-1:0] rsp_rvalid, // Pulse
- output logic [SramDw-1:0] rsp_rdata [N],
- output logic [ 1:0] rsp_error [N],
+ output logic [ N-1:0] rsp_rvalid_o, // Pulse
+ output logic [SramDw-1:0] rsp_rdata_o[N],
+ output logic [ 1:0] rsp_error_o[N],
// SRAM Interface
- output logic sram_req,
- output logic [SramAw-1:0] sram_addr,
- output logic sram_write,
- output logic [SramDw-1:0] sram_wdata,
- input sram_rvalid,
- input [SramDw-1:0] sram_rdata,
- input [1:0] sram_rerror
+ output logic sram_req_o,
+ output logic [SramAw-1:0] sram_addr_o,
+ output logic sram_write_o,
+ output logic [SramDw-1:0] sram_wdata_o,
+ input sram_rvalid_i,
+ input [SramDw-1:0] sram_rdata_i,
+ input [1:0] sram_rerror_i
);
@@ -52,13 +52,13 @@
req_t req_packed [N];
for (genvar i = 0 ; i < N ; i++) begin : gen_reqs
- assign req_packed[i] = {req_write[i], req_addr[i], req_wdata[i]};
+ assign req_packed[i] = {req_write_i[i], req_addr_i[i], req_wdata_i[i]};
end
req_t sram_packed;
- assign sram_write = sram_packed.write;
- assign sram_addr = sram_packed.addr;
- assign sram_wdata = sram_packed.wdata;
+ assign sram_write_o = sram_packed.write;
+ assign sram_addr_o = sram_packed.addr;
+ assign sram_wdata_o = sram_packed.wdata;
if (ArbiterImpl == "PPC") begin : gen_arb_ppc
prim_arbiter_ppc #(
@@ -67,11 +67,11 @@
) u_reqarb (
.clk_i,
.rst_ni,
- .req_i ( req ),
+ .req_i,
.data_i ( req_packed ),
- .gnt_o ( gnt ),
+ .gnt_o,
.idx_o ( ),
- .valid_o ( sram_req ),
+ .valid_o ( sram_req_o ),
.data_o ( sram_packed ),
.ready_i ( 1'b1 )
);
@@ -82,11 +82,11 @@
) u_reqarb (
.clk_i,
.rst_ni,
- .req_i ( req ),
+ .req_i,
.data_i ( req_packed ),
- .gnt_o ( gnt ),
+ .gnt_o,
.idx_o ( ),
- .valid_o ( sram_req ),
+ .valid_o ( sram_req_o ),
.data_o ( sram_packed ),
.ready_i ( 1'b1 )
);
@@ -95,10 +95,10 @@
end
- logic [N-1:0] steer; // Steering sram_rvalid
- logic sram_ack; // Ack for rvalid. |sram_rvalid
+ logic [N-1:0] steer; // Steering sram_rvalid_i
+ logic sram_ack; // Ack for rvalid. |sram_rvalid_i
- assign sram_ack = sram_rvalid & (|steer);
+ assign sram_ack = sram_rvalid_i & (|steer);
// Request FIFO
prim_fifo_sync #(
@@ -109,20 +109,20 @@
.clk_i,
.rst_ni,
.clr_i (1'b0),
- .wvalid_i (sram_req && !sram_write), // Push only for read
+ .wvalid_i (sram_req_o & ~sram_write_o), // Push only for read
.wready_o (), // TODO: Generate Error
- .wdata_i (gnt),
+ .wdata_i (gnt_o),
.depth_o (), // Not used
- .rvalid_o (), // TODO; Generate error if sram_rvalid but rvalid==0
+ .rvalid_o (), // TODO; Generate error if sram_rvalid_i but rvalid==0
.rready_i (sram_ack),
.rdata_o (steer)
);
- assign rsp_rvalid = steer & {N{sram_rvalid}};
+ assign rsp_rvalid_o = steer & {N{sram_rvalid_i}};
for (genvar i = 0 ; i < N ; i++) begin : gen_rsp
- assign rsp_rdata[i] = sram_rdata;
- assign rsp_error[i] = sram_rerror; // No SECDED yet
+ assign rsp_rdata_o[i] = sram_rdata_i;
+ assign rsp_error_o[i] = sram_rerror_i; // No SECDED yet
end
endmodule
diff --git a/hw/ip/spi_device/rtl/spi_device.sv b/hw/ip/spi_device/rtl/spi_device.sv
index b03e5b6..06040cd 100644
--- a/hw/ip/spi_device/rtl/spi_device.sv
+++ b/hw/ip/spi_device/rtl/spi_device.sv
@@ -467,31 +467,31 @@
// Arbiter for FIFOs : Connecting between SRAM Ctrls and SRAM interface
prim_sram_arbiter #(
- .N (2), // RXF, TXF
- .SramDw (SramDw),
- .SramAw (SramAw) // 2kB
+ .N (2), // RXF, TXF
+ .SramDw (SramDw),
+ .SramAw (SramAw) // 2kB
) u_fwmode_arb (
.clk_i,
.rst_ni,
- .req (fwm_sram_req),
- .req_addr (fwm_sram_addr),
- .req_write (fwm_sram_write),
- .req_wdata (fwm_sram_wdata),
- .gnt (fwm_sram_gnt),
+ .req_i (fwm_sram_req),
+ .req_addr_i (fwm_sram_addr),
+ .req_write_i (fwm_sram_write),
+ .req_wdata_i (fwm_sram_wdata),
+ .gnt_o (fwm_sram_gnt),
- .rsp_rvalid (fwm_sram_rvalid),
- .rsp_rdata (fwm_sram_rdata),
- .rsp_error (fwm_sram_error),
+ .rsp_rvalid_o (fwm_sram_rvalid),
+ .rsp_rdata_o (fwm_sram_rdata),
+ .rsp_error_o (fwm_sram_error),
- .sram_req (mem_b_req),
- .sram_addr (mem_b_addr),
- .sram_write (mem_b_write),
- .sram_wdata (mem_b_wdata),
+ .sram_req_o (mem_b_req),
+ .sram_addr_o (mem_b_addr),
+ .sram_write_o (mem_b_write),
+ .sram_wdata_o (mem_b_wdata),
- .sram_rvalid (mem_b_rvalid),
- .sram_rdata (mem_b_rdata),
- .sram_rerror (mem_b_rerror)
+ .sram_rvalid_i(mem_b_rvalid),
+ .sram_rdata_i (mem_b_rdata),
+ .sram_rerror_i(mem_b_rerror)
);
tlul_adapter_sram #(
