update backplane master design

diff --git a/backplanemaster/config.vhd b/backplanemaster/config.vhd
index 9c1ca7e97df6f51b148b19b17e9a28dcd98e2f33..e47911b9b843320a9275ed9ed7ecf36f9714b7f8 100644 (file)
--- a/backplanemaster/config.vhd
+++ b/backplanemaster/config.vhd
@@ -37,7 +37,7 @@ package config is
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
     constant MONITOR_INPUT_NUM      : integer  := 22;
 
-    constant INCLUDE_GBE            : integer  := c_NO;
+    constant INCLUDE_GBE            : integer  := c_YES;
 
     
 ------------------------------------------------------------------------------

diff --git a/backplanemaster/config_compile_frankfurt.pl b/backplanemaster/config_compile_frankfurt.pl
index 410d0c33d491bc6439c70d454b7d6653b8aac4ee..1cc123143d66a7295dea00d5b8342776566256a4 100644 (file)
--- a/backplanemaster/config_compile_frankfurt.pl
+++ b/backplanemaster/config_compile_frankfurt.pl
@@ -3,6 +3,8 @@ lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
 lattice_path                 => '/d/jspc29/lattice/diamond/3.9_x64/',
 synplify_path                => '/d/jspc29/lattice/synplify/L-2016.09-1/',
+#lattice_path                 => '/d/jspc29/lattice/diamond/3.10_x64/',
+#synplify_path                => '/d/jspc29/lattice/synplify/N-2017.09-1/',
 # synplify_command             => "/d/jspc29/lattice/diamond/3.6_x64/bin/lin64/synpwrap -fg -options",
 #synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",
 

diff --git a/backplanemaster/par.p2t b/backplanemaster/par.p2t
index 7610522d26c6e8dfe7f11aa2011d23d462514b15..b1ea2939df0ab52b603731459ae9ffab72a6aabc 100644 (file)
--- a/backplanemaster/par.p2t
+++ b/backplanemaster/par.p2t
@@ -3,7 +3,7 @@
 -l 5
 -y
 -s 12
--t 16
+-t 32
 -c 1
 -e 2
 #-g guidefile.ncd

diff --git a/backplanemaster/trb3sc_master.lpf b/backplanemaster/trb3sc_master.lpf
index 65605d274de4e16deed5891cbac78a5423bd7201..bc891a128cb95a0582e0535c5cd281fc4acd80e6 100644 (file)
--- a/backplanemaster/trb3sc_master.lpf
+++ b/backplanemaster/trb3sc_master.lpf
@@ -10,7 +10,7 @@ LOCATE COMP          "gen_PCSD.THE_MEDIA_PCSD/gen_pcs0.THE_SERDES/PCSD_INST" SIT
 LOCATE COMP "gen_GBE.GBE/physical_impl_gen.physical/impl_gen.gbe_serdes/PCSD_INST" SITE "PCSD";
 
 REGION               "MEDIA_A" "R75C100D"  45 46;
-REGION               "MEDIA_B" "R75C50D"  45 46;
+REGION               "MEDIA_B" "R85C45D"  35 56;
 REGION               "MEDIA_C" "R75C135D" 45 46;
 REGION               "MEDIA_D" "R75C19D"  40 36;
 
@@ -21,9 +21,9 @@ LOCATE UGROUP        "gen_PCSD.THE_MEDIA_PCSD/media_interface_group" REGION "MED
 
 
 
-MULTICYCLE TO CELL   "THE_MEDIA_4_DOW*/sci*" 20 ns;
-MULTICYCLE FROM CELL "THE_MEDIA_4_DOW*/sci*" 20 ns;
-MULTICYCLE TO CELL   "THE_MEDIA_4_DOW*/PROC_SCI_CTRL.wa*" 20 ns;
+#MULTICYCLE TO CELL   "THE_MEDIA_4_DOW*/sci*" 20 ns;
+#MULTICYCLE FROM CELL "THE_MEDIA_4_DOW*/sci*" 20 ns;
+#MULTICYCLE TO CELL   "THE_MEDIA_4_DOW*/PROC_SCI_CTRL.wa*" 20 ns;
 BLOCK PATH TO   CLKNET "THE_MEDIA_4_DOW*/sci_write_i";
 BLOCK PATH FROM CLKNET "THE_MEDIA_4_DOW*/sci_write_i";
 BLOCK PATH TO   CLKNET "THE_MEDIA_4_DOW*/sci_read_i";
@@ -34,33 +34,33 @@ MULTICYCLE TO CLKNET    "THE_MEDIA_4_DOW*/sci_write_i" 15 ns;
 MULTICYCLE FROM CLKNET  "THE_MEDIA_4_DOW*/sci_write_i" 15 ns; 
 
 
-MULTICYCLE TO CELL   "THE_MEDIA_INTERFACE/sci*" 20 ns;
-MULTICYCLE FROM CELL "THE_MEDIA_INTERFACE/sci*" 20 ns;
-MULTICYCLE TO CELL   "THE_MEDIA_INTERFACE/PROC_SCI_CTRL.wa*" 20 ns;
-BLOCK PATH TO   CLKNET "THE_MEDIA_INTERFACE/sci_write_i";
-BLOCK PATH FROM CLKNET "THE_MEDIA_INTERFACE/sci_write_i";
-BLOCK PATH TO   CLKNET "THE_MEDIA_INTERFACE/sci_read_i";
-BLOCK PATH FROM CLKNET "THE_MEDIA_INTERFACE/sci_read_i";
-MULTICYCLE TO CLKNET    "THE_MEDIA_INTERFACE/sci_read_i" 15 ns; 
-MULTICYCLE FROM CLKNET  "THE_MEDIA_INTERFACE/sci_read_i" 15 ns; 
-MULTICYCLE TO CLKNET    "THE_MEDIA_INTERFACE/sci_write_i" 15 ns; 
-MULTICYCLE FROM CLKNET  "THE_MEDIA_INTERFACE/sci_write_i" 15 ns; 
-
-
-MULTICYCLE TO CELL   "gen_PCSD.THE_MEDIA_PCSD/sci*" 20 ns;
-MULTICYCLE FROM CELL "gen_PCSD.THE_MEDIA_PCSD/sci*" 20 ns;
-MULTICYCLE TO CELL   "gen_PCSD.THE_MEDIA_PCSD/PROC_SCI_CTRL.wa*" 20 ns;
-BLOCK PATH TO   CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_write_i";
-BLOCK PATH FROM CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_write_i";
-BLOCK PATH TO   CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_read_i";
-BLOCK PATH FROM CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_read_i";
-MULTICYCLE TO CLKNET    "gen_PCSD.THE_MEDIA_PCSD/sci_read_i" 15 ns; 
-MULTICYCLE FROM CLKNET  "gen_PCSD.THE_MEDIA_PCSD/sci_read_i" 15 ns; 
-MULTICYCLE TO CLKNET    "gen_PCSD.THE_MEDIA_PCSD/sci_write_i" 15 ns; 
-MULTICYCLE FROM CLKNET  "gen_PCSD.THE_MEDIA_PCSD/sci_write_i" 15 ns; 
-
-MULTICYCLE TO ASIC  "THE_MEDIA*/THE_SERDES/PCSD_INST" PIN SCIRD 15 ns;
-MAXDELAY   TO ASIC  "THE_MEDIA*/THE_SERDES/PCSD_INST" PIN SCIRD 15 ns;
+#MULTICYCLE TO CELL   "THE_MEDIA_INTERFACE/sci*" 20 ns;
+#MULTICYCLE FROM CELL "THE_MEDIA_INTERFACE/sci*" 20 ns;
+#MULTICYCLE TO CELL   "THE_MEDIA_INTERFACE/PROC_SCI_CTRL.wa*" 20 ns;
+#BLOCK PATH TO   CLKNET "THE_MEDIA_INTERFACE/sci_write_i";
+#BLOCK PATH FROM CLKNET "THE_MEDIA_INTERFACE/sci_write_i";
+#BLOCK PATH TO   CLKNET "THE_MEDIA_INTERFACE/sci_read_i";
+#BLOCK PATH FROM CLKNET "THE_MEDIA_INTERFACE/sci_read_i";
+#MULTICYCLE TO CLKNET    "THE_MEDIA_INTERFACE/sci_read_i" 15 ns; 
+#MULTICYCLE FROM CLKNET  "THE_MEDIA_INTERFACE/sci_read_i" 15 ns; 
+#MULTICYCLE TO CLKNET    "THE_MEDIA_INTERFACE/sci_write_i" 15 ns; 
+#MULTICYCLE FROM CLKNET  "THE_MEDIA_INTERFACE/sci_write_i" 15 ns; 
+#
+#
+#MULTICYCLE TO CELL   "gen_PCSD.THE_MEDIA_PCSD/sci*" 20 ns;
+#MULTICYCLE FROM CELL "gen_PCSD.THE_MEDIA_PCSD/sci*" 20 ns;
+#MULTICYCLE TO CELL   "gen_PCSD.THE_MEDIA_PCSD/PROC_SCI_CTRL.wa*" 20 ns;
+#BLOCK PATH TO   CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_write_i";
+#BLOCK PATH FROM CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_write_i";
+#BLOCK PATH TO   CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_read_i";
+#BLOCK PATH FROM CLKNET "gen_PCSD.THE_MEDIA_PCSD/sci_read_i";
+#MULTICYCLE TO CLKNET    "gen_PCSD.THE_MEDIA_PCSD/sci_read_i" 15 ns; 
+#MULTICYCLE FROM CLKNET  "gen_PCSD.THE_MEDIA_PCSD/sci_read_i" 15 ns; 
+#MULTICYCLE TO CLKNET    "gen_PCSD.THE_MEDIA_PCSD/sci_write_i" 15 ns; 
+#MULTICYCLE FROM CLKNET  "gen_PCSD.THE_MEDIA_PCSD/sci_write_i" 15 ns; 
+#
+#MULTICYCLE TO ASIC  "THE_MEDIA*/THE_SERDES/PCSD_INST" PIN SCIRD 15 ns;
+#MAXDELAY   TO ASIC  "THE_MEDIA*/THE_SERDES/PCSD_INST" PIN SCIRD 15 ns;
 
 # 
 # #GbE Part

diff --git a/backplanemaster/trb3sc_master.vhd b/backplanemaster/trb3sc_master.vhd
index ec0584a2947e4c4d667c4c895023c9d80cea7427..bf03c216207ebe861dc3a93a0f095e07a04e0011 100644 (file)
--- a/backplanemaster/trb3sc_master.vhd
+++ b/backplanemaster/trb3sc_master.vhd
@@ -257,7 +257,7 @@ THE_MEDIA_INT_MIXED : entity work.med_ecp3_sfp_sync_4_slave3  --PCSB
     SD_LOS_IN(2)       => backplane_rx_present(5),
     SD_TXDIS_OUT(2)    => backplane_tx_present(5),    
     SD_PRSNT_N_IN(3)   => SFP_MOD0(1),
-    SD_LOS_IN(3)       => '0', --SFP_LOS(1),
+    SD_LOS_IN(3)       => SFP_LOS(1),
     SD_TXDIS_OUT(3)    => SFP_TX_DIS(1),
     --Control Interface
     BUS_RX             => bussci2_rx,