Skip to content

noc_axi4_bridge fix #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NAP64 wants to merge 1 commit into
base: openpiton
Choose a base branch
from
Open

noc_axi4_bridge fix #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions piton/design/chipset/noc_axi4_bridge/rtl/noc_axi4_bridge_ser.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ localparam SEND_HEADER = 2'd1;
localparam SEND_DATA = 2'd2;

reg [`AXI4_DATA_WIDTH-1:0] data_in_f;
reg [`NOC_DATA_WIDTH-1:0] resp_header;

wire in_go = in_val & in_rdy;
wire flit_out_go = flit_out_val & flit_out_rdy;
Expand Down Expand Up @@ -102,7 +103,7 @@ always @(posedge clk) begin
SEND_DATA: begin
if (remaining_flits == `MSG_LENGTH_WIDTH'b1) begin
state <= flit_out_rdy ? ACCEPT : SEND_DATA;
remaining_flits <= 0;
remaining_flits <= flit_out_rdy ? 0 : 1;
end
else begin
state <= SEND_DATA;
Expand All @@ -118,7 +119,6 @@ always @(posedge clk) begin
end
end

reg [`NOC_DATA_WIDTH-1:0] resp_header;
always @(posedge clk) begin
if (~rst_n) begin
resp_header <= `NOC_DATA_WIDTH'b0;
Expand Down
32 changes: 21 additions & 11 deletions piton/design/chipset/noc_axi4_bridge/rtl/noc_axi4_bridge_write.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ assign m_axi_wid = {{`AXI4_ID_WIDTH-`NOC_AXI4_BRIDGE_BUFFER_ADDR_SIZE{1'b0}}, re

wire [`PHY_ADDR_WIDTH-1:0] virt_addr = req_header_f[`MSG_ADDR];
wire [`AXI4_ADDR_WIDTH-1:0] phys_addr;
wire [`PHY_ADDR_WIDTH-1:0] addr_n = uart_boot_en ? {phys_addr[`AXI4_ADDR_WIDTH-4:0], 3'b0} : virt_addr;
wire uncacheable = (virt_addr[`PHY_ADDR_WIDTH-1])
|| (req_header_f[`MSG_TYPE] == `MSG_TYPE_NC_STORE_REQ);

Expand Down Expand Up @@ -201,47 +202,56 @@ always @(posedge clk) begin
if (uncacheable) begin
case (req_header_f[`MSG_DATA_SIZE])
`MSG_DATA_SIZE_0B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'b0;
strb_before_offset <= `AXI4_STRB_WIDTH'h0000000000000000;
offset <= 64 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_1B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'b1;
strb_before_offset <= `AXI4_STRB_WIDTH'h8000000000000000;
offset <= 56 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_2B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'b11;
strb_before_offset <= `AXI4_STRB_WIDTH'hc000000000000000;
offset <= 56 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_4B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'hf;
strb_before_offset <= `AXI4_STRB_WIDTH'hf000000000000000;
offset <= 56 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_8B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'hff;
strb_before_offset <= `AXI4_STRB_WIDTH'hff00000000000000;
offset <= 56 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_16B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'hffff;
strb_before_offset <= `AXI4_STRB_WIDTH'hffff000000000000;
offset <= 48 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_32B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'hffffffff;
strb_before_offset <= `AXI4_STRB_WIDTH'hffffffff00000000;
offset <= 32 - {addr_n[5:3], {3'b0}} + addr_n[2:0];
end
`MSG_DATA_SIZE_64B: begin
strb_before_offset <= `AXI4_STRB_WIDTH'hffffffffffffffff;
offset <= 0;
end
default: begin
// should never end up here
strb_before_offset <= `AXI4_STRB_WIDTH'b0;
offset <= 0;
end
endcase
end
else begin
strb_before_offset <= `AXI4_STRB_WIDTH'hffffffffffffffff;
offset <= 0;
end

offset <= uncacheable ? virt_addr[5:0] : 6'b0;
addr <= uart_boot_en ? {phys_addr[`AXI4_ADDR_WIDTH-4:0], 3'b0} : virt_addr;
addr <= addr_n;
end
end

assign m_axi_awaddr = {addr[`AXI4_ADDR_WIDTH-1:6], 6'b0};
assign m_axi_wstrb = strb_before_offset << offset;
assign m_axi_wdata = req_data_f << (8*offset);
assign m_axi_wstrb = strb_before_offset >> offset;
assign m_axi_wdata = req_data_f >> (8*offset);

// inbound responses
wire m_axi_bgo = m_axi_bvalid & m_axi_bready;
Expand Down