Skip to content

SURF v1.7.0

Compare
Choose a tag to compare
@bengineerd bengineerd released this 14 Mar 19:59
5fe843f

Pull Requests

  1. #178 - ESROGUE-153 - AxiStreamPacketizerV2 enhancements
  2. #147 - Remove AXI_ERROR_RESP_G
  3. #188 - Pyrogue Device fixes for Ad5780 and Ltc2270
  4. #186 - ESLCOMMON-205 - Set proper header on Pgp3 opcode transmission

Pull Request Details

ESROGUE-153 - AxiStreamPacketizerV2 enhancements

Author: Benjamin Reese [email protected]
Date: Tue Mar 13 17:04:04 2018 -0700
Pull: #178 (834 additions, 471 deletions, 12 files changed)
Branch: slaclab/ESROGUE-153
Jira: https://jira.slac.stanford.edu/issues/ESROGUE-153

Notes:

Lots of changes to AxiStreamPacketizerV2 and modules that use it

AxiStreamPacketizerV2/AxiStreamDepacketizerV2

  • Fixed some TKEEP bugs in the Packetizer
  • Packetizer/Depacketizer now have generics to optionally include the header and tail in the CRC calculation.
  • The Packetizer protocol has changed so that the CRC is cumulative over every packet of a frame.

RSSI

  • Enable CRC by default when interleaving

PGP3

  • The change to cumulative CRC is carried into the PGP3 protocol
  • This means that PGP3 instances built previously will not be compatible with this!

Remove AXI_ERROR_RESP_G

Author: Benjamin Reese [email protected]
Date: Wed Mar 14 09:28:50 2018 -0700
Pull: #147 (368 additions, 801 deletions, 152 files changed)
Branch: slaclab/rem-axi-err-resp

Notes:

I've gone through every module in SURF and removed the AXI_ERROR_RESP_G generic.

AxiLiteCrossbar and AxiLiteAsync still have it. If you need to mask AXI errors, you should do it at the top-most crossbar or synchronizer, where you connect to the bus that cannot tolerate errors.

AxiLiteEmpty also still has it, as you may want a particular instance to respond with OK to every access.

I also left it in AxiStreamDmaV2, because the generic is passed down to a crossbar which may be the top level. If this is not the case then we should remove it here too

This will obviously break some builds, but the fix is pretty easy. Just remove the generic association from the instantiation.


Pyrogue Device fixes for Ad5780 and Ltc2270

Author: Larry Ruckman [email protected]
Date: Wed Mar 14 09:57:55 2018 -0700
Pull: #188 (8 additions, 4 deletions, 2 files changed)
Branch: slaclab/lcls2-prl-dev

Notes:

Ad5780 - Fixed Variable/method name conflict
Ltc2779 - Properly name array Variables


ESLCOMMON-205 - Set proper header on Pgp3 opcode transmission

Author: Benjamin Reese [email protected]
Date: Mon Mar 12 12:18:51 2018 -0700
Pull: #186 (1 additions, 0 deletions, 1 files changed)
Branch: slaclab/ESLCOMMON-205
Jira: https://jira.slac.stanford.edu/issues/ESLCOMMON-205

Notes:

The header field wasn't being set to PGP3_K_HEADER_C ("10") when sending OpCodes. This has been fixed.

https://jira.slac.stanford.edu/browse/ESLCOMMON-205