]>
jspc29.x-matter.uni-frankfurt.de Git - cri.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Adrian Weber [Thu, 25 Feb 2021 12:53:11 +0000 (13:53 +0100)]
small changes for internal Interface in slow control part for future connection of CBM DCA
Thomas Gessler [Thu, 25 Feb 2021 09:33:03 +0000 (10:33 +0100)]
hub_test: Replace TX buf bypass with phase aligner
This achieves a deterministic phase of the downlink TX data with respect
to the reference clock (and system/CBM clock).
Thomas Gessler [Thu, 25 Feb 2021 09:48:21 +0000 (10:48 +0100)]
Merge commit '
8dd99c8843ba968c8b98a1de0dd3377a94603a9e ' as 'hub_test/src/tx_phase_aligner'
Add TX phase aligner core from CERN HPTD project:
https://gitlab.cern.ch/HPTD/tx_phase_aligner
This achieves TX phase alignment to a reference clock by the method
described in:
E. Mendes, S. Baron, C. Soos, J. Troska and P. Novellini, "Achieving
Picosecond-Level Phase Stability in Timing Distribution Systems With
Xilinx Ultrascale Transceivers," in IEEE Transactions on Nuclear
Science, vol. 67, no. 3, pp. 473-481, March 2020, doi:
10.1109/TNS.2020.
2968112 .
Thomas Gessler [Thu, 25 Feb 2021 09:48:21 +0000 (10:48 +0100)]
Squashed 'hub_test/src/tx_phase_aligner/' content from commit
e92a060
git-subtree-dir: hub_test/src/tx_phase_aligner
git-subtree-split:
e92a060f338e99de064f09df812c65363268221b
Thomas Gessler [Thu, 25 Feb 2021 09:37:28 +0000 (10:37 +0100)]
Merge branch 'bypass_txbuf'
Adrian Weber [Mon, 22 Feb 2021 14:29:26 +0000 (15:29 +0100)]
init commit of two entitys to handle the slowcontrol between agwb/wishbone of cri and trbnet. Entities are based on trbnet to pci bridge and only an untested shelf. To be implemented
Thomas Gessler [Fri, 12 Feb 2021 15:57:20 +0000 (16:57 +0100)]
hub_test: Activate downlink TX buffer bypass
Thomas Gessler [Fri, 12 Feb 2021 15:56:12 +0000 (16:56 +0100)]
hub_test: Downlink TX clocks to 240 MHz TXPROGDIV
Adrian Weber [Fri, 12 Feb 2021 16:39:07 +0000 (17:39 +0100)]
DLM_CTS_generator: deactivation of constant CLM_ready signal. Now controlled active by DLM signal.
Adrian Weber [Fri, 12 Feb 2021 13:41:13 +0000 (14:41 +0100)]
fix for data_ready signal and resulting 50% data acceptance. additional signal init values and reset for state machine
Adrian Weber [Mon, 1 Feb 2021 15:01:01 +0000 (16:01 +0100)]
transport the local bhoard address to the calibration to allow for special tratment of onboard TDCs
Adrian Weber [Tue, 19 Jan 2021 15:26:18 +0000 (16:26 +0100)]
new DLM to CTS entity. This entity substitutes the previously use MBS chain. A trigger is now generated from EACH DLM message. In case the DLM messag eis the same as in the DLM before, a subtrigger is counted up. A subtrigger is used to generate readouts inbetween microtimeslices. The DLM message itself indicates the microtimeslice index. Updates for higher stability and more features will follow. This is the first version of the entity.
Thomas Gessler [Tue, 10 Nov 2020 13:10:33 +0000 (14:10 +0100)]
hub_test: Change to correct downlink frequency
This was forgotten during the original change to 2.4 Gbps. It likely
worked anyway, because the GT settings for 2.4 Gbps with 120 MHz are
similar to 2.0 Gbps with 100 MHz.
Thomas Gessler [Mon, 12 Oct 2020 14:59:49 +0000 (16:59 +0200)]
Adapt MBS generator max count to 240 MHz clock
Thomas Gessler [Wed, 30 Sep 2020 10:18:41 +0000 (12:18 +0200)]
hub_test: Add timing constraints
Currently requires the sync_fix branch of trbnet to achieve timing
closure.
Thomas Gessler [Wed, 30 Sep 2020 06:59:24 +0000 (08:59 +0200)]
hub_test: Change downlinks to 2.4 Gbps
Thomas Gessler [Mon, 12 Oct 2020 10:39:20 +0000 (12:39 +0200)]
Derive system clock from downlink reference clock
This gets rid of the separate fabric clock input port and prevents
timing errors stemming from the separate clock sources.
Thomas Gessler [Mon, 12 Oct 2020 08:14:04 +0000 (10:14 +0200)]
Change downlink fibers from A(1..9) to D(4..12)
This puts all downlinks and the uplink on the same MTP connectors again,
so that a single MTP pair can be used for all RICH links in mCBM 2021.
Thomas Gessler [Thu, 8 Oct 2020 21:52:14 +0000 (23:52 +0200)]
hub_test: Fix and simplify ILA cores
Thomas Gessler [Thu, 8 Oct 2020 21:26:23 +0000 (23:26 +0200)]
hub_test: Remove In-System IBERT
Adrian Weber [Fri, 2 Oct 2020 11:58:02 +0000 (13:58 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:cri
Adrian Weber [Fri, 2 Oct 2020 11:57:40 +0000 (13:57 +0200)]
calculation of TDC fields in CTS data and corresponding adjustment in simulation
Thomas Gessler [Tue, 29 Sep 2020 22:03:31 +0000 (00:03 +0200)]
hub_test: change MGT locations
Thomas Gessler [Tue, 29 Sep 2020 09:43:03 +0000 (11:43 +0200)]
hub_test: Move debug constraints to XDC file
Thomas Gessler [Tue, 29 Sep 2020 08:21:46 +0000 (10:21 +0200)]
hub_test: Make debug cores smaller
Thomas Gessler [Mon, 28 Sep 2020 15:45:58 +0000 (17:45 +0200)]
Adapt to single-MGT scheme
Adrian Weber [Wed, 30 Sep 2020 07:07:38 +0000 (09:07 +0200)]
delay of data for more relaxed timing and preparaion for syn_keep
Adrian Weber [Thu, 24 Sep 2020 09:51:05 +0000 (11:51 +0200)]
small fix for the filling of the end of data with 0xAAAA. Minor fixes in simulation top entity to get a full data transfer
Adrian Weber [Wed, 23 Sep 2020 15:23:26 +0000 (17:23 +0200)]
testbanches for dataSender simulation in modelsim (with calibration)
Adrian Weber [Wed, 23 Sep 2020 15:21:03 +0000 (17:21 +0200)]
inclusion of online tdc calibration in data sender. CTS calibration has to be adjusted when TDC is implemented
Adrian Weber [Mon, 21 Sep 2020 11:01:58 +0000 (13:01 +0200)]
new entity for generation of mbs tiggers, based on DLM words/signals
Adrian Weber [Mon, 21 Sep 2020 10:29:42 +0000 (12:29 +0200)]
latest small fixes in Trbnet2Cri part
Thomas Gessler [Fri, 18 Sep 2020 15:51:12 +0000 (17:51 +0200)]
hub_test: Set RXLPMEN to 1
This switches the RX equalizer from DFE to LPM mode, which seems to
improve link stability when the equalizer is initialized on non-random
8b10b characters like idle words (see UG576, "Choosing Between LPM and
DFE Modes").
Thomas Gessler [Thu, 17 Sep 2020 15:53:50 +0000 (17:53 +0200)]
hub_test: Add In-System IBERT core for two links
Thomas Gessler [Thu, 17 Sep 2020 15:43:08 +0000 (17:43 +0200)]
hub_test: Add microslice DLM pulse generation
Thomas Gessler [Thu, 17 Sep 2020 15:22:25 +0000 (17:22 +0200)]
hub_test: Set MiniPOD RX parameters in init.c
Thomas Gessler [Sun, 13 Sep 2020 18:26:42 +0000 (20:26 +0200)]
hub_test: Revise MB reset outputs and clocks
Thomas Gessler [Sun, 13 Sep 2020 18:24:46 +0000 (20:24 +0200)]
hub_test: Add big ILA for MGT user data signals
Thomas Gessler [Sun, 13 Sep 2020 18:19:28 +0000 (20:19 +0200)]
hub_test: style fix
Thomas Gessler [Sat, 12 Sep 2020 12:46:45 +0000 (14:46 +0200)]
hub_test: Remove bd/ directory
It is apparently sufficient to track the .bd file.
Thomas Gessler [Fri, 11 Sep 2020 14:18:25 +0000 (16:18 +0200)]
Change to new MGT clocking scheme
Thomas Gessler [Fri, 11 Sep 2020 14:17:12 +0000 (16:17 +0200)]
trb_parser: Add missing sensitivity-list signals
Thomas Gessler [Fri, 4 Sep 2020 14:22:06 +0000 (16:22 +0200)]
hub_test: Add TRB parser
Thomas Gessler [Fri, 4 Sep 2020 14:21:07 +0000 (16:21 +0200)]
hub_test: Add MBS trigger output ports
Add a test trigger signal that corresponds to the microslice timing.
Output the signal to the CRI's four coaxial (U.FL) LVDS connectors. This
can be used for investigations with a scope.
Thomas Gessler [Wed, 26 Aug 2020 12:53:46 +0000 (14:53 +0200)]
Add input sbuf to hub IO MUX
Thomas Gessler [Mon, 24 Aug 2020 17:16:33 +0000 (19:16 +0200)]
Fix hub data signals, add debug core to hub_test
Thomas Gessler [Mon, 24 Aug 2020 13:03:12 +0000 (15:03 +0200)]
Add signals for unused hub data ports
These are necessary to prevent "missing port association" errors during
synthesis with Vivado.
Adrian Weber [Tue, 11 Aug 2020 11:19:27 +0000 (13:19 +0200)]
minor fix in data connection calculation of data path of hub
Thomas Gessler [Fri, 7 Aug 2020 14:51:31 +0000 (16:51 +0200)]
hub_test: Add hub-data signals with debug attr's
Thomas Gessler [Fri, 7 Aug 2020 14:50:38 +0000 (16:50 +0200)]
endpoint_test: Remove outdated testbenches
Thomas Gessler [Fri, 7 Aug 2020 14:49:56 +0000 (16:49 +0200)]
hub/endpoint_test: Add read_sysmon
Thomas Gessler [Wed, 5 Aug 2020 18:28:21 +0000 (20:28 +0200)]
Adapt file name to trbnet GbE-in-Frontend changes
Thomas Gessler [Wed, 5 Aug 2020 15:34:35 +0000 (17:34 +0200)]
Adapt to media interface changes in trbnet
Thomas Gessler [Mon, 27 Jul 2020 07:25:47 +0000 (09:25 +0200)]
hub_test: Add compile scripts
Thomas Gessler [Fri, 24 Jul 2020 21:51:29 +0000 (23:51 +0200)]
Add hub_test, update file paths in endpoint test
Adrian Weber [Tue, 21 Jul 2020 14:02:00 +0000 (16:02 +0200)]
number of data hubs is now automaticly scaling to the MII_NUMBER. max. 12 downlinks per hub.
Adrian Weber [Tue, 21 Jul 2020 07:38:36 +0000 (09:38 +0200)]
fix in cri_hub's stat_op and ctrl_op handling to get stacked hub config running
Adrian Weber [Mon, 20 Jul 2020 10:51:28 +0000 (12:51 +0200)]
hub for stacking: hub is controlling hubs
Adrian Weber [Fri, 17 Jul 2020 07:11:24 +0000 (09:11 +0200)]
adding missing file for combiner2CRI and new hub version for CRI: slowcontrol part is now separated from data and unused channels to be more flexible for cascaded hub structure if we go up to 48 sfp connections
Adrian Weber [Thu, 16 Jul 2020 14:04:36 +0000 (16:04 +0200)]
add a gitignore and the source files for data sending and receiving between CRI and Combiners
Thomas Gessler [Mon, 13 Jul 2020 08:59:10 +0000 (10:59 +0200)]
Adjust file search paths to changes in trbnet
Files were moved in trbnet commit
06cafe8 .
Thomas Gessler [Wed, 8 Jul 2020 15:59:32 +0000 (17:59 +0200)]
Add project endpoint_test
Migrated from the CBM RICH CRI test repo:
git.cbm.gsi.de/rich/rich_cri
Original code by: Adrian Weber <a.weber@gsi.de>