Add new target NamcZynq board based on a SoC Zynq 7045

apps/NamcZynq-fmc_amc_eth.app.ini

@@ -0,0 +1,9 @@
+[.]
+description:
+    Standard set of NamcZynq blocks with:
+        - FMC to AMC Ethernet passthough module
+target: NamcZynq
+includes: common_soft_blocks.include.ini
+
+[FMC_AMC_ETH]
+module: fmc_amc_eth

apps/NamcZynq-fmc_lback.app.ini

@@ -0,0 +1,10 @@
+[.]
+description:
+    Standard set of NamcZynq blocks with:
+        - FMC HPC loopback module
+    Used for hardware testing only
+target: NamcZynq
+includes: common_soft_blocks.include.ini
+
+[FMC_LBACK]
+module: fmc_hpc_loopback

apps/NamcZynq-no-fmc.app.ini

@@ -0,0 +1,7 @@
+[.]
+description:
+    Standard set of NamcZynq blocks with:
+        - no FMC module
+        - no AMC modules
+target: NamcZynq
+includes: common_soft_blocks.include.ini

common/hdl/defines/top_defines.vhd

@@ -70,9 +70,9 @@ type FMC_input_interface is
     FMC_PRSNT       : std_logic;
     FMC_CLK1_M2C_P  : std_logic;
     FMC_CLK1_M2C_N  : std_logic;
-    GTREFCLK        : std_logic;
-    RXP_IN          : std_logic;
-    RXN_IN          : std_logic;
+    GTREFCLK        : std_logic_vector(1 downto 0);
+    RXP_IN          : std_logic_vector(3 downto 0);
+    RXN_IN          : std_logic_vector(3 downto 0);
     MAC_ADDR        : std_logic_vector(47 downto 0);
     MAC_ADDR_WS     : std_logic;
   end record FMC_input_interface;
@@ -81,23 +81,32 @@ type FMC_inout_interface is
   record
     FMC_LA_P        : std_logic_vector(33 downto 0);
     FMC_LA_N        : std_logic_vector(33 downto 0);
+    FMC_HA_P        : std_logic_vector(21 downto 0);
+    FMC_HA_N        : std_logic_vector(21 downto 0);
+    FMC_HB_P        : std_logic_vector(21 downto 0);
+    FMC_HB_N        : std_logic_vector(21 downto 0);
+
     FMC_CLK0_M2C_P  : std_logic;
     FMC_CLK0_M2C_N  : std_logic;
   end record FMC_inout_interface;
 
 constant FMC_io_init : FMC_inout_interface := (FMC_LA_P => (others => 'Z'),
                                                FMC_LA_N => (others => 'Z'),
+                                               FMC_HA_P => (others => 'Z'),
+                                               FMC_HA_N => (others => 'Z'),
+                                               FMC_HB_P => (others => 'Z'),
+                                               FMC_HB_N => (others => 'Z'),
                                                FMC_CLK0_M2C_P => 'Z',
                                                FMC_CLK0_M2C_N => 'Z');
 
 type FMC_output_interface is
   record
-    TXP_OUT         : std_logic;
-    TXN_OUT         : std_logic;
+    TXP_OUT         : std_logic_vector(3 downto 0);
+    TXN_OUT         : std_logic_vector(3 downto 0);
   end record FMC_output_interface;
 
-constant FMC_o_init : FMC_output_interface := (TXP_OUT => 'Z',
-                                               TXN_OUT => 'Z');
+constant FMC_o_init : FMC_output_interface := (TXP_OUT => (others => 'Z'),
+                                               TXN_OUT => (others => 'Z'));
 
 -- SFP Block Record declarations
 
@@ -125,6 +134,27 @@ constant SFP_o_init : SFP_output_interface := (TXN_OUT => 'Z',
                                                EVR_REC_CLK => '0',
                                                LINK_UP => '0');
 
+-- AMC Block Record declarations
+
+type AMC_input_interface is
+  record
+    -- 4 Fat Pipe GTREFCLKs
+    FP_GTREFCLK        : std_logic_vector(3 downto 0);
+    -- 8 Fat Pipe ports
+    FP_RXP_IN          : std_logic_vector(7 downto 0);
+    FP_RXN_IN          : std_logic_vector(7 downto 0);
+
+  end record AMC_input_interface;
+
+type AMC_output_interface is
+  record
+    -- 8 Fat Pipe ports
+    FP_TXP_OUT          : std_logic_vector(7 downto 0);
+    FP_TXN_OUT          : std_logic_vector(7 downto 0);
+  end record AMC_output_interface;
+
+constant AMC_o_init : AMC_output_interface := (FP_TXP_OUT => (others => 'Z'),
+                                               FP_TXN_OUT => (others => 'Z'));
 
 type seq_t is
 record

modules/fmc_amc_eth/const/fmc_amc_eth_impl.xdc

@@ -0,0 +1,54 @@
+# -------------------------------------------------------------------
+# Define asynchronous clocks
+# -------------------------------------------------------------------
+set_clock_groups -asynchronous -group [get_clocks \ 
+{softblocks_inst/{{ block.name }}_inst/eth_phy2phy*/eth_phy_i*/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i/TXOUTCLK}]
+#set_clock_groups -asynchronous -group [get_clocks \ 
+#{softblocks_inst/{{ block.name }}_inst/eth_phy2phy*/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i/TXOUTCLK}]
+
+# -------------------------------------------------------------------
+# FMC-SFP MGTs - Bank 109
+# -------------------------------------------------------------------
+set_property LOC $FMC_HPC_GTX0_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[0].eth_phy_to_phy_i/eth_phy_i/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+set_property LOC $FMC_HPC_GTX1_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[1].eth_phy_to_phy_i/eth_phy_i/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+set_property LOC $FMC_HPC_GTX2_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[2].eth_phy_to_phy_i/eth_phy_i/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+set_property LOC $FMC_HPC_GTX3_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[3].eth_phy_to_phy_i/eth_phy_i/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+
+# -------------------------------------------------------------------
+# AMC MGTs - Bank 112
+# -------------------------------------------------------------------
+#set_property LOC $AMC_P4_GTX_LOC \
+#[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[0].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+#set_property LOC $AMC_P5_GTX_LOC \
+#[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[1].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+#set_property LOC $AMC_P6_GTX_LOC \
+#[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[2].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+#set_property LOC $AMC_P7_GTX_LOC \
+#[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[3].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+
+# -------------------------------------------------------------------
+# AMC MGTs - Bank 111
+# -------------------------------------------------------------------
+set_property LOC $AMC_P8_GTX_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[0].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+set_property LOC $AMC_P9_GTX_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[1].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+set_property LOC $AMC_P10_GTX_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[2].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+set_property LOC $AMC_P11_GTX_LOC \
+[get_cells softblocks_inst/{{ block.name }}_inst/eth_phy2phy[3].eth_phy_to_phy_i/eth_phy_i2/core_support_i/pcs_pma_i/U0/transceiver_inst/gtwizard_inst/U0/gtwizard_i/gt0_GTWIZARD_i/gtxe2_i]
+
+# -------------------------------------------------------------------
+# FMC IO STANDARD
+# -------------------------------------------------------------------
+set_property IOSTANDARD LVCMOS18   [get_ports FMC_LA_N[*]   ];
+set_property IOSTANDARD LVCMOS18   [get_ports FMC_LA_P[*]   ];
+set_property IOSTANDARD LVCMOS18   [get_ports FMC_HA_N[*]   ];
+set_property IOSTANDARD LVCMOS18   [get_ports FMC_HA_P[*]   ];
+set_property IOSTANDARD LVCMOS18   [get_ports FMC_HB_N[*]   ];
+set_property IOSTANDARD LVCMOS18   [get_ports FMC_HB_P[*]   ];
+

modules/fmc_amc_eth/fmc_amc_eth.block.ini

@@ -0,0 +1,134 @@
+[.]
+description: Ethernet passthrough links between AMC P8-P11 and FMC-4SFP module transceivers
+entity: fmc_amc_eth
+type: io
+interfaces: fmc_i fmc_io fmc_o amc_i amc_o
+constraints: const/fmc_amc_eth_impl.xdc
+otherconst: mgt_pins
+ip: eth_phy
+
+[SOFT_RESET]
+type: write action
+description: GTX Soft Reset
+
+[DATA_F2A_CNT_1]
+type: read
+description: Number of frames transfered from FMC-SFP1 to AMC port 8
+
+[DATA_F2A_ERCNT_1]
+type: read
+description: Number of frame transfer errors from FMC-SFP1 to AMC port 8
+
+[DATA_A2F_CNT_1]
+type: read
+description: Number of frames transfered from AMC port 8 to FMC-SFP1
+
+[DATA_A2F_ERCNT_1]
+type: read
+description: Number of frame transfer errors from AMC port 8 to FMC-SFP1
+
+[DATA_F2A_CNT_2]
+type: read
+description: Number of frames transfered from FMC-SFP2 to AMC port 9
+
+[DATA_F2A_ERCNT_2]
+type: read
+description: Number of frame transfer errors from FMC-SFP2 to AMC port 9
+
+[DATA_A2F_CNT_2]
+type: read
+description: Number of frames transfered from AMC port 9 to FMC-SFP2
+
+[DATA_A2F_ERCNT_2]
+type: read
+description: Number of frame transfer errors from AMC port 9 to FMC-SFP2
+
+[DATA_F2A_CNT_3]
+type: read
+description: Number of frames transfered from FMC-SFP3 to AMC port 10
+
+[DATA_F2A_ERCNT_3]
+type: read
+description: Number of frame transfer errors from FMC-SFP3 to AMC port 10
+
+[DATA_A2F_CNT_3]
+type: read
+description: Number of frames transfered from AMC port 10 to FMC-SFP3
+
+[DATA_A2F_ERCNT_3]
+type: read
+description: Number of frame transfer errors from AMC port 10 to FMC-SFP3
+
+[AMC_PHY_RESETDONE]
+type: read
+description: AMC_PHY_RESETDONE[3:0] is high when the AMC port 8-11 transceiver reset is done
+
+[AMC_PHY_CPLLLOCK]
+type: read
+description: AMC_PHY_CPLLLOCK[3:0] is high when the AMC port 8-11 transceiver cpll is locked
+
+[AMC_PHY8_STATUS]
+type: read
+description: pcs_pma core status_vector of AMC-Port8
+[AMC_PHY9_STATUS]
+type: read
+description: pcs_pma core status_vector of AMC-Port9
+[AMC_PHY10_STATUS]
+type: read
+description: pcs_pma core status_vector of AMC-Port10
+[AMC_PHY11_STATUS]
+type: read
+description: pcs_pma core status_vector of AMC-Port11
+
+[FMC_PHY_TX_FAULT]
+type: read
+description: TX_FAULT[3:0] is high when the SFP module is unplugged
+
+[FMC_PHY_RX_LOS]
+type: read
+description: RX_LOS[3:0] is high when the SFP detect the input signal
+
+[FMC_PHY_RESETDONE]
+type: read
+description: FMC_PHY_RESETDONE[3:0] is high when the SFP transceiver reset is done
+
+[FMC_PHY_CPLLLOCK]
+type: read
+description: FMC_PHY_CPLLLOCK[3:0] is high when the SFP transceiver cpll is locked
+
+[FMC_PHY1_STATUS]
+type: read
+description: pcs_pma core status_vector of FMC-SFP1
+[FMC_PHY2_STATUS]
+type: read
+description: pcs_pma core status_vector of FMC-SFP2
+[FMC_PHY3_STATUS]
+type: read
+description: pcs_pma core status_vector of FMC-SFP3
+[FMC_PHY4_STATUS]
+type: read
+description: pcs_pma core status_vector of FMC-SFP4
+
+[FMC_TX_DISABLE_1]
+type: param bit
+description: high to disable the transmission sfp1
+
+[FMC_TX_DISABLE_2]
+type: param bit
+description: high to disable the transmission sfp2
+
+[FMC_TX_DISABLE_3]
+type: param bit
+description: high to disable the transmission sfp3
+
+[FMC_I2C_BUSY]
+type: read
+description: high when the controller is busy
+
+[FMC_I2C_STATUS]
+type: read enum
+description: Error code assigned during the END_TRANSFER
+0:no Error
+1:Access I2C error
+2:EEPROM integrity error
+3:FREQUENCY_VALUE is out of range

modules/fmc_amc_eth/fmc_amc_eth.rst

@@ -0,0 +1,6 @@
+FMC_AMC_ETH - Ethernet passthrough links between AMC P8-P11 and FMC-4SFP module transceivers
+======================================
+
+Fields
+------
+.. block_fields:: modules/fmc_amc_eth/fmc_amc_eth.block.ini