fpga: x4xx: replace ADC/DAC info by RFDC memory
Original-commit: 6c6d52fd655b144aa5ee581edae7911dc734854e
This commit is contained in:
Max Köhler
committed by
Jörg Hofrichter
Jörg Hofrichter
parent
37b8b0d017
commit
50f20ef4ab
@@ -0,0 +1,141 @@
|
||||
//
|
||||
// Copyright 2025 Ettus Research, a National Instruments Brand
|
||||
//
|
||||
// SPDX-License-Identifier: LGPL-3.0-or-later
|
||||
//
|
||||
// Module: axi_rfdc_info_memory
|
||||
//
|
||||
// Description:
|
||||
//
|
||||
// This module is a bridge between the RFDC info memory and the AXI4-Lite bus.
|
||||
// The RFDC info memory contains information about the ADC / DAC configuration
|
||||
// of the RFDC block and their respective logical RFNoC channels.
|
||||
//
|
||||
// Parameters:
|
||||
//
|
||||
// TIMEOUT Control port will timeout after 2^TIMEOUT AXI clock cycles
|
||||
// AXI_ADDR_WIDTH Width of the AXI bus. Aliasing occurs if AXI_ADDR_WIDTH > CTRLPORT_AWIDTH
|
||||
// CTRLPORT_AWIDTH Number of address LSBs forwarded to m_ctrlport_req_addr
|
||||
//
|
||||
|
||||
|
||||
module axi_rfdc_info_memory #(
|
||||
parameter TIMEOUT = 2,
|
||||
parameter AXI_ADDR_WIDTH = 6,
|
||||
parameter CTRLPORT_AWIDTH = 6
|
||||
)(
|
||||
//Clock and reset
|
||||
input wire s_axi_aclk,
|
||||
input wire s_axi_aresetn,
|
||||
// AXI4-Lite: Write address port (domain: s_axi_aclk)
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s AWADDR" *)
|
||||
input wire [AXI_ADDR_WIDTH-1:0] s_axi_awaddr,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s AWVALID" *)
|
||||
input wire s_axi_awvalid,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s AWREADY" *)
|
||||
output wire s_axi_awready,
|
||||
// AXI4-Lite: Write data port (domain: s_axi_aclk)
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s WDATA" *)
|
||||
input wire [31:0] s_axi_wdata,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s WSTRB" *)
|
||||
input wire [ 3:0] s_axi_wstrb,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s WVALID" *)
|
||||
input wire s_axi_wvalid,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s WREADY" *)
|
||||
output wire s_axi_wready,
|
||||
// AXI4-Lite: Write response port (domain: s_axi_aclk)
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s BRESP" *)
|
||||
output wire [ 1:0] s_axi_bresp,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s BVALID" *)
|
||||
output wire s_axi_bvalid,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s BREADY" *)
|
||||
input wire s_axi_bready,
|
||||
// AXI4-Lite: Read address port (domain: s_axi_aclk)
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s ARADDR" *)
|
||||
input wire [AXI_ADDR_WIDTH-1:0] s_axi_araddr,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s ARVALID" *)
|
||||
input wire s_axi_arvalid,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s ARREADY" *)
|
||||
output wire s_axi_arready,
|
||||
// AXI4-Lite: Read data port (domain: s_axi_aclk)
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s RDATA" *)
|
||||
output wire[31:0] s_axi_rdata,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s RRESP" *)
|
||||
output wire[ 1:0] s_axi_rresp,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s RVALID" *)
|
||||
output wire s_axi_rvalid,
|
||||
(* X_INTERFACE_INFO = "xilinx.com:interface:aximm:1.0 axi_s RREADY" *)
|
||||
input wire s_axi_rready
|
||||
);
|
||||
|
||||
// synchronize reset
|
||||
wire resetn;
|
||||
reset_sync reset_syncx (
|
||||
.clk (s_axi_aclk), //input wire
|
||||
.reset_in (s_axi_aresetn), //input wire
|
||||
.reset_out(resetn) //output reg
|
||||
);
|
||||
|
||||
//ctrlport signals between memory and axi ctrlport bridge
|
||||
wire [19:0] ctrlport_req_addr;
|
||||
wire [ 3:0] ctrlport_req_byte_en;
|
||||
wire [31:0] ctrlport_req_data;
|
||||
wire ctrlport_req_rd;
|
||||
wire ctrlport_req_wr;
|
||||
wire ctrlport_resp_ack;
|
||||
wire [31:0] ctrlport_resp_data;
|
||||
wire [ 1:0] ctrlport_resp_status;
|
||||
|
||||
axil_ctrlport_master #(
|
||||
.TIMEOUT (TIMEOUT), //integer:=10
|
||||
.AXI_AWIDTH (AXI_ADDR_WIDTH), //integer:=17
|
||||
.CTRLPORT_AWIDTH(CTRLPORT_AWIDTH) //integer:=17
|
||||
) axil_ctrlport_masterx (
|
||||
.s_axi_aclk (s_axi_aclk), //input wire
|
||||
.s_axi_aresetn (s_axi_aresetn), //input wire
|
||||
.s_axi_awaddr (s_axi_awaddr), //input wire[(AXI_ADDR_WIDTH-1):0]
|
||||
.s_axi_awvalid (s_axi_awvalid), //input wire
|
||||
.s_axi_awready (s_axi_awready), //output reg
|
||||
.s_axi_wdata (s_axi_wdata), //input wire[31:0]
|
||||
.s_axi_wstrb (s_axi_wstrb), //input wire[3:0]
|
||||
.s_axi_wvalid (s_axi_wvalid), //input wire
|
||||
.s_axi_wready (s_axi_wready), //output reg
|
||||
.s_axi_bresp (s_axi_bresp), //output reg[1:0]
|
||||
.s_axi_bvalid (s_axi_bvalid), //output reg
|
||||
.s_axi_bready (s_axi_bready), //input wire
|
||||
.s_axi_araddr (s_axi_araddr), //input wire[(AXI_ADDR_WIDTH-1):0]
|
||||
.s_axi_arvalid (s_axi_arvalid), //input wire
|
||||
.s_axi_arready (s_axi_arready), //output reg
|
||||
.s_axi_rdata (s_axi_rdata), //output reg[31:0]
|
||||
.s_axi_rresp (s_axi_rresp), //output reg[1:0]
|
||||
.s_axi_rvalid (s_axi_rvalid), //output reg
|
||||
.s_axi_rready (s_axi_rready), //input wire
|
||||
.m_ctrlport_req_wr (ctrlport_req_wr), //output reg
|
||||
.m_ctrlport_req_rd (ctrlport_req_rd), //output reg
|
||||
.m_ctrlport_req_addr (ctrlport_req_addr), //output reg[19:0]
|
||||
.m_ctrlport_req_portid (), //output wire[9:0]
|
||||
.m_ctrlport_req_rem_epid (), //output wire[15:0]
|
||||
.m_ctrlport_req_rem_portid(), //output wire[9:0]
|
||||
.m_ctrlport_req_data (ctrlport_req_data), //output reg[31:0]
|
||||
.m_ctrlport_req_byte_en (ctrlport_req_byte_en), //output reg[3:0]
|
||||
.m_ctrlport_req_has_time (), //output wire
|
||||
.m_ctrlport_req_time (), //output wire[63:0]
|
||||
.m_ctrlport_resp_ack (ctrlport_resp_ack), //input wire
|
||||
.m_ctrlport_resp_status (ctrlport_resp_status), //input wire[1:0]
|
||||
.m_ctrlport_resp_data (ctrlport_resp_data) //input wire[31:0]
|
||||
);
|
||||
|
||||
rfdc_info_memory rfdc_info_memoryx (
|
||||
.clk (s_axi_aclk), //input logic
|
||||
.rst (~resetn), //input logic
|
||||
.s_ctrlport_req_addr (ctrlport_req_addr), //input logic[19:0]
|
||||
.s_ctrlport_req_byte_en(ctrlport_req_byte_en), //input logic[3:0]
|
||||
.s_ctrlport_req_data (ctrlport_req_data), //input logic[31:0]
|
||||
.s_ctrlport_req_rd (ctrlport_req_rd), //input logic
|
||||
.s_ctrlport_req_wr (ctrlport_req_wr), //input logic
|
||||
.s_ctrlport_resp_ack (ctrlport_resp_ack), //output logic
|
||||
.s_ctrlport_resp_data (ctrlport_resp_data), //output logic[31:0]
|
||||
.s_ctrlport_resp_status(ctrlport_resp_status) //output logic[1:0]
|
||||
);
|
||||
|
||||
endmodule
|
||||
@@ -0,0 +1,89 @@
|
||||
//
|
||||
// Copyright 2025 Ettus Research, a National Instruments Brand
|
||||
//
|
||||
// SPDX-License-Identifier: LGPL-3.0-or-later
|
||||
//
|
||||
// Module: rfdc_info_memory
|
||||
//
|
||||
// Description:
|
||||
//
|
||||
// This module implements a memory that stores the RFDC information for the
|
||||
// RFDCs in the RFSoC. The memory is accessed via a controlport interface.
|
||||
// The memory is initialized by a device specfic pkg_rfdc_memory_content.
|
||||
// The memory is read only.
|
||||
//
|
||||
|
||||
module rfdc_info_memory
|
||||
(
|
||||
// Clocks and Resets
|
||||
input logic clk,
|
||||
input logic rst,
|
||||
|
||||
// request
|
||||
input logic [19:0] s_ctrlport_req_addr,
|
||||
input logic [ 3:0] s_ctrlport_req_byte_en,
|
||||
input logic [31:0] s_ctrlport_req_data,
|
||||
input logic s_ctrlport_req_rd,
|
||||
input logic s_ctrlport_req_wr,
|
||||
|
||||
// response
|
||||
output logic s_ctrlport_resp_ack,
|
||||
output logic [31:0] s_ctrlport_resp_data,
|
||||
output logic [ 1:0] s_ctrlport_resp_status
|
||||
);
|
||||
|
||||
`include "../../../../lib/rfnoc/core/ctrlport.vh"
|
||||
import rfdc_info_pkg::*;
|
||||
`ifdef X410
|
||||
import x410_rfdc_memory_content_pkg::*;
|
||||
`else
|
||||
import x440_rfdc_memory_content_pkg::*;
|
||||
`endif
|
||||
|
||||
localparam int MEMORY_ADDR_SIZE = $clog2(NUM_ENTRIES);
|
||||
localparam int MEM_ADDR_INCR = 4;
|
||||
localparam int MEMORY_ADDR_LSB = $clog2(MEM_ADDR_INCR);
|
||||
|
||||
// create memory with the RFDC information
|
||||
rfdc_memory_entry_t rfdc_memory [0:NUM_ENTRIES-1];
|
||||
|
||||
initial begin
|
||||
// initialize memory
|
||||
for (int i = 0; i < NUM_ENTRIES; i++) begin
|
||||
rfdc_memory[i] = get_memory_entry(i);
|
||||
$info("Memory entry %d: %p", i, rfdc_memory[i]);
|
||||
end
|
||||
end
|
||||
|
||||
// connect memory to the controlport interface
|
||||
always_ff @(posedge clk) begin
|
||||
if (rst) begin
|
||||
s_ctrlport_resp_ack <= 1'b0;
|
||||
s_ctrlport_resp_data <= 32'b0;
|
||||
s_ctrlport_resp_status <= 2'b00;
|
||||
|
||||
// handle reads
|
||||
end else if (s_ctrlport_req_rd) begin
|
||||
s_ctrlport_resp_ack <= 1'b1;
|
||||
|
||||
// check overrange
|
||||
if (s_ctrlport_req_addr >= NUM_ENTRIES*MEM_ADDR_INCR) begin
|
||||
s_ctrlport_resp_data <= 32'b0;
|
||||
s_ctrlport_resp_status <= CTRL_STS_CMDERR;
|
||||
end else begin
|
||||
s_ctrlport_resp_data <= rfdc_memory[s_ctrlport_req_addr[MEMORY_ADDR_LSB +: MEMORY_ADDR_SIZE]];
|
||||
s_ctrlport_resp_status <= CTRL_STS_OKAY;
|
||||
end
|
||||
|
||||
// handle writes
|
||||
end else if (s_ctrlport_req_wr) begin
|
||||
s_ctrlport_resp_ack <= 1'b1;
|
||||
s_ctrlport_resp_status <= CTRL_STS_CMDERR;
|
||||
|
||||
// any other case
|
||||
end else begin
|
||||
s_ctrlport_resp_ack <= 1'b0;
|
||||
end
|
||||
end
|
||||
|
||||
endmodule
|
||||
@@ -0,0 +1,91 @@
|
||||
//
|
||||
// Copyright 2025 Ettus Research, A National Instruments Brand
|
||||
//
|
||||
// SPDX-License-Identifier: LGPL-3.0-or-later
|
||||
//
|
||||
// Module: rfdc_info_pkg
|
||||
//
|
||||
// Description:
|
||||
//
|
||||
// Typedefs for RFDC information memory which are used by the device specific
|
||||
// RFDC memory content packages.
|
||||
//
|
||||
|
||||
package rfdc_info_pkg;
|
||||
|
||||
typedef enum logic [1:0] {
|
||||
ENABLED = 2'b00,
|
||||
DISABLED = 2'b11
|
||||
} block_mode_t;
|
||||
|
||||
typedef struct packed {
|
||||
logic is_adc;
|
||||
logic db;
|
||||
logic [1:0] channel;
|
||||
logic [1:0] reserved2;
|
||||
logic [1:0] tile;
|
||||
logic [1:0] block;
|
||||
block_mode_t block_mode;
|
||||
} rfdc_memory_entry_t;
|
||||
|
||||
// Empty entry constant
|
||||
localparam rfdc_memory_entry_t EMPTY_ENTRY = '{
|
||||
is_adc: 0,
|
||||
db: 0,
|
||||
channel: 0,
|
||||
reserved2: 0,
|
||||
tile: 0,
|
||||
block: 0,
|
||||
block_mode: DISABLED
|
||||
};
|
||||
|
||||
// current RFSoC has 8 DACs and 8 ADCs
|
||||
localparam int NUM_ENTRIES = 16;
|
||||
|
||||
endpackage
|
||||
|
||||
//XmlParse xml_on
|
||||
//<regmap name="RFDC_REGS_REGMAP">
|
||||
// <group name="RFDC_REGS">
|
||||
// <enumeratedtype name="RFDC_BLOCK_INFO_ENUM" showhex="true">
|
||||
// <value name="ENABLED" integer="0"/>
|
||||
// <value name="DISABLED" integer="3"/>
|
||||
// </enumeratedtype>
|
||||
// <regtype name="RFDC_INFO_MEMTYPE" size="32" writable="false">
|
||||
// <info>
|
||||
// This register provides information for one ADC/DAC within the RFSoC and its RFDC
|
||||
// configuration. There is further information on the RFNoC index of this channel.
|
||||
// The register is defined as a SystemVerilog typedef and consumed by MPM using the RFDC
|
||||
// Python register interface.
|
||||
// </info>
|
||||
// <bitfield name="BLOCK_MODE" range="1..0" type="RFDC_BLOCK_INFO_ENUM">
|
||||
// <info>The state of this ADC/DAC.</info>
|
||||
// </bitfield>
|
||||
// <bitfield name="BLOCK" range="3..2">
|
||||
// <info>Index of the ADC/DAC within the FPGA tile.</info>
|
||||
// </bitfield>
|
||||
// <bitfield name="TILE" range="5..4">
|
||||
// <info>
|
||||
// Zero based tile offset of the FPGA.
|
||||
// For DAC index i equals to FPGA tile 228+i.
|
||||
// For ADC index i equals to FPGA tile 224+i.
|
||||
// </info>
|
||||
// </bitfield>
|
||||
// <bitfield name="RESERVED2" range="7..6">
|
||||
// <info>
|
||||
// Reserved for later use.
|
||||
// </info>
|
||||
// </bitfield>
|
||||
// <bitfield name="CHANNEL" range="9..8">
|
||||
// <info>Index of the RFNoC channel per DB.</info>
|
||||
// </bitfield>
|
||||
// <bitfield name="DB" range="10">
|
||||
// <info>DB index.</info>
|
||||
// </bitfield>
|
||||
// <bitfield name="IS_ADC" range="11">
|
||||
// <info>If the converter is an ADC this bit is set. Otherwise it is an DAC.</info>
|
||||
// </bitfield>
|
||||
// </regtype>
|
||||
// </group>
|
||||
//</regmap>
|
||||
//XmlParse xml_off
|
||||
Reference in New Issue
Block a user