miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: lib: modify ctrlport decoder to Verilog 2001 compatible syntax

Browse Source 
Original-commit: 4f2148e7cada5a66ce5eee92ca956cb22b31b98b
This commit is contained in:
Max Köhler
2020-07-10 15:12:55 -05:00
committed by Humberto Jimenez
parent 9ce170e4d5
commit c33435c1b9
1 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/rfnoc/utils/ctrlport_decoder.v
+39 -37
View File
@@ -12,24 +12,24 @@
// example, a NoC block where the registers are implemented in multiple // example, a NoC block where the registers are implemented in multiple
// submodules that must be read/written by a single NoC shell. // submodules that must be read/written by a single NoC shell.
// //
// This version also implements address decoding. The request is passed to a // This version also implements address decoding. The request is passed to a
// slave only if the address falls within that slave's address space. Each // slave only if the address falls within that slave's address space. Each
// slave is given an address space of 2**ADDR_W and the first slave starts at // slave is given an address space of 2**ADDR_W and the first slave starts at
// address BASE_ADDR. In other words, the request address is partitioned as // address BASE_ADDR. In other words, the request address is partitioned as
// shown below. // shown below.
// //
// |---------------- 32-bit -----------------| // |---------------- 32-bit -----------------|
// | Base | Port Num | Slave Addr | // | Base | Port Num | Slave Addr |
// |-----------------------------------------| // |-----------------------------------------|
// //
// When passed to the slave, the base address and port number bits are stripped // When passed to the slave, the base address and port number bits are stripped
// from the request address and only the SLAVE_ADDR_W-bit address is passed // from the request address and only the SLAVE_ADDR_W-bit address is passed
// through. // through.
// //
// Parameters: // Parameters:
// //
// NUM_SLAVES : Number of slave devices that you want to connect to master. // NUM_SLAVES : Number of slave devices that you want to connect to master.
// BASE_ADDR : Base address for slave 0. This should be a power-of-2 // BASE_ADDR : Base address for slave 0. This should be a power-of-2
// multiple of the combined slave address spaces. // multiple of the combined slave address spaces.
// SLAVE_ADDR_W : Number of address bits to allocate to each slave. // SLAVE_ADDR_W : Number of address bits to allocate to each slave.
// //
@@ -80,40 +80,42 @@ module ctrlport_decoder #(
wire [NUM_SLAVES-1:0] decoder; wire [NUM_SLAVES-1:0] decoder;
genvar i; generate
for (i = 0; i < NUM_SLAVES; i = i+1) begin : gen_split genvar i;
// Check if the upper bits of the request address match each slave. If the for (i = 0; i < NUM_SLAVES; i = i+1) begin : gen_split
// address matches, set the corresponding decoder[] bit. // Check if the upper bits of the request address match each slave. If the
if (PORT_NUM_W == 0) begin // address matches, set the corresponding decoder[] bit.
// Only one port in this case, so there are no port number bits to check if (PORT_NUM_W == 0) begin
assign decoder[i] = ((s_ctrlport_req_addr & BASE_ADDR_MASK) == BASE_ADDR); // Only one port in this case, so there are no port number bits to check
end else begin assign decoder[i] = ((s_ctrlport_req_addr & BASE_ADDR_MASK) == BASE_ADDR);
assign decoder[i] = ((s_ctrlport_req_addr & BASE_ADDR_MASK) == BASE_ADDR) &&
(s_ctrlport_req_addr[PORT_NUM_POS +: PORT_NUM_W] == i);
end
always @(posedge ctrlport_clk) begin
if (ctrlport_rst) begin
m_ctrlport_req_wr[i] <= 1'b0;
m_ctrlport_req_rd[i] <= 1'b0;
end else begin end else begin
// Mask WR and RD based on address decoding assign decoder[i] = ((s_ctrlport_req_addr & BASE_ADDR_MASK) == BASE_ADDR) &&
m_ctrlport_req_wr[i] <= s_ctrlport_req_wr & decoder[i]; (s_ctrlport_req_addr[PORT_NUM_POS +: PORT_NUM_W] == i);
m_ctrlport_req_rd[i] <= s_ctrlport_req_rd & decoder[i]; end
// Other values pass through to all slaves, but should be ignored always @(posedge ctrlport_clk) begin
// unless the corresponding WR or RD is not asserted. if (ctrlport_rst) begin
m_ctrlport_req_data [32*i +: 32] <= s_ctrlport_req_data; m_ctrlport_req_wr[i] <= 1'b0;
m_ctrlport_req_byte_en [4*i +: 4] <= s_ctrlport_req_byte_en; m_ctrlport_req_rd[i] <= 1'b0;
m_ctrlport_req_has_time[i] <= s_ctrlport_req_has_time; end else begin
m_ctrlport_req_time [64*i +: 64] <= s_ctrlport_req_time; // Mask WR and RD based on address decoding
m_ctrlport_req_wr[i] <= s_ctrlport_req_wr & decoder[i];
m_ctrlport_req_rd[i] <= s_ctrlport_req_rd & decoder[i];
// Pass through only the relevant slave bits // Other values pass through to all slaves, but should be ignored
m_ctrlport_req_addr[20*i+:20] <= 20'b0; // unless the corresponding WR or RD is not asserted.
m_ctrlport_req_addr[20*i+:SLAVE_ADDR_W] <= s_ctrlport_req_addr[SLAVE_ADDR_W-1:0]; m_ctrlport_req_data [32*i +: 32] <= s_ctrlport_req_data;
m_ctrlport_req_byte_en [4*i +: 4] <= s_ctrlport_req_byte_en;
m_ctrlport_req_has_time[i] <= s_ctrlport_req_has_time;
m_ctrlport_req_time [64*i +: 64] <= s_ctrlport_req_time;
// Pass through only the relevant slave bits
m_ctrlport_req_addr[20*i+:20] <= 20'b0;
m_ctrlport_req_addr[20*i+:SLAVE_ADDR_W] <= s_ctrlport_req_addr[SLAVE_ADDR_W-1:0];
end
end end
end end
end endgenerate
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------