]> jspc29.x-matter.uni-frankfurt.de Git - cri.git/log
cri.git
3 years agoupdate of IP cores for Vivado 2021.2 master
Adrian Weber [Fri, 10 Dec 2021 15:06:35 +0000 (16:06 +0100)]
update of IP cores for Vivado 2021.2

3 years agofix of dummy assignment in regio bus handler of slowcontrol hub
Adrian Weber [Mon, 29 Nov 2021 12:00:16 +0000 (13:00 +0100)]
fix of dummy assignment in regio bus handler of slowcontrol hub

3 years agoadd possibility to not using uplink in hubs or terminate uplink mediainterface
Adrian Weber [Mon, 22 Nov 2021 13:26:37 +0000 (14:26 +0100)]
add possibility to not using uplink in hubs or terminate uplink mediainterface

3 years agoadd separate reset signal to DCA communication (DCA-Trbnet bridge)
Adrian Weber [Thu, 18 Nov 2021 13:27:14 +0000 (14:27 +0100)]
add separate reset signal to DCA communication (DCA-Trbnet bridge)

3 years agogeneralisation of even and odd downlinks
Adrian Weber [Wed, 17 Nov 2021 14:47:47 +0000 (15:47 +0100)]
generalisation of even and odd downlinks

3 years agoallow odd numbers of downlinks for CRI hub
Adrian Weber [Tue, 16 Nov 2021 13:54:06 +0000 (14:54 +0100)]
allow odd numbers of downlinks for CRI hub

3 years agogenerate Init_endpoint ids based on SLRs of CRI
Adrian Weber [Mon, 15 Nov 2021 16:59:10 +0000 (17:59 +0100)]
generate Init_endpoint ids based on SLRs of CRI

3 years agorestructured hub generation and reduced needed functions. Now 2 data hubs are generat...
Adrian Weber [Fri, 15 Oct 2021 14:14:03 +0000 (16:14 +0200)]
restructured hub generation and reduced needed functions. Now 2 data hubs are generated. A even number of downlinks is currently required.

3 years agocommit again to test mirroring
Adrian Weber [Wed, 13 Oct 2021 13:32:01 +0000 (15:32 +0200)]
commit again to test mirroring

3 years agoadd calculation of is_downlink and is_uplink to generalize hub creation
Adrian Weber [Wed, 13 Oct 2021 12:58:02 +0000 (14:58 +0200)]
add calculation of is_downlink and is_uplink to generalize hub creation

4 years agofix of a bug in reset of trbnet from trbnet bridge. The sync from AGWB is mostly...
Adrian Weber [Mon, 26 Apr 2021 06:23:02 +0000 (08:23 +0200)]
fix of a bug in reset of trbnet from trbnet bridge. The sync from AGWB is mostly getting high for a few ns after reset. A timeout of a few ns resolves this issue for now.

4 years agoadd sync for preload signal with additional variable to suppress multiple read signal...
Adrian Weber [Thu, 15 Apr 2021 08:14:10 +0000 (10:14 +0200)]
add sync for preload signal with additional variable to suppress multiple read signals due to signal delay

4 years agosynch of DCA clock signals to sysclock for FSM to relax timing
Adrian Weber [Thu, 8 Apr 2021 10:19:54 +0000 (12:19 +0200)]
synch of DCA clock signals to sysclock for FSM to relax timing

4 years agominor change in reset of links in cri hub. more similar to standard streaming port...
Adrian Weber [Wed, 7 Apr 2021 11:43:02 +0000 (13:43 +0200)]
minor change in reset of links in cri hub. more similar to standard streaming port entities of trbnet

4 years agoadditional wait state to compensate fifo read issue while write procedure via DCA
Adrian Weber [Wed, 7 Apr 2021 06:41:16 +0000 (08:41 +0200)]
additional wait state to compensate fifo read issue while write procedure via DCA

4 years agoset Trbnet Bridge Port to stream port. Reorder data in xilinx fifo wrapper to match...
Adrian Weber [Tue, 6 Apr 2021 08:43:30 +0000 (10:43 +0200)]
set Trbnet Bridge Port to stream port. Reorder data in xilinx fifo wrapper to match lattice definition and allow for correct data transmission

4 years agofix of issue with dca bridge reset signal to get readout of registers working.
Adrian Weber [Tue, 30 Mar 2021 14:04:04 +0000 (16:04 +0200)]
fix of issue with dca bridge reset signal to get readout of registers working.

4 years agoAdapt TrbNet-DCA bridge for synthesis
Thomas Gessler [Tue, 23 Mar 2021 15:15:46 +0000 (16:15 +0100)]
Adapt TrbNet-DCA bridge for synthesis

This includes the addition of XCKU FIFO cores and some changes to the
HDL codes. This likely breaks the current simulation testbench, which
will have to be fixed in a future commit.

4 years agoRevert "Test for repo mirroring"
Thomas Gessler [Fri, 19 Mar 2021 13:56:23 +0000 (14:56 +0100)]
Revert "Test for repo mirroring"

This reverts commit fa6e45f42e392eb6205d1e35633cf14ceeb02044.

4 years agoTest for repo mirroring
Jan Michel [Fri, 19 Mar 2021 12:00:14 +0000 (13:00 +0100)]
Test for repo mirroring

4 years agohub_test: Clean up IP cores and build results
Thomas Gessler [Wed, 17 Mar 2021 16:17:32 +0000 (17:17 +0100)]
hub_test: Clean up IP cores and build results

- Remove XML files, which are apparently not required
- Set build directory for each core
- Add build directories and other files to gitignore file
- Set XCI options that are otherwise set during build

4 years agofix of crashung readout in case of triggers not together with in the DLM (CALIBRATION...
Adrian Weber [Tue, 16 Mar 2021 11:50:17 +0000 (12:50 +0100)]
fix of crashung readout in case of triggers not together with in the DLM (CALIBRATION; seen while no DLM transmitted.). Now in case of 0xD trigger, the last DLM message is written to CTS and the readout is finished.

4 years agoimprovements in simulation of dca bridge. full send and receive seems to work as...
Adrian Weber [Wed, 3 Mar 2021 13:24:44 +0000 (14:24 +0100)]
improvements in simulation of dca bridge. full send and receive seems to work as expected.

4 years agosmall imrovements in dca_bridge and gub fix in simulation agwb handler
Adrian Weber [Wed, 3 Mar 2021 13:23:09 +0000 (14:23 +0100)]
small imrovements in dca_bridge and gub fix in simulation agwb handler

4 years agoadd hub logic to the simulation of DCA bridge to get simulation more realistic.
Adrian Weber [Wed, 3 Mar 2021 10:14:30 +0000 (11:14 +0100)]
add hub logic to the simulation of DCA bridge to get simulation more realistic.

4 years agosmall changes to fix data written to fifo in hub logic. Before, first word was writte...
Adrian Weber [Wed, 3 Mar 2021 10:13:30 +0000 (11:13 +0100)]
small changes to fix data written to fifo in hub logic. Before, first word was written to rx fifo in hub logic twice.

4 years agosmall custom agwb handler for simulation purpose
Adrian Weber [Tue, 2 Mar 2021 15:30:09 +0000 (16:30 +0100)]
small custom agwb handler for simulation purpose

4 years agoDCA bridge to trbNet in a UDP/GBE like manner. Testbench added. Only write direction...
Adrian Weber [Tue, 2 Mar 2021 15:28:55 +0000 (16:28 +0100)]
DCA bridge to trbNet in a UDP/GBE like manner. Testbench added. Only write direction is tested in simulation.

4 years agopreparation of CRI hub for DCA connection and small bug fix
Adrian Weber [Tue, 2 Mar 2021 15:27:30 +0000 (16:27 +0100)]
preparation of CRI hub for DCA connection and small bug fix

4 years agosmall changes for internal Interface in slow control part for future connection of...
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

4 years agohub_test: Replace TX buf bypass with phase aligner
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).

4 years agoMerge commit '8dd99c8843ba968c8b98a1de0dd3377a94603a9e' as 'hub_test/src/tx_phase_ali...
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.

4 years agoSquashed 'hub_test/src/tx_phase_aligner/' content from commit e92a060
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

4 years agoMerge branch 'bypass_txbuf'
Thomas Gessler [Thu, 25 Feb 2021 09:37:28 +0000 (10:37 +0100)]
Merge branch 'bypass_txbuf'

4 years agoinit commit of two entitys to handle the slowcontrol between agwb/wishbone of cri...
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

4 years agohub_test: Activate downlink TX buffer bypass
Thomas Gessler [Fri, 12 Feb 2021 15:57:20 +0000 (16:57 +0100)]
hub_test: Activate downlink TX buffer bypass

4 years agohub_test: Downlink TX clocks to 240 MHz TXPROGDIV
Thomas Gessler [Fri, 12 Feb 2021 15:56:12 +0000 (16:56 +0100)]
hub_test: Downlink TX clocks to 240 MHz TXPROGDIV

4 years agoDLM_CTS_generator: deactivation of constant CLM_ready signal. Now controlled active...
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.

4 years agofix for data_ready signal and resulting 50% data acceptance. additional signal init...
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

4 years agotransport the local bhoard address to the calibration to allow for special tratment...
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

4 years agonew DLM to CTS entity. This entity substitutes the previously use MBS chain. A trigge...
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.

4 years agohub_test: Change to correct downlink frequency
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.

4 years agoAdapt MBS generator max count to 240 MHz clock
Thomas Gessler [Mon, 12 Oct 2020 14:59:49 +0000 (16:59 +0200)]
Adapt MBS generator max count to 240 MHz clock

4 years agohub_test: Add timing constraints
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.

4 years agohub_test: Change downlinks to 2.4 Gbps
Thomas Gessler [Wed, 30 Sep 2020 06:59:24 +0000 (08:59 +0200)]
hub_test: Change downlinks to 2.4 Gbps

4 years agoDerive system clock from downlink reference clock
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.

4 years agoChange downlink fibers from A(1..9) to D(4..12)
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.

4 years agohub_test: Fix and simplify ILA cores
Thomas Gessler [Thu, 8 Oct 2020 21:52:14 +0000 (23:52 +0200)]
hub_test: Fix and simplify ILA cores

4 years agohub_test: Remove In-System IBERT
Thomas Gessler [Thu, 8 Oct 2020 21:26:23 +0000 (23:26 +0200)]
hub_test: Remove In-System IBERT

4 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:cri
Adrian Weber [Fri, 2 Oct 2020 11:58:02 +0000 (13:58 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:cri

4 years agocalculation of TDC fields in CTS data and corresponding adjustment in simulation
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

4 years agohub_test: change MGT locations
Thomas Gessler [Tue, 29 Sep 2020 22:03:31 +0000 (00:03 +0200)]
hub_test: change MGT locations

4 years agohub_test: Move debug constraints to XDC file
Thomas Gessler [Tue, 29 Sep 2020 09:43:03 +0000 (11:43 +0200)]
hub_test: Move debug constraints to XDC file

4 years agohub_test: Make debug cores smaller
Thomas Gessler [Tue, 29 Sep 2020 08:21:46 +0000 (10:21 +0200)]
hub_test: Make debug cores smaller

4 years agoAdapt to single-MGT scheme
Thomas Gessler [Mon, 28 Sep 2020 15:45:58 +0000 (17:45 +0200)]
Adapt to single-MGT scheme

4 years agodelay of data for more relaxed timing and preparaion for syn_keep
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

4 years agosmall fix for the filling of the end of data with 0xAAAA. Minor fixes in simulation...
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

4 years agotestbanches for dataSender simulation in modelsim (with calibration)
Adrian Weber [Wed, 23 Sep 2020 15:23:26 +0000 (17:23 +0200)]
testbanches for dataSender simulation in modelsim (with calibration)

4 years agoinclusion of online tdc calibration in data sender. CTS calibration has to be adjuste...
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

4 years agonew entity for generation of mbs tiggers, based on DLM words/signals
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

4 years agolatest small fixes in Trbnet2Cri part
Adrian Weber [Mon, 21 Sep 2020 10:29:42 +0000 (12:29 +0200)]
latest small fixes in Trbnet2Cri part

4 years agohub_test: Set RXLPMEN to 1
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").

4 years agohub_test: Add In-System IBERT core for two links
Thomas Gessler [Thu, 17 Sep 2020 15:53:50 +0000 (17:53 +0200)]
hub_test: Add In-System IBERT core for two links

4 years agohub_test: Add microslice DLM pulse generation
Thomas Gessler [Thu, 17 Sep 2020 15:43:08 +0000 (17:43 +0200)]
hub_test: Add microslice DLM pulse generation

4 years agohub_test: Set MiniPOD RX parameters in init.c
Thomas Gessler [Thu, 17 Sep 2020 15:22:25 +0000 (17:22 +0200)]
hub_test: Set MiniPOD RX parameters in init.c

4 years agohub_test: Revise MB reset outputs and clocks
Thomas Gessler [Sun, 13 Sep 2020 18:26:42 +0000 (20:26 +0200)]
hub_test: Revise MB reset outputs and clocks

4 years agohub_test: Add big ILA for MGT user data signals
Thomas Gessler [Sun, 13 Sep 2020 18:24:46 +0000 (20:24 +0200)]
hub_test: Add big ILA for MGT user data signals

4 years agohub_test: style fix
Thomas Gessler [Sun, 13 Sep 2020 18:19:28 +0000 (20:19 +0200)]
hub_test: style fix

4 years agohub_test: Remove bd/ directory
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.

4 years agoChange to new MGT clocking scheme
Thomas Gessler [Fri, 11 Sep 2020 14:18:25 +0000 (16:18 +0200)]
Change to new MGT clocking scheme

4 years agotrb_parser: Add missing sensitivity-list signals
Thomas Gessler [Fri, 11 Sep 2020 14:17:12 +0000 (16:17 +0200)]
trb_parser: Add missing sensitivity-list signals

4 years agohub_test: Add TRB parser
Thomas Gessler [Fri, 4 Sep 2020 14:22:06 +0000 (16:22 +0200)]
hub_test: Add TRB parser

4 years agohub_test: Add MBS trigger output ports
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.

4 years agoAdd input sbuf to hub IO MUX
Thomas Gessler [Wed, 26 Aug 2020 12:53:46 +0000 (14:53 +0200)]
Add input sbuf to hub IO MUX

4 years agoFix hub data signals, add debug core to hub_test
Thomas Gessler [Mon, 24 Aug 2020 17:16:33 +0000 (19:16 +0200)]
Fix hub data signals, add debug core to hub_test

4 years agoAdd signals for unused hub data ports
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.

4 years agominor fix in data connection calculation of data path of hub
Adrian Weber [Tue, 11 Aug 2020 11:19:27 +0000 (13:19 +0200)]
minor fix in data connection calculation of data path of hub

4 years agohub_test: Add hub-data signals with debug attr's
Thomas Gessler [Fri, 7 Aug 2020 14:51:31 +0000 (16:51 +0200)]
hub_test: Add hub-data signals with debug attr's

4 years agoendpoint_test: Remove outdated testbenches
Thomas Gessler [Fri, 7 Aug 2020 14:50:38 +0000 (16:50 +0200)]
endpoint_test: Remove outdated testbenches

4 years agohub/endpoint_test: Add read_sysmon
Thomas Gessler [Fri, 7 Aug 2020 14:49:56 +0000 (16:49 +0200)]
hub/endpoint_test: Add read_sysmon

4 years agoAdapt file name to trbnet GbE-in-Frontend changes
Thomas Gessler [Wed, 5 Aug 2020 18:28:21 +0000 (20:28 +0200)]
Adapt file name to trbnet GbE-in-Frontend changes

4 years agoAdapt to media interface changes in trbnet
Thomas Gessler [Wed, 5 Aug 2020 15:34:35 +0000 (17:34 +0200)]
Adapt to media interface changes in trbnet

4 years agohub_test: Add compile scripts
Thomas Gessler [Mon, 27 Jul 2020 07:25:47 +0000 (09:25 +0200)]
hub_test: Add compile scripts

4 years agoAdd hub_test, update file paths in endpoint test
Thomas Gessler [Fri, 24 Jul 2020 21:51:29 +0000 (23:51 +0200)]
Add hub_test, update file paths in endpoint test

4 years agonumber of data hubs is now automaticly scaling to the MII_NUMBER. max. 12 downlinks...
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.

4 years agofix in cri_hub's stat_op and ctrl_op handling to get stacked hub config running
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

4 years agohub for stacking: hub is controlling hubs
Adrian Weber [Mon, 20 Jul 2020 10:51:28 +0000 (12:51 +0200)]
hub for stacking: hub is controlling hubs

4 years agoadding missing file for combiner2CRI and new hub version for CRI: slowcontrol part...
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

4 years agoadd a gitignore and the source files for data sending and receiving between CRI and...
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

4 years agoAdjust file search paths to changes in trbnet
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.

4 years agoAdd project endpoint_test
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>