-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
New Bug in UHAL Address Tables? #39
Comments
1698580 is a regression commit 169858013b8195a508a271a803016041321777b1
Author: Evaldas Juska <evka85@gmail.com>
Date: Wed Jun 12 21:27:14 2019 +0200
v3.8.4 Added a possibility to switch to 40MHz promless programming mode; added VFAT-VFAT mixed BC and mixed EC flags in the data format; removed ADC monitoring from the SCA controller
diff --git a/scripts/address_table/gem_amc_top.xml b/scripts/address_table/gem_amc_top.xml
--- a/scripts/address_table/gem_amc_top.xml
+++ b/scripts/address_table/gem_amc_top.xml
@@ -1268,11 +1197,37 @@
<node id="OH" address="0x00400000"
description="Optohybrid Registers"
fw_is_module="true"
fw_is_module_external="true">
<node id="OH${OH_IDX}" address="0x0"
description="Optohybrid ${OH_IDX}"
generate="true" generate_size="12" generate_address_step="0x00010000" generate_idx_var="OH_IDX">
- <!--Insert here the OH FPGA module -->
- <xi:include href="optohybrid_registers.xml"/>
+ <!--TTC module -->
+ <node id="CONTROL" address="0x0000"
+ description="Implements various control and monitoring functions of the Optohybrid">
+
+ <node id="LOOPBACK" address="0x0"
+ description="Loopback Test Register" fw_signal="loopback">
+ <node id="DATA" address="0x0" permission="rw"
+ description="Loopback data"
+ fw_signal="loopback"
+ fw_default="0x01234567"/>
+ </node>
+
+ <node id="RELEASE" address="0x1"
+ description="Optohybrid Status">
+ <node id="YEAR" address="0x1" permission="r"
+ mask="0xffff0000"
+ description="Release year"
+ fw_signal="RELEASE_YEAR"/>
+ <node id="MONTH" address="0x1" permission="r"
+ mask="0x0000ff00"
+ description="Release month"
+ fw_signal="RELEASE_MONTH"/>
+ <node id="DAY" address="0x1" permission="r"
+ mask="0x000000ff"
+ description="Release day"
+ fw_signal="RELEASE_DAY"/>
+ </node>
+ |
Though I know we had discussed previously that this needs to be redone in a much better way, as currently the |
Hi Jared, it seems that I have committed the old-style XML to the repo (without the include) as you pointed out, but I checked the XML files in the release zip file, and they are correct (the ones with xi:include). |
The syntax that the <node id="TOP">
<node id="D1" module="file://mymodule.xml" address="0x00000400" />
<node id="D2" module="file://mymodule.xml" address="0x00000500" />
</node> So my suggestion would be to have the generated <node id="TOP">
...
<node id="OH">
<node id="OHXX" module="file://{GEM_ADDRESS_TABLE_PATH}/optohybrid_registers.xml" address="0xfeedcafe" /> <!-- The first node in this file should be the FPGA node (or maybe 'top') -->
</node> <!-- End of OH block -->
...
</node> |
Thanks, but actually the OHXX node also contains GEB, which is in the CTP7 firmware domain, so I still need to keep the OHXX node with the GEB stuff, and add an OH module inside... If Andrew can remove the FPGA node from his file, then I could have the FPGA node as a module.. Besides that, may I suggest that we just use the module node also in our parser instead of the xi:include? This would make things more consistent, with no find/replace needed, and best of all this would revive the parsing on CTP7 again (currently it's broken since the parser on CTP7 doesn't support the xi:include, so we have to resort to pickles only)! |
Makes sense to me.
I can't comment on the feasibility of this, as I suspect @mexanick would have to adapt the parser he wrote (but using |
New bug as of 3.9.0
Looks like there was an unintended change in the I've attached a diff of the address table for 3.8.6 and 3.9.0 and it seems Bit surprised by this, I was expecting the address space to have moved around not a complete drop in node names. If node names are removed this bricks the SW. |
Hi Brian, sorry I forgot to regenerate the uhal XMLs after some experiments... I've fixed it and re-uploaded the address table zip file (only the uhal XML files are affected, nothing else changed). Sorry for overlooking it and causing trouble... |
Coming back to this, because it's impacting development, we need the This requires a change in the OH xml (more realistically, an additional file to be prepared, as in cms-gem-daq-project/OptoHybridv3#23) |
@evka85 additionally, the |
Seems like there are still a few bugs in the UHAL address table that where not mentioned in issue #37.
@jsturdy points out that:
This was observed in FW release 3.8.3.
Not sure if this was resolved in 3.8.4 as well.
@evka85 ?
The text was updated successfully, but these errors were encountered: