]>
jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/log
Thomas Gessler [Tue, 23 Feb 2021 18:59:57 +0000 (19:59 +0100)]
XCKU MGTs: Add TXPI, make TX soft reset optional
The TX phase interpolator (PI) ports can be used to adjust the TX-data
phase with respect to the reference (and user) clock to achieve
deterministic latency.
Thomas Gessler [Fri, 12 Feb 2021 15:33:25 +0000 (16:33 +0100)]
xcku SerDes: Add TX PROGDIV and Buffer Bypass
Thomas Gessler [Thu, 4 Feb 2021 13:46:39 +0000 (14:46 +0100)]
Merge branch 'master' into cbm_rich
Adrian Weber [Wed, 13 Jan 2021 14:38:51 +0000 (15:38 +0100)]
Add I2C to streaming_port_sctrl_cts and the component; Add Fifos for ECP5 (Trb5sc)
Jan Michel [Thu, 19 Nov 2020 16:13:39 +0000 (17:13 +0100)]
new ECP5 media interface for 2 links
Jan Michel [Thu, 19 Nov 2020 10:18:05 +0000 (11:18 +0100)]
add small fifo for ECP5 in Hub
Jan Michel [Thu, 19 Nov 2020 09:31:56 +0000 (10:31 +0100)]
Include I2C to hub, add onewire monitor for old designs
Jan Michel [Thu, 19 Nov 2020 09:31:12 +0000 (10:31 +0100)]
Fix error register
Jan Michel [Thu, 19 Nov 2020 08:53:41 +0000 (09:53 +0100)]
update GbE for old mdchub to match shower board settings
Thomas Gessler [Tue, 13 Oct 2020 15:20:11 +0000 (17:20 +0200)]
Add wa_position reset for 2.4 Gbps ECP3 SERDES
This was accidentally omitted in the previous commit.
Thomas Gessler [Wed, 7 Oct 2020 16:03:01 +0000 (18:03 +0200)]
media_interfaces: Reset RX on wrong wa_position
Thomas Gessler [Fri, 9 Oct 2020 08:36:18 +0000 (10:36 +0200)]
Merge branch 'master' into sync_fix
Thomas Gessler [Thu, 8 Oct 2020 19:13:29 +0000 (21:13 +0200)]
XCKU media interface: Reset RX on errors
In some cases the downlink RX logic did not come up correctly after a
reset. This is solved by checking RX data validity after a reset and
applying an RX PMA reset in case of errors.
Thomas Gessler [Thu, 8 Oct 2020 08:39:45 +0000 (10:39 +0200)]
ECP3 SERDES: Add core for 2.4 Gbps with 240 MHz
Thomas Gessler [Wed, 30 Sep 2020 13:37:39 +0000 (15:37 +0200)]
tx control: Fix signal_sync source clocks
TX_ALLOW_IN, RX_ALLOW_IN and SEND_LINK_RESET_IN are synchronous to the
system clock.
tx_allow_qtx is synchronous to the TXI clock.
Thomas Gessler [Wed, 30 Sep 2020 13:31:38 +0000 (15:31 +0200)]
rx/tx_reset_fsm: Synchronize reset input
The asynchronous reset inputs were used without synchronization to reset
both state machines, leading to potential errors.
Thomas Gessler [Wed, 30 Sep 2020 13:21:31 +0000 (15:21 +0200)]
rx_control: Use system clock for sampling rx_allow
rx_allow is synchronous to the system clock. ct_fifo_reset is
asynchronous and can therefore be produced with the system clock to
avoid timing errors.
Thomas Gessler [Wed, 30 Sep 2020 13:17:13 +0000 (15:17 +0200)]
med_sync_control: Fix signal_sync source clocks
The signal_sync instances for the finished_reset_* signals from
tx_reset_fsm and rx_reset_fsm had the source clock set to CLK_SYS, but
both source signals are synchronous to CLK_REF.
Thomas Gessler [Wed, 30 Sep 2020 13:10:02 +0000 (15:10 +0200)]
med_sync_control: Add reset sync for RXI/TXI clock
Previously, the reset_i signal (synchronous to the system clock) was
used for rx_control and tx_control.
Thomas Gessler [Wed, 30 Sep 2020 13:03:12 +0000 (15:03 +0200)]
Move retransmit sync logic to med_sync_control
Retransmit signals are produced with the RXI clock and were previously
synchronized to the TXI clock in tx_control, where the RXI clock is not
available. The incoming signals were sampled with the unrelated system
clock. Moving everything up one level allows for a cleaner CDC.
Thomas Gessler [Mon, 28 Sep 2020 15:16:21 +0000 (17:16 +0200)]
Adapt Xilinx SYSMON reader to 120 MHz clock
Thomas Gessler [Fri, 25 Sep 2020 12:44:45 +0000 (14:44 +0200)]
XCKU MGTs: Change from quads to individual links
This makes it easier to run the transceivers within a single quad as
individual links with separate line rates. Additional changes:
- Change from QPLL to CPLLs.
- Provide a single top entity for multiple possible
frequency/reference-clock combinations.
- Remove GT reset logic and rely on the TrbNet reset logic. This is not
fully compatible with GTH cores. In particular, RX PCS reset must be
ignored. Otherwise, RX allow is asserted too early, and faulty data
reaches the RX control state machine.
- Change the default equalizer mode to LPM, which is more reliable that
DFE for 8b10b data with non-random sequences.
- Change the clock-correction sequences to 4 words:
(K)BC (D)C5 (K)BC (D)50
and (K)BC (D)50 (K)BC (D)50
Thomas Gessler [Wed, 16 Sep 2020 06:29:44 +0000 (08:29 +0200)]
XCKU MGTs: Expose transceiver debug ports
This allows the connection of an in-system IBERT core for link debugging
in the instantiating layer.
Thomas Gessler [Fri, 11 Sep 2020 14:01:54 +0000 (16:01 +0200)]
Overhaul clocking for XCKU MGTs
The clock inputs and outputs are now exposed to the instantiating layer.
This allows more flexible clocking schemes, including a completely
synchrounous system with multiple quads.
The reference-clock frequency is now set 100 MHz, so that it matches the
user-clock frequency.
The single-GT version is removed to simplify maintenance. Where needed,
it can be replaced by the quad version.
Thomas Gessler [Fri, 11 Sep 2020 13:57:33 +0000 (15:57 +0200)]
fifo_18x16_dualport_oreg_xcku: Add missing ports
Thomas Gessler [Thu, 3 Sep 2020 09:20:55 +0000 (11:20 +0200)]
Fix Xilinx FIFO counts, remove unused FIFOs
Jan Michel [Mon, 31 Aug 2020 11:55:34 +0000 (13:55 +0200)]
fix sbuf sizes in IObufs
Thomas Gessler [Mon, 24 Aug 2020 13:52:06 +0000 (15:52 +0200)]
Change settings for Xilinx CDC FIFO
Add safety circuit and change the full-flag reset value. These settings
were found to prevent slow control-related crashes.
Jan Michel [Sat, 22 Aug 2020 17:34:10 +0000 (19:34 +0200)]
Add register for IP address readback
Jan Michel [Mon, 17 Aug 2020 08:50:41 +0000 (10:50 +0200)]
add trb_net_xdna to components so that it is not needed in every project
Jan Michel [Mon, 10 Aug 2020 10:33:31 +0000 (12:33 +0200)]
add trb_net_xdna to components so that it is not needed in every project
Jan Michel [Mon, 10 Aug 2020 08:11:21 +0000 (10:11 +0200)]
add missing sbuf in gbe hub mux
Thomas Gessler [Fri, 7 Aug 2020 14:52:55 +0000 (16:52 +0200)]
Add UltraScale temperature read-out
Thomas Gessler [Fri, 7 Aug 2020 08:08:24 +0000 (10:08 +0200)]
Overhaul UltraScale DNA read-out
Thomas Gessler [Thu, 6 Aug 2020 21:12:27 +0000 (23:12 +0200)]
Update XCKU gtwizard README
Thomas Gessler [Thu, 6 Aug 2020 15:38:44 +0000 (17:38 +0200)]
XCKU MGTs: Add clock-correction sequence "C5BC"
Thomas Gessler [Thu, 6 Aug 2020 15:37:30 +0000 (17:37 +0200)]
XCKU quad MGT: Fix control signal assignments
Thomas Gessler [Wed, 5 Aug 2020 18:25:48 +0000 (20:25 +0200)]
endpoint_hades_full_gbe: Add Xilinx DNA interface
Thomas Gessler [Wed, 5 Aug 2020 14:59:16 +0000 (16:59 +0200)]
Merge branch 'cbm_cri'
Thomas Gessler [Wed, 5 Aug 2020 14:57:43 +0000 (16:57 +0200)]
XCKU media interfaces: simplify and clean up
Thomas Gessler [Fri, 24 Jul 2020 21:49:10 +0000 (23:49 +0200)]
Add XCKU quad-MGT core and clean up code
Jan Michel [Thu, 16 Jul 2020 15:23:45 +0000 (17:23 +0200)]
remove one counter check to allow empty events
Jan Michel [Thu, 16 Jul 2020 12:35:12 +0000 (14:35 +0200)]
add files for GbE-in-Frontend option
Thomas Gessler [Mon, 13 Jul 2020 08:47:20 +0000 (10:47 +0200)]
Move XCKU sync logic to own dir, fix bus logic
Changes suggested by Jan Michel.
Thomas Gessler [Wed, 8 Jul 2020 14:13:03 +0000 (16:13 +0200)]
Add Kintex UltraScale FIFOs and GTH for CBM CRI
Migrated from the CBM RICH CRI test repo:
git.cbm.gsi.de/rich/rich_cri
Original code by: Adrian Weber <a.weber@gsi.de>
Michael Boehmer [Fri, 26 Jun 2020 06:49:33 +0000 (08:49 +0200)]
fixed missing rising_edge() line in timer
Michael Boehmer [Thu, 25 Jun 2020 13:38:01 +0000 (15:38 +0200)]
WA_POSITION fixed to 0x0
Michael Boehmer [Thu, 25 Jun 2020 10:55:04 +0000 (12:55 +0200)]
ECP5 cleanup, sync TRBnet preperations
Jan Michel [Tue, 23 Jun 2020 14:33:56 +0000 (16:33 +0200)]
Move outdated files to oldfiles
Jan Michel [Tue, 23 Jun 2020 14:33:37 +0000 (16:33 +0200)]
add both serdes configurations for single serdes in ECP5 to trbnet.git
Jan Michel [Wed, 3 Jun 2020 10:03:07 +0000 (12:03 +0200)]
fix bug when word count is set to 0
Jan Michel [Tue, 2 Jun 2020 09:58:01 +0000 (11:58 +0200)]
prepared media interface for ECP5/hub
Jan Michel [Tue, 2 Jun 2020 09:57:14 +0000 (11:57 +0200)]
regenerated old fifo
Jan Michel [Tue, 2 Jun 2020 09:56:37 +0000 (11:56 +0200)]
some streaming API test files
Jan Michel [Tue, 2 Jun 2020 09:55:19 +0000 (11:55 +0200)]
update onewire interface for stand-alone operation with external mux
Jan Michel [Tue, 2 Jun 2020 09:52:37 +0000 (11:52 +0200)]
move old files to sub directory
Ingo Froehlich [Wed, 26 Feb 2020 15:27:19 +0000 (16:27 +0100)]
small changes to make pexor compile again
Jan Michel [Fri, 30 Aug 2019 12:28:12 +0000 (14:28 +0200)]
apply patches bei Thomas Geßler - syntax fixes
Adrian Weber [Mon, 29 Apr 2019 08:10:30 +0000 (10:10 +0200)]
GbE Fifos for ECP5. Fifos > 16k missing
Jan Michel [Thu, 25 Apr 2019 12:07:27 +0000 (14:07 +0200)]
update SCI reader for ECP5
Jan Michel [Thu, 25 Apr 2019 12:06:33 +0000 (14:06 +0200)]
Update ECP5 serdes files
Jan Michel [Mon, 8 Apr 2019 13:33:11 +0000 (15:33 +0200)]
add old SPI interface for designs not compatible with the new features added in January
Jan Michel [Thu, 31 Jan 2019 14:26:27 +0000 (15:26 +0100)]
additional SPI features for non-standard interfaces
Jan Michel [Wed, 16 Jan 2019 15:22:33 +0000 (16:22 +0100)]
fix inclusion of I2C instead of 1-wire
Jan Michel [Mon, 26 Nov 2018 10:43:44 +0000 (11:43 +0100)]
Update endpoint with I2C sensor option
Jan Michel [Thu, 22 Nov 2018 16:28:28 +0000 (17:28 +0100)]
add I2C files from MB
Adrian Weber [Fri, 9 Nov 2018 14:02:38 +0000 (15:02 +0100)]
MinEvSize=0; Adding Reg 0x7110 to 0x7114 to CTS
Jan Michel [Wed, 31 Oct 2018 10:57:45 +0000 (11:57 +0100)]
add record for trbnet data paths
Jan Michel [Wed, 31 Oct 2018 10:57:30 +0000 (11:57 +0100)]
enable RX Fifo on uplink for sync media interface
Jan Michel [Mon, 16 Jul 2018 15:52:24 +0000 (17:52 +0200)]
add option to discard events if they are below a certain threshold (e.g. headers only)
Jan Michel [Thu, 12 Jul 2018 09:53:56 +0000 (11:53 +0200)]
add counter for code violations
Your Name [Tue, 10 Jul 2018 08:02:14 +0000 (10:02 +0200)]
GK: fixed oversized subevents crashes
Jan Michel [Thu, 14 Jun 2018 14:54:20 +0000 (16:54 +0200)]
change asynchronous detection of reference time edges
Jan Michel [Thu, 14 Jun 2018 14:53:55 +0000 (16:53 +0200)]
remove some debug signals for better timing
Your Name [Wed, 30 May 2018 20:25:57 +0000 (22:25 +0200)]
gk:trigger type taken from FEE stream instead of CTS_READOUT_TYPE
Your Name [Wed, 25 Apr 2018 11:52:20 +0000 (13:52 +0200)]
gk: updated EB address selection
Jan Michel [Thu, 19 Apr 2018 12:55:35 +0000 (14:55 +0200)]
set unconnected registers to 0
Jan Michel [Thu, 19 Apr 2018 12:55:13 +0000 (14:55 +0200)]
less warnings in Diamond
Jan Michel [Thu, 19 Apr 2018 12:54:58 +0000 (14:54 +0200)]
fix ipu counter register
Jan Michel [Wed, 28 Mar 2018 14:24:29 +0000 (16:24 +0200)]
add few more registers to sync media interface
Jan Michel [Tue, 27 Mar 2018 08:03:17 +0000 (10:03 +0200)]
add reset counter to hub
Jan Michel [Tue, 27 Mar 2018 08:02:36 +0000 (10:02 +0200)]
improve Serdes reset routine
Jan Michel [Fri, 9 Mar 2018 15:28:03 +0000 (16:28 +0100)]
update reset procedure in media interface sync and hub
Jan Michel [Fri, 2 Feb 2018 11:01:54 +0000 (12:01 +0100)]
Remove got-link-ready detection for sync interface for the moment.
Jan Michel [Wed, 31 Jan 2018 10:53:37 +0000 (11:53 +0100)]
update sync media interface and longer network reset
Jan Michel [Mon, 22 Jan 2018 13:55:17 +0000 (14:55 +0100)]
some more cleanup
Jan Michel [Mon, 22 Jan 2018 10:58:32 +0000 (11:58 +0100)]
remove unused ports
Jan Michel [Fri, 19 Jan 2018 14:50:45 +0000 (15:50 +0100)]
change memories of gbe_ecp2m back to ecp2m versions
Jan Michel [Fri, 22 Dec 2017 16:14:20 +0000 (17:14 +0100)]
add "first idle after data" signal in tx_control
Jan Michel [Thu, 14 Dec 2017 12:25:30 +0000 (13:25 +0100)]
Update .gitignore
Jan Michel [Fri, 15 Dec 2017 15:45:00 +0000 (16:45 +0100)]
Revert "gbe with configurable ip address"
This reverts commit
7d74a38c516d8a21356d9026251b7ebfb523b15b .
Jan Michel [Fri, 15 Dec 2017 15:44:53 +0000 (16:44 +0100)]
Revert "gk: fixed reversed dhcp ip address"
This reverts commit
f1a3b9c87582f3cac540f9ae1ad577da53ab991b .
Jan Michel [Fri, 15 Dec 2017 15:44:25 +0000 (16:44 +0100)]
Revert "gk: updated link status"
This reverts commit
1d08a812cf5b8f4ef87b8af7b7381314060030d3 .
Jan Michel [Fri, 15 Dec 2017 15:44:15 +0000 (16:44 +0100)]
Revert "add missing end if"
This reverts commit
01b508310d4eb4369218c0b70fc008a672ea895a .
Jan Michel [Wed, 29 Nov 2017 12:49:26 +0000 (13:49 +0100)]
add missing end if
Your Name [Tue, 28 Nov 2017 16:41:30 +0000 (17:41 +0100)]
gk: updated link status
Your Name [Fri, 24 Nov 2017 09:32:28 +0000 (10:32 +0100)]
gk: fixed reversed dhcp ip address
Your Name [Fri, 17 Nov 2017 12:36:25 +0000 (13:36 +0100)]
gbe with configurable ip address
Jan Michel [Tue, 14 Nov 2017 12:24:32 +0000 (13:24 +0100)]
add temperature to outputs of hub streaming
Jan Michel [Tue, 14 Nov 2017 12:24:22 +0000 (13:24 +0100)]
fix large Fifos for ECP5