]> jspc29.x-matter.uni-frankfurt.de Git - trb3sc.git/commitdiff
jspc29 / trb3sc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f7177f)
mdeia interface rework
authorMichael Boehmer <mboehmer@ph.tum.de>
Thu, 18 Aug 2022 11:56:43 +0000 (13:56 +0200)
committerMichael Boehmer <mboehmer@ph.tum.de>
Thu, 18 Aug 2022 11:56:43 +0000 (13:56 +0200)
gbe_hub/trb3sc_gbe_hub.vhd patch | blob | history
pinout/trb3sc_gbe_hub.lpf patch | blob | history

diff --git a/gbe_hub/trb3sc_gbe_hub.vhd b/gbe_hub/trb3sc_gbe_hub.vhd
index 1ce440265f5f1787ce9b61babce5ce0d48f87292..dcaa3b2710e12a12ae98828334afebb2bd73e66c 100644 (file)
--- a/gbe_hub/trb3sc_gbe_hub.vhd
+++ b/gbe_hub/trb3sc_gbe_hub.vhd
@@ -8,11 +8,12 @@ use work.config.all;
 use work.trb_net_std.all;
 use work.trb_net_components.all;
 use work.trb3_components.all;
---use work.trb_net16_hub_func.all;
 use work.version.all;
 use work.trb_net_gbe_components.all;
 use work.med_sync_define_RS.all;
 
+-- BUG: backplane handling!!!
+
 entity trb3sc_gbe_hub is
   port(
     CLK_SUPPL_PCLK       : in    std_logic; --125 MHz for GbE
@@ -20,24 +21,22 @@ entity trb3sc_gbe_hub is
     CLK_EXT_PLL_LEFT     : in    std_logic; --External Clock
     --Additional IO
     HDR_IO               : inout std_logic_vector(10 downto 1);
-    BACK_LVDS            : inout std_logic_vector( 1 downto 0);
-    BACK_GPIO            : inout std_logic_vector( 3 downto 0);
     --LED
     LED_GREEN            : out   std_logic;
     LED_YELLOW           : out   std_logic;
     LED_ORANGE           : out   std_logic;
     LED_RED              : out   std_logic;
-    LED_RJ_GREEN         : out   std_logic_vector( 1 downto 0);
-    LED_RJ_RED           : out   std_logic_vector( 1 downto 0);
-    LED_WHITE            : out   std_logic_vector( 1 downto 0);
-    LED_SFP_GREEN        : out   std_logic_vector( 1 downto 0);
-    LED_SFP_RED          : out   std_logic_vector( 1 downto 0);
+    LED_RJ_GREEN         : out   std_logic_vector(1 downto 0);
+    LED_RJ_RED           : out   std_logic_vector(1 downto 0);
+    LED_WHITE            : out   std_logic_vector(1 downto 0);
+    LED_SFP_GREEN        : out   std_logic_vector(1 downto 0);
+    LED_SFP_RED          : out   std_logic_vector(1 downto 0);
     --SFP
-    SFP_LOS              : in    std_logic_vector( 1 downto 0);
-    SFP_MOD0             : in    std_logic_vector( 1 downto 0);  
-    SFP_MOD1             : inout std_logic_vector( 1 downto 0) := (others => 'Z');
-    SFP_MOD2             : inout std_logic_vector( 1 downto 0) := (others => 'Z');
-    SFP_TX_DIS           : out   std_logic_vector( 1 downto 0) := (others => '0');  
+    SFP_LOS              : in    std_logic_vector(1 downto 0);
+    SFP_MOD0             : in    std_logic_vector(1 downto 0);  
+    SFP_MOD1             : inout std_logic_vector(1 downto 0) := (others => 'Z');
+    SFP_MOD2             : inout std_logic_vector(1 downto 0) := (others => 'Z');
+    SFP_TX_DIS           : out   std_logic_vector(1 downto 0) := (others => '0');  
     LED_HUB_LINKOK       : out   std_logic_vector(8 downto 1);
     LED_HUB_RX           : out   std_logic_vector(8 downto 1);
     LED_HUB_TX           : out   std_logic_vector(8 downto 1);
@@ -46,6 +45,8 @@ entity trb3sc_gbe_hub is
     HUB_MOD2             : inout std_logic_vector(8 downto 1);
     HUB_TXDIS            : out   std_logic_vector(8 downto 1);
     HUB_LOS              : in    std_logic_vector(8 downto 1);
+    BACK_SLAVE_READY     : inout std_logic_vector(3 downto 0);
+    BACK_MASTER_READY    : inout std_logic_vector(3 downto 0);
     --Serdes switch
     PCSSW_ENSMB          : out   std_logic;
     PCSSW_EQ             : out   std_logic_vector( 3 downto 0);
@@ -570,7 +571,7 @@ begin
 ---------------------------------------------------------------------------
   THE_GBE_MED_PCSA: entity gbe_med_fifo
   generic map(
-    LINKS_ACTIVE                => "0001",
+    LINK_MODE                   => (c_IS_UNUSED, c_IS_UNUSED, c_IS_UNUSED, c_IS_MASTER),
     INCLUDE_DLM                 => (0,0,0,1)
   )
   port map(
@@ -597,15 +598,15 @@ begin
     -- SerDes 2 -- UNUSED
     -- SerDes 3 -- UNUSED
     -- SFP Connection
-    SD_PRSNT_N_IN(0)            => HUB_MOD0(5),
+    SD_PRSNT_N_IN(0)            => BACK_SLAVE_READY(0),
     SD_PRSNT_N_IN(1)            => '1',
     SD_PRSNT_N_IN(2)            => '1',
     SD_PRSNT_N_IN(3)            => '1',
-    SD_LOS_IN(0)                => HUB_LOS(5),
+    SD_LOS_IN(0)                => BACK_SLAVE_READY(0),
     SD_LOS_IN(1)                => '1',
     SD_LOS_IN(2)                => '1',
     SD_LOS_IN(3)                => '1',
-    SD_TXDIS_OUT(0)             => HUB_TXDIS(5),
+    SD_TXDIS_OUT(0)             => BACK_MASTER_READY(0),
     SD_TXDIS_OUT(1)             => open,
     SD_TXDIS_OUT(2)             => open,
     SD_TXDIS_OUT(3)             => open,
@@ -633,7 +634,7 @@ begin
 ---------------------------------------------------------------------------
   THE_GBE_MED_PCSB: entity gbe_med_fifo
   generic map(
-    LINKS_ACTIVE                => "1111",
+    LINK_MODE                   => (c_IS_MASTER, c_IS_MASTER, c_IS_MASTER, c_IS_MASTER),
     INCLUDE_DLM                 => (1,1,1,1)
   )
   port map(
@@ -739,7 +740,7 @@ begin
 ---------------------------------------------------------------------------
   THE_GBE_MED_PCSC: entity gbe_med_fifo
   generic map(
-    LINKS_ACTIVE                => "1111",
+    LINK_MODE                   => (c_IS_MASTER, c_IS_MASTER, c_IS_MASTER, c_IS_MASTER),
     INCLUDE_DLM                 => (1,1,1,1)
   )
   port map(
@@ -845,9 +846,8 @@ begin
 ---------------------------------------------------------------------------
   THE_GBE_MED_PCSD: entity gbe_med_fifo
   generic map(
-    LINKS_ACTIVE                => "0011",
-    INCLUDE_DLM                 => (0,0,1,1),
-    SNIFFER_PORT                => 0
+    LINK_MODE                   => (c_IS_UNUSED, c_IS_UNUSED, c_IS_MASTER, c_IS_SLAVE),
+    INCLUDE_DLM                 => (0,0,1,1)
   )
   port map(
     RESET                       => reset_i,
diff --git a/pinout/trb3sc_gbe_hub.lpf b/pinout/trb3sc_gbe_hub.lpf
index e17e2684dbdd24d8126b88b9f6a131aa08babd11..f1af629af9e5461b3cb7fda5e7fc522f38cbf891 100644 (file)
--- a/pinout/trb3sc_gbe_hub.lpf
+++ b/pinout/trb3sc_gbe_hub.lpf
@@ -160,48 +160,48 @@ IOBUF GROUP "LED_HUB_group" IO_TYPE=LVCMOS25 PULLMODE=UP;
 # LOCATE COMP  "DAC_OUT_CS_6"    SITE "L28";\r
 # DEFINE PORT GROUP "OUT_group" "DAC_OUT*" ;\r
 # IOBUF GROUP "OUT_group" IO_TYPE=LVDS25 DIFFRESISTOR=OFF;\r
-LOCATE COMP "KEL_1"                         SITE "AP5";\r
-LOCATE COMP "KEL_2"                         SITE "AP2";\r
-LOCATE COMP "KEL_3"                         SITE "AN1";\r
-LOCATE COMP "KEL_4"                         SITE "AN3";\r
-LOCATE COMP "KEL_5"                         SITE "AL5";\r
-LOCATE COMP "KEL_6"                         SITE "AM6";\r
-LOCATE COMP "KEL_7"                         SITE "AL4";\r
-LOCATE COMP "KEL_8"                         SITE "AJ5";\r
-LOCATE COMP "KEL_9"                         SITE "AJ2";\r
-LOCATE COMP "KEL_10"                        SITE "AL3";\r
-LOCATE COMP "KEL_11"                        SITE "AD9";\r
-LOCATE COMP "KEL_12"                        SITE "AJ4";\r
-LOCATE COMP "KEL_13"                        SITE "V4";\r
-LOCATE COMP "KEL_14"                        SITE "V5";\r
-LOCATE COMP "KEL_15"                        SITE "T9";\r
-LOCATE COMP "KEL_16"                        SITE "T2";\r
-LOCATE COMP "KEL_17"                        SITE "P7";\r
-LOCATE COMP "KEL_18"                        SITE "R8";\r
-LOCATE COMP "KEL_19"                        SITE "R2";\r
-LOCATE COMP "KEL_20"                        SITE "P9";\r
-LOCATE COMP "KEL_21"                        SITE "AP29";\r
-LOCATE COMP "KEL_22"                        SITE "AP33";\r
-LOCATE COMP "KEL_23"                        SITE "AN34";\r
-LOCATE COMP "KEL_24"                        SITE "AP31";\r
-LOCATE COMP "KEL_25"                        SITE "AN32";\r
-LOCATE COMP "KEL_26"                        SITE "AM29";\r
-LOCATE COMP "KEL_27"                        SITE "AL31";\r
-LOCATE COMP "KEL_28"                        SITE "AL30";\r
-LOCATE COMP "KEL_29"                        SITE "AL34";\r
-LOCATE COMP "KEL_30"                        SITE "AJ31";\r
-LOCATE COMP "KEL_31"                        SITE "AH33";\r
-LOCATE COMP "KEL_32"                        SITE "AL32";\r
-LOCATE COMP "KEL_33"                        SITE "AF32";\r
-LOCATE COMP "KEL_34"                        SITE "AE32";\r
-LOCATE COMP "KEL_35"                        SITE "AE30";\r
-LOCATE COMP "KEL_36"                        SITE "AD26";\r
-LOCATE COMP "KEL_37"                        SITE "M29";\r
-LOCATE COMP "KEL_38"                        SITE "AC28";\r
-LOCATE COMP "KEL_39"                        SITE "M34";\r
-LOCATE COMP "KEL_40"                        SITE "L28";\r
-DEFINE PORT GROUP "KEL_group" "KEL*" ;\r
-IOBUF GROUP  "KEL_group" IO_TYPE=LVDS25  DIFFRESISTOR=100;\r
+#LOCATE COMP "KEL_1"                         SITE "AP5";\r
+#LOCATE COMP "KEL_2"                         SITE "AP2";\r
+#LOCATE COMP "KEL_3"                         SITE "AN1";\r
+#LOCATE COMP "KEL_4"                         SITE "AN3";\r
+#LOCATE COMP "KEL_5"                         SITE "AL5";\r
+#LOCATE COMP "KEL_6"                         SITE "AM6";\r
+#LOCATE COMP "KEL_7"                         SITE "AL4";\r
+#LOCATE COMP "KEL_8"                         SITE "AJ5";\r
+#LOCATE COMP "KEL_9"                         SITE "AJ2";\r
+#LOCATE COMP "KEL_10"                        SITE "AL3";\r
+#LOCATE COMP "KEL_11"                        SITE "AD9";\r
+#LOCATE COMP "KEL_12"                        SITE "AJ4";\r
+#LOCATE COMP "KEL_13"                        SITE "V4";\r
+#LOCATE COMP "KEL_14"                        SITE "V5";\r
+#LOCATE COMP "KEL_15"                        SITE "T9";\r
+#LOCATE COMP "KEL_16"                        SITE "T2";\r
+#LOCATE COMP "KEL_17"                        SITE "P7";\r
+#LOCATE COMP "KEL_18"                        SITE "R8";\r
+#LOCATE COMP "KEL_19"                        SITE "R2";\r
+#LOCATE COMP "KEL_20"                        SITE "P9";\r
+#LOCATE COMP "KEL_21"                        SITE "AP29";\r
+#LOCATE COMP "KEL_22"                        SITE "AP33";\r
+#LOCATE COMP "KEL_23"                        SITE "AN34";\r
+#LOCATE COMP "KEL_24"                        SITE "AP31";\r
+#LOCATE COMP "KEL_25"                        SITE "AN32";\r
+#LOCATE COMP "KEL_26"                        SITE "AM29";\r
+#LOCATE COMP "KEL_27"                        SITE "AL31";\r
+#LOCATE COMP "KEL_28"                        SITE "AL30";\r
+#LOCATE COMP "KEL_29"                        SITE "AL34";\r
+#LOCATE COMP "KEL_30"                        SITE "AJ31";\r
+#LOCATE COMP "KEL_31"                        SITE "AH33";\r
+#LOCATE COMP "KEL_32"                        SITE "AL32";\r
+#LOCATE COMP "KEL_33"                        SITE "AF32";\r
+#LOCATE COMP "KEL_34"                        SITE "AE32";\r
+#LOCATE COMP "KEL_35"                        SITE "AE30";\r
+#LOCATE COMP "KEL_36"                        SITE "AD26";\r
+#LOCATE COMP "KEL_37"                        SITE "M29";\r
+#LOCATE COMP "KEL_38"                        SITE "AC28";\r
+#LOCATE COMP "KEL_39"                        SITE "M34";\r
+#LOCATE COMP "KEL_40"                        SITE "L28";\r
+#DEFINE PORT GROUP "KEL_group" "KEL*" ;\r
+#IOBUF GROUP  "KEL_group" IO_TYPE=LVDS25  DIFFRESISTOR=100;\r
 \r
 \r
 #################################################################\r
@@ -270,8 +270,6 @@ LOCATE COMP "SFP_TX_DIS_1"                   SITE "A9";
 DEFINE PORT GROUP "SFP_group" "SFP*" ;\r
 IOBUF GROUP  "SFP_group" IO_TYPE=LVTTL33 ;\r
 \r
-\r
-\r
 #################################################################\r
 # Serdes Output Switch\r
 #################################################################\r
@@ -324,7 +322,6 @@ IOBUF  PORT "RJ_IO_1" IO_TYPE=LVDS25 ;
 IOBUF  PORT "RJ_IO_2" IO_TYPE=LVDS25E ;\r
 IOBUF  PORT "RJ_IO_3" IO_TYPE=LVDS25E ;\r
 \r
-\r
 LOCATE COMP "SPARE_IN_0"                    SITE "K31";\r
 LOCATE COMP "SPARE_IN_1"                    SITE "R4";\r
 #LOCATE COMP "SPARE_IN0_N"                    SITE "K32";\r
@@ -333,34 +330,23 @@ IOBUF  PORT "SPARE_IN_0" IO_TYPE=LVDS25 DIFFRESISTOR=100 ;
 IOBUF  PORT "SPARE_IN_1" IO_TYPE=LVDS25 DIFFRESISTOR=100 ;\r
 \r
 #################################################################\r
-# Backplane I/O\r
+# "SFP" status signals on backplane\r
 #################################################################\r
-LOCATE COMP "BACK_GPIO_0"                    SITE "C26";\r
-LOCATE COMP "BACK_GPIO_1"                    SITE "D26";\r
-LOCATE COMP "BACK_GPIO_2"                    SITE "B27";\r
-LOCATE COMP "BACK_GPIO_3"                    SITE "C27";\r
-LOCATE COMP "BACK_GPIO_4"                    SITE "D27";\r
-LOCATE COMP "BACK_GPIO_5"                    SITE "E27";\r
-LOCATE COMP "BACK_GPIO_6"                    SITE "B28";\r
-LOCATE COMP "BACK_GPIO_7"                    SITE "A28";\r
-LOCATE COMP "BACK_GPIO_8"                    SITE "A26";\r
-LOCATE COMP "BACK_GPIO_9"                    SITE "A27";\r
-LOCATE COMP "BACK_GPIO_10"                   SITE "A29";\r
-LOCATE COMP "BACK_GPIO_11"                   SITE "A30";\r
-LOCATE COMP "BACK_GPIO_12"                   SITE "H26";\r
-LOCATE COMP "BACK_GPIO_13"                   SITE "H25";\r
-LOCATE COMP "BACK_GPIO_14"                   SITE "A31";\r
-LOCATE COMP "BACK_GPIO_15"                   SITE "B31";\r
-DEFINE PORT GROUP "BACK_GPIO_group" "BACK_GPIO*" ;\r
-IOBUF GROUP  "BACK_GPIO_group" IO_TYPE=LVCMOS25 PULLMODE=UP;\r
-\r
-LOCATE COMP "BACK_LVDS_0"                   SITE "V2";\r
-LOCATE COMP "BACK_LVDS_1"                   SITE "T4";\r
-# LOCATE COMP "BACK_LVDS_0_N"                   SITE "V1";\r
-# LOCATE COMP "BACK_LVDS_1_N"                   SITE "T3";\r
-DEFINE PORT GROUP "BACK_LVDS_group" "BACK_LVDS*" ;\r
-IOBUF GROUP  "BACK_LVDS_group" IO_TYPE=LVDS25;\r
+LOCATE COMP "BACK_SLAVE_READY_0"       SITE "C26";\r
+LOCATE COMP "BACK_SLAVE_READY_1"       SITE "D27";\r
+LOCATE COMP "BACK_SLAVE_READY_2"       SITE "A26";\r
+LOCATE COMP "BACK_SLAVE_READY_3"       SITE "H26";\r
+\r
+LOCATE COMP "BACK_MASTER_READY_0"      SITE "D26";\r
+LOCATE COMP "BACK_MASTER_READY_1"      SITE "E27";\r
+LOCATE COMP "BACK_MASTER_READY_2"      SITE "A27";\r
+LOCATE COMP "BACK_MASTER_READY_3"      SITE "H25";\r
+\r
+DEFINE PORT GROUP "BACK_SLAVE_group" "BACK_SLAVE*" ;\r
+DEFINE PORT GROUP "BACK_MASTER_group" "BACK_MASTER*" ;\r
 \r
+IOBUF GROUP  "BACK_SLAVE_group" IO_TYPE=LVCMOS25 PULLMODE=UP;\r
+IOBUF GROUP  "BACK_MASTER_group" IO_TYPE=LVCMOS25 DRIVE=4;\r
 \r
 #################################################################\r
 # Flash ROM and Reboot\r
TRB3sc code