FPGA/verilog-pcie
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename tag to pcie_tag

Browse Source
This commit is contained in:
Alex Forencich 2021-02-25 23:54:40 -08:00
parent 062495b780
commit 912ef845a3
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
rtl/dma_if_pcie_us_rd.v
View File

@ -304,8 +304,6 @@ localparam [1:0]
reg [1:0] tlp_state_reg = TLP_STATE_IDLE, tlp_state_next; reg [1:0] tlp_state_reg = TLP_STATE_IDLE, tlp_state_next;
// datapath control signals // datapath control signals
reg tag_table_we_req;
reg tlp_cmd_ready; reg tlp_cmd_ready;
reg last_cycle; reg last_cycle;
@ -357,11 +355,6 @@ reg tlp_cmd_valid_reg = 1'b0, tlp_cmd_valid_next;
reg [127:0] tlp_header_data; reg [127:0] tlp_header_data;
reg [AXIS_PCIE_RQ_USER_WIDTH-1:0] tlp_tuser; reg [AXIS_PCIE_RQ_USER_WIDTH-1:0] tlp_tuser;
reg [RAM_SEL_WIDTH-1:0] tag_table_sel[(2**PCIE_TAG_WIDTH)-1:0];
reg [RAM_ADDR_WIDTH-1:0] tag_table_addr[(2**PCIE_TAG_WIDTH)-1:0];
reg [OP_TAG_WIDTH-1:0] tag_table_op_tag[(2**PCIE_TAG_WIDTH)-1:0];
reg tag_table_we_tlp_reg = 1'b0, tag_table_we_tlp_next;
reg [10:0] max_read_request_size_dw_reg = 11'd0; reg [10:0] max_read_request_size_dw_reg = 11'd0;
reg have_credit_reg = 1'b0; reg have_credit_reg = 1'b0;
@ -426,6 +419,13 @@ assign status_error_cor = status_error_cor_reg;
assign status_error_uncor = status_error_uncor_reg; assign status_error_uncor = status_error_uncor_reg;
// PCIe tag management // PCIe tag management
reg [RAM_SEL_WIDTH-1:0] pcie_tag_table_sel[(2**PCIE_TAG_WIDTH)-1:0];
reg [RAM_ADDR_WIDTH-1:0] pcie_tag_table_addr[(2**PCIE_TAG_WIDTH)-1:0];
reg [OP_TAG_WIDTH-1:0] pcie_tag_table_op_tag[(2**PCIE_TAG_WIDTH)-1:0];
reg pcie_tag_table_we_tlp_reg = 1'b0, pcie_tag_table_we_tlp_next;
reg pcie_tag_table_we_req;
wire [PCIE_TAG_WIDTH-1:0] new_tag; wire [PCIE_TAG_WIDTH-1:0] new_tag;
wire new_tag_valid; wire new_tag_valid;
reg new_tag_ready; reg new_tag_ready;
@ -490,8 +490,8 @@ initial begin
end end
for (i = 0; i < 2**PCIE_TAG_WIDTH; i = i + 1) begin for (i = 0; i < 2**PCIE_TAG_WIDTH; i = i + 1) begin
tag_table_addr[i] = 0; pcie_tag_table_addr[i] = 0;
tag_table_op_tag[i] = 0; pcie_tag_table_op_tag[i] = 0;
end end
end end
@ -738,7 +738,7 @@ always @* begin
last_cycle = 1'b0; last_cycle = 1'b0;
tag_table_we_tlp_next = 1'b0; pcie_tag_table_we_tlp_next = 1'b0;
s_axis_rc_tready_next = 1'b0; s_axis_rc_tready_next = 1'b0;
@ -828,10 +828,10 @@ always @* begin
//s_axis_rc_tuser[42]; // discontinue //s_axis_rc_tuser[42]; // discontinue
//s_axis_rc_tuser[74:43]; // parity //s_axis_rc_tuser[74:43]; // parity
ram_sel_next = tag_table_sel[pcie_tag_next]; ram_sel_next = pcie_tag_table_sel[pcie_tag_next];
if (!addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin if (!addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin
// current AXI address not valid, so read it from table // current RAM address not valid, so read it from table
addr_next = tag_table_addr[pcie_tag_next]; addr_next = pcie_tag_table_addr[pcie_tag_next];
end end
offset_next = addr_next[OFFSET_WIDTH-1:0] - (12+lower_addr_next[1:0]); offset_next = addr_next[OFFSET_WIDTH-1:0] - (12+lower_addr_next[1:0]);
@ -893,7 +893,7 @@ always @* begin
addr_next = addr_next + cycle_byte_count_next; addr_next = addr_next + cycle_byte_count_next;
op_count_next = op_count_next - cycle_byte_count_next; op_count_next = op_count_next - cycle_byte_count_next;
op_tag_next = tag_table_op_tag[pcie_tag_next]; op_tag_next = pcie_tag_table_op_tag[pcie_tag_next];
if (active_tags[pcie_tag_next] && error_code_next == RC_ERROR_NORMAL_TERMINATION) begin if (active_tags[pcie_tag_next] && error_code_next == RC_ERROR_NORMAL_TERMINATION) begin
// no error // no error
@ -914,7 +914,7 @@ always @* begin
status_fifo_finish_next = 1'b1; status_fifo_finish_next = 1'b1;
end else begin end else begin
// more completions to come, store current address // more completions to come, store current address
tag_table_we_tlp_next = 1'b1; pcie_tag_table_we_tlp_next = 1'b1;
end end
tlp_state_next = TLP_STATE_IDLE; tlp_state_next = TLP_STATE_IDLE;
end else begin end else begin
@ -1036,10 +1036,10 @@ always @* begin
//s_axis_rc_tdata[27:25]; // attr //s_axis_rc_tdata[27:25]; // attr
//s_axis_rc_tdata[30:28]; // tc //s_axis_rc_tdata[30:28]; // tc
ram_sel_next = tag_table_sel[pcie_tag_next]; ram_sel_next = pcie_tag_table_sel[pcie_tag_next];
if (!addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin if (!addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin
// current AXI address not valid, so read it from table // current AXI address not valid, so read it from table
addr_next = tag_table_addr[pcie_tag_next]; addr_next = pcie_tag_table_addr[pcie_tag_next];
end end
offset_next = addr_next[OFFSET_WIDTH-1:0] - (4+lower_addr_reg[1:0]); offset_next = addr_next[OFFSET_WIDTH-1:0] - (4+lower_addr_reg[1:0]);
@ -1071,7 +1071,7 @@ always @* begin
addr_next = addr_next + cycle_byte_count_next; addr_next = addr_next + cycle_byte_count_next;
op_count_next = op_count_next - cycle_byte_count_next; op_count_next = op_count_next - cycle_byte_count_next;
op_tag_next = tag_table_op_tag[pcie_tag_next]; op_tag_next = pcie_tag_table_op_tag[pcie_tag_next];
if (active_tags[pcie_tag_next] && error_code_reg == RC_ERROR_NORMAL_TERMINATION) begin if (active_tags[pcie_tag_next] && error_code_reg == RC_ERROR_NORMAL_TERMINATION) begin
// no error // no error
@ -1092,7 +1092,7 @@ always @* begin
status_fifo_finish_next = 1'b1; status_fifo_finish_next = 1'b1;
end else begin end else begin
// more completions to come, store current address // more completions to come, store current address
tag_table_we_tlp_next = 1'b1; pcie_tag_table_we_tlp_next = 1'b1;
end end
s_axis_rc_tready_next = 1'b1; s_axis_rc_tready_next = 1'b1;
tlp_state_next = TLP_STATE_IDLE; tlp_state_next = TLP_STATE_IDLE;
@ -1207,7 +1207,7 @@ always @* begin
status_fifo_finish_next = 1'b1; status_fifo_finish_next = 1'b1;
end else begin end else begin
// more completions to come, store current address // more completions to come, store current address
tag_table_we_tlp_next = 1'b1; pcie_tag_table_we_tlp_next = 1'b1;
end end
if (AXIS_PCIE_DATA_WIDTH == 64) begin if (AXIS_PCIE_DATA_WIDTH == 64) begin
@ -1309,15 +1309,15 @@ always @* begin
end end
always @* begin always @* begin
tag_table_we_req = 1'b0; pcie_tag_table_we_req = 1'b0;
tlp_cmd_ready = 1'b0; tlp_cmd_ready = 1'b0;
// tag table write management // tag table write management
if (tag_table_we_tlp_reg) begin if (pcie_tag_table_we_tlp_reg) begin
end else if (tlp_cmd_valid_reg) begin end else if (tlp_cmd_valid_reg) begin
tlp_cmd_ready = 1'b1; tlp_cmd_ready = 1'b1;
tag_table_we_req = 1'b1; pcie_tag_table_we_req = 1'b1;
end end
end end
@ -1411,14 +1411,14 @@ always @(posedge clk) begin
active_tx_count_av_reg <= active_tx_count_reg < TX_LIMIT; active_tx_count_av_reg <= active_tx_count_reg < TX_LIMIT;
end end
tag_table_we_tlp_reg <= tag_table_we_tlp_next; pcie_tag_table_we_tlp_reg <= pcie_tag_table_we_tlp_next;
if (tag_table_we_tlp_reg) begin if (pcie_tag_table_we_tlp_reg) begin
tag_table_addr[pcie_tag_reg] <= addr_reg; pcie_tag_table_addr[pcie_tag_reg] <= addr_reg;
end else if (tlp_cmd_valid_reg && tag_table_we_req) begin end else if (tlp_cmd_valid_reg && pcie_tag_table_we_req) begin
tag_table_sel[tlp_cmd_pcie_tag_reg] <= tlp_cmd_ram_sel_reg; pcie_tag_table_sel[tlp_cmd_pcie_tag_reg] <= tlp_cmd_ram_sel_reg;
tag_table_addr[tlp_cmd_pcie_tag_reg] <= tlp_cmd_addr_reg; pcie_tag_table_addr[tlp_cmd_pcie_tag_reg] <= tlp_cmd_addr_reg;
tag_table_op_tag[tlp_cmd_pcie_tag_reg] <= tlp_cmd_op_tag_reg; pcie_tag_table_op_tag[tlp_cmd_pcie_tag_reg] <= tlp_cmd_op_tag_reg;
end end
if (op_table_start_en) begin if (op_table_start_en) begin
@ -1470,7 +1470,7 @@ always @(posedge clk) begin
active_tx_count_reg <= {RQ_SEQ_NUM_WIDTH{1'b0}}; active_tx_count_reg <= {RQ_SEQ_NUM_WIDTH{1'b0}};
active_tx_count_av_reg <= 1'b1; active_tx_count_av_reg <= 1'b1;
tag_table_we_tlp_reg <= 1'b0; pcie_tag_table_we_tlp_reg <= 1'b0;
op_tag_fifo_init_reg <= 0; op_tag_fifo_init_reg <= 0;
op_tag_fifo_wr_ptr_reg <= 0; op_tag_fifo_wr_ptr_reg <= 0;

48
rtl/pcie_us_axi_dma_rd.v
View File

@ -312,8 +312,6 @@ reg [2:0] tlp_state_reg = TLP_STATE_IDLE, tlp_state_next;
// datapath control signals // datapath control signals
reg transfer_in_save; reg transfer_in_save;
reg tag_table_we_req;
reg tlp_cmd_ready; reg tlp_cmd_ready;
reg finish_tag; reg finish_tag;
@ -361,10 +359,6 @@ reg tlp_cmd_valid_reg = 1'b0, tlp_cmd_valid_next;
reg [127:0] tlp_header_data; reg [127:0] tlp_header_data;
reg [AXIS_PCIE_RQ_USER_WIDTH-1:0] tlp_tuser; reg [AXIS_PCIE_RQ_USER_WIDTH-1:0] tlp_tuser;
reg [AXI_ADDR_WIDTH-1:0] tag_table_axi_addr[(2**PCIE_TAG_WIDTH)-1:0];
reg [OP_TAG_WIDTH-1:0] tag_table_op_tag[(2**PCIE_TAG_WIDTH)-1:0];
reg tag_table_we_tlp_reg = 1'b0, tag_table_we_tlp_next;
reg [10:0] max_read_request_size_dw_reg = 11'd0; reg [10:0] max_read_request_size_dw_reg = 11'd0;
reg have_credit_reg = 1'b0; reg have_credit_reg = 1'b0;
@ -429,6 +423,12 @@ assign status_error_cor = status_error_cor_reg;
assign status_error_uncor = status_error_uncor_reg; assign status_error_uncor = status_error_uncor_reg;
// PCIe tag management // PCIe tag management
reg [AXI_ADDR_WIDTH-1:0] pcie_tag_table_axi_addr[(2**PCIE_TAG_WIDTH)-1:0];
reg [OP_TAG_WIDTH-1:0] pcie_tag_table_op_tag[(2**PCIE_TAG_WIDTH)-1:0];
reg pcie_tag_table_we_tlp_reg = 1'b0, pcie_tag_table_we_tlp_next;
reg pcie_tag_table_we_req;
wire [PCIE_TAG_WIDTH-1:0] new_tag; wire [PCIE_TAG_WIDTH-1:0] new_tag;
wire new_tag_valid; wire new_tag_valid;
reg new_tag_ready; reg new_tag_ready;
@ -507,8 +507,8 @@ initial begin
end end
for (i = 0; i < 2**PCIE_TAG_WIDTH; i = i + 1) begin for (i = 0; i < 2**PCIE_TAG_WIDTH; i = i + 1) begin
tag_table_axi_addr[i] = 0; pcie_tag_table_axi_addr[i] = 0;
tag_table_op_tag[i] = 0; pcie_tag_table_op_tag[i] = 0;
end end
end end
@ -758,7 +758,7 @@ always @* begin
finish_tag = 1'b0; finish_tag = 1'b0;
tag_table_we_tlp_next = 1'b0; pcie_tag_table_we_tlp_next = 1'b0;
s_axis_rc_tready_next = 1'b0; s_axis_rc_tready_next = 1'b0;
@ -847,7 +847,7 @@ always @* begin
if (!axi_addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin if (!axi_addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin
// current AXI address not valid, so read it from table // current AXI address not valid, so read it from table
axi_addr_next = tag_table_axi_addr[pcie_tag_next]; axi_addr_next = pcie_tag_table_axi_addr[pcie_tag_next];
end end
offset_next = axi_addr_next[OFFSET_WIDTH-1:0] - (12+lower_addr_next[1:0]); offset_next = axi_addr_next[OFFSET_WIDTH-1:0] - (12+lower_addr_next[1:0]);
@ -876,7 +876,7 @@ always @* begin
end end
end end
op_tag_next = tag_table_op_tag[pcie_tag_next]; op_tag_next = pcie_tag_table_op_tag[pcie_tag_next];
if (active_tags[pcie_tag_next] && error_code_next == RC_ERROR_NORMAL_TERMINATION) begin if (active_tags[pcie_tag_next] && error_code_next == RC_ERROR_NORMAL_TERMINATION) begin
// no error // no error
@ -982,7 +982,7 @@ always @* begin
if (!axi_addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin if (!axi_addr_valid_reg || pcie_tag_reg != pcie_tag_next) begin
// current AXI address not valid, so read it from table // current AXI address not valid, so read it from table
axi_addr_next = tag_table_axi_addr[pcie_tag_next]; axi_addr_next = pcie_tag_table_axi_addr[pcie_tag_next];
end end
offset_next = axi_addr_next[OFFSET_WIDTH-1:0] - (4+lower_addr_reg[1:0]); offset_next = axi_addr_next[OFFSET_WIDTH-1:0] - (4+lower_addr_reg[1:0]);
@ -1011,7 +1011,7 @@ always @* begin
end end
end end
op_tag_next = tag_table_op_tag[pcie_tag_next]; op_tag_next = pcie_tag_table_op_tag[pcie_tag_next];
if (active_tags[pcie_tag_next] && error_code_reg == RC_ERROR_NORMAL_TERMINATION) begin if (active_tags[pcie_tag_next] && error_code_reg == RC_ERROR_NORMAL_TERMINATION) begin
// no error // no error
@ -1207,7 +1207,7 @@ always @* begin
op_table_read_finish_en = 1'b1; op_table_read_finish_en = 1'b1;
end else begin end else begin
// more completions to come, store current address // more completions to come, store current address
tag_table_we_tlp_next = 1'b1; pcie_tag_table_we_tlp_next = 1'b1;
end end
if (AXIS_PCIE_DATA_WIDTH > 64) begin if (AXIS_PCIE_DATA_WIDTH > 64) begin
@ -1305,15 +1305,15 @@ always @* begin
end end
always @* begin always @* begin
tag_table_we_req = 1'b0; pcie_tag_table_we_req = 1'b0;
tlp_cmd_ready = 1'b0; tlp_cmd_ready = 1'b0;
// tag table write management // tag table write management
if (tag_table_we_tlp_reg) begin if (pcie_tag_table_we_tlp_reg) begin
end else if (tlp_cmd_valid_reg) begin end else if (tlp_cmd_valid_reg) begin
tlp_cmd_ready = 1'b1; tlp_cmd_ready = 1'b1;
tag_table_we_req = 1'b1; pcie_tag_table_we_req = 1'b1;
end end
end end
@ -1395,13 +1395,13 @@ always @(posedge clk) begin
save_axis_tdata_reg <= s_axis_rc_tdata; save_axis_tdata_reg <= s_axis_rc_tdata;
end end
tag_table_we_tlp_reg <= tag_table_we_tlp_next; pcie_tag_table_we_tlp_reg <= pcie_tag_table_we_tlp_next;
if (tag_table_we_tlp_reg) begin if (pcie_tag_table_we_tlp_reg) begin
tag_table_axi_addr[pcie_tag_reg] <= axi_addr_reg; pcie_tag_table_axi_addr[pcie_tag_reg] <= axi_addr_reg;
end else if (tlp_cmd_valid_reg && tag_table_we_req) begin end else if (tlp_cmd_valid_reg && pcie_tag_table_we_req) begin
tag_table_axi_addr[tlp_cmd_pcie_tag_reg] <= tlp_cmd_addr_reg; pcie_tag_table_axi_addr[tlp_cmd_pcie_tag_reg] <= tlp_cmd_addr_reg;
tag_table_op_tag[tlp_cmd_pcie_tag_reg] <= tlp_cmd_op_tag_reg; pcie_tag_table_op_tag[tlp_cmd_pcie_tag_reg] <= tlp_cmd_op_tag_reg;
end end
if (op_table_start_en) begin if (op_table_start_en) begin
@ -1460,7 +1460,7 @@ always @(posedge clk) begin
active_tx_count_reg <= {RQ_SEQ_NUM_WIDTH{1'b0}}; active_tx_count_reg <= {RQ_SEQ_NUM_WIDTH{1'b0}};
active_tx_count_av_reg = 1'b1; active_tx_count_av_reg = 1'b1;
tag_table_we_tlp_reg <= 1'b0; pcie_tag_table_we_tlp_reg <= 1'b0;
op_tag_fifo_init_reg <= 0; op_tag_fifo_init_reg <= 0;
op_tag_fifo_wr_ptr_reg <= 0; op_tag_fifo_wr_ptr_reg <= 0;