Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PGP2-FC Refactor and Enhancements #1008

Merged
merged 80 commits into from
Feb 15, 2024
Merged

PGP2-FC Refactor and Enhancements #1008

merged 80 commits into from
Feb 15, 2024

Conversation

bengineerd
Copy link
Contributor

@bengineerd bengineerd commented Sep 15, 2022 •
edited
Loading

Description

  • Change lots of module and signal names to more closely mimic Pgp2b.
  • Remove protocol error counter and link align functions in Pgp2FcAxi.vhd
  • Allow up to 8 FC words. Move FC interface to PgpTxIn and PgpRxOut port records.
  • Add RoguePgp2fcSim module for RTL sim integration
  • Add 7-series GTP7 and Ultrascale GTY integrations

bengineerd added 30 commits March 4, 2022 16:26
@bengineerd
Merge remote-tracking branch 'origin/pgp2fc-dev' into ldmx-dev
cbfadd7
@bengineerd
Merge remote-tracking branch 'origin/pre-release' into ldmx-dev
727cdd1
@bengineerd
Add MMCM generics and clock outputs
4f7c3f3
@bengineerd
Fix whitespace
5269898
@bengineerd
Add PLL-only generics to clock manager instantiations
183392a
@bengineerd
Make GTX7 fixed latency more like (working) GTP7 fixed latency
46f1d42
@bengineerd
Add more TX user clock options
87ae31c
@bengineerd
Fix multi-assign bugs
1db3c01
@bengineerd
Whitespace
520ba85
@bengineerd
Change FC port names for consistency
043268d
@bengineerd
Provide default values for pgpTxIn and pgpRxIn
cab2d1f
@bengineerd
Add gtp7 target for pgg2bfc
c8d3ba0 
Untested, probably broken still
@bengineerd
Fix port types
b965876
@bengineerd
Change signal and recrod names for consistency
1e31426
@bengineerd
Add default input
24e4a2c
@bengineerd
Change bufg generation logic
f09b069 
Might not cover every case yet
@bengineerd
Merge in latest pre-release
ca41184
@bengineerd
Merge remote-tracking branch 'origin/pre-release' into ldmx-dev
cc81226
@bengineerd
Allow more words in FC bus
df4e29b
@bengineerd
Create rogue sim model wrapper for Pgp2FC
1fd3a9b
@bengineerd
Allow more words on FC bus
a0d03b9
@bengineerd
Copy GTY core and wrappers from pgp2b
b17a94d
@bengineerd
Rename IP core
02d0403
@bengineerd
Update for 3.7 Gbps LCLS-II speed
20ff297
@bengineerd
Change Pgp2b to Pgp2fc in copy pasted code
d88b31c
@bengineerd
Revamp FC interface
03a26e9 
Now part of PgpTxIn and PgpRxOut
@bengineerd
Fix IP core, only 1 GT
d7ccb3e
@bengineerd
Merge remote-tracking branch 'origin/pre-release' into pgp-fc-rec
3a8bd6d
@bengineerd
Change channel
7511fb5 
Not sure this is right
@bengineerd
Merge remote-tracking branch 'origin/pre-release' into pgp-fc-rec
2527fcc
bengineerd and others added 20 commits July 21, 2023 13:30
@bengineerd
Add initilization values for all tx registers
11daafd
@bengineerd
Revert to previous refresh rate
8cb8483
@bengineerd
Add rogue module for PGP2FC emulation
431597f
@bengineerd
Fix bus widths
58d2dfd
@cbakalis-slac
pgp2fc transceiver mods. PGP link goes to 'ready' in sim (loopback)
8274f03
@cbakalis-slac
update pgp2fcgty from lcls2 timing repo. sourcing .xci until stable. …
979c586 
…bypassing align checker for now
@cbakalis-slac
update .xci
cf8f2d0
@cbakalis-slac
include aligning logic
aee119f
@cbakalis-slac
modify axi addressing in gty wrapper
a5ba4ff
@cbakalis-slac
resync resets to rx/txoutclk
0f2e36d
@cbakalis-slac
remove rx/txoutclk buffers
d2adb0c
@cbakalis-slac
fix rx/txoutclk buffering; point to .dcp
beb87d1
@cbakalis-slac
gty reset opt; use gtUserClk (odiv2 but not divided) for txoutclk to …
b9c4698 
…prevent placement errors
@bengineerd
Merge remote-tracking branch 'origin/pre-release' into pgp-fc-rec
78b55eb
@bengineerd
Move align checker to surf
3e9ef96
@bengineerd
Merge remote-tracking branch 'origin/pre-release' into pgp-fc-rec
476a2ee
@cbakalis-slac
update with pgp2fc bittware changes; add align checker python file
3fe71e4
@cbakalis-slac
update sens list
5dc9096
@cbakalis-slac
opt alignChecker locked flag assertion/deassertion
cc5f186
@bengineerd
Linting
5b7f4ef
@bengineerd bengineerd marked this pull request as ready for review February 6, 2024 17:16
@ruck314 ruck314 mentioned this pull request Feb 15, 2024
Merged
@ruck314
Copy link
Contributor

ruck314 commented Feb 15, 2024

Waiting for @bengineerd to fix merge conflicts

@ruck314 ruck314 merged commit 0ea943e into pre-release Feb 15, 2024
3 checks passed
@ruck314 ruck314 deleted the pgp-fc-rec branch February 15, 2024 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruck314 ruck314 ruck314 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bengineerd @ruck314 @cbakalis-slac