Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #98 from apollo-lhc/develop
Browse files Browse the repository at this point in the history 
Merge for tag
  • Loading branch information
@dgastler
dgastler authored Jul 31, 2023
2 parents 84a0b4b + a69d422 commit 868432f
Show file tree
Hide file tree
Showing 57 changed files with 2,264 additions and 2,571 deletions.
12 changes: 10 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,17 @@ endif
#################################################################################
# address tables
#################################################################################
$(BIT_BASE)%.bit $(BIT_BASE)%.svf : ADDRESS_TABLE=${MAKE_PATH}/kernel/address_table_%/address_%.xml
ifneq ("$(wildcard ${BUILD_SCRIPTS_PATH}/mk/addrTable.mk)","")
include ${BUILD_SCRIPTS_PATH}/mk/addrTable.mk
endif


#################################################################################
# Device tree overlays
#################################################################################
DTSI_PATH=${SLAVE_DTSI_PATH}/hw/
-include build-scripts/mk/deviceTreeOverlays.mk

.SECONDARY:

Expand All @@ -79,7 +85,7 @@ clean_bit:
@rm -rf ${MAKE_PATH}/bit/*
clean_kernel:
@echo "Clean hw files"
@rm -f ${MAKE_PATH}/kernel/hw/*
@rm -rf ${MAKE_PATH}/kernel/hw/*
clean_ip_%:
source $(BUILD_VIVADO_SHELL) &&\
cd ${MAKE_PATH}/proj &&\
Expand Down Expand Up @@ -136,6 +142,9 @@ $(BIT_BASE)%.bit : $(ADDRESS_TABLE_CREATION_PATH)config_%.yaml
mkdir -p ${MAKE_PATH}/bit &&\
cd proj &&\
vivado $(VIVADO_FLAGS) -source $(SETUP_BUILD_TCL) -tclargs ${MAKE_PATH} ${BUILD_SCRIPTS_PATH} $(subst .bit,,$(subst ${BIT_BASE},,$@)) $(OUTPUT_MARKUP)
@echo ${MAKE} $(ADDRESS_TABLE_CREATION_PATH)address_tables/address_table_$*/address_apollo.xml
${MAKE} $(ADDRESS_TABLE_CREATION_PATH)address_tables/address_table_$*/address_apollo.xml
$(MAKE) overlays $(OUTPUT_MARKUP)
$(MAKE) NOTIFY_DAN_GOOD

full_%: BUILD_NAME=%
Expand All @@ -145,7 +154,6 @@ full_%: clean clean_bd clean_kernel clean_bit clean_remote clean_CM clean_prebui
$(MAKE) init
$(MAKE) ${BUILD_NAME}
cd kernel && $(MAKE) {BUILD_NAME} && cd ${MAKE_PATH}
cd os && $(MAKE) {BUILD_NAME}.tar.gz && cd ${MAKE_PATH}

init:
git submodule update --init --recursive
Expand Down
8 changes: 2 additions & 6 deletions address_table/modules/CM_7s.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
<node id="CM_1" address="0x00" fwinfo="type=array" module="file://CM_single_7s.xml"/>
<node id="CM_2" address="0x2000" fwinfo="type=array" module="file://CM_single_7s.xml"/>

<node id="PB" address="0x4000">
<node id="MEM" mode="incremental" size="0x800" address="0x0" fwinfo="type=mem18_0x800" />
<node id="RESET" address="0x800" mask="0x00000001" permission="rw"/>
<node id="IRQ_COUNT" address="0x801" mask="0xFFFFFFFF" permission="rw" parameters="default=5000000"/>
</node>
<node id="C2C_RESET" address="0x4810" mask="0x00000001" permission="w"/>
<node id="C2C_RESET" address="0x4810" mask="0x00000001" permission="w"/>
<node id="C2C_REFCLK_FREQ" address="0x4811" mask="0xFFFFFFFF" permission="r" parameters="Table=CLOCKING;Column=FREQ;Row=C2C_REFCLK;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>

</node>

4 changes: 2 additions & 2 deletions address_table/modules/CM_C2C_7s.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<node id="PHY_READ_TIME" address="0x431" mask="0x00FFFFFF" permission="rw" description="Time spent waiting for phylane to stabilize" parameters="default=0x4C4B40"/> <!-- 100ms default -->
<node id="PHY_LANE_STABLE" address="0x432" mask="0x000FFFFF" permission="rw" description="Contious phy_lane_up signals required to lock phylane control" parameters="default=0xFF"/>
<node id="PHY_LANE_ERRORS_TO_RESET" address="0x433" mask="0x000000FF" permission="rw" description="Number of failures before we reset the pma" parameters="default=0xFF"/>
<node id="PHY_MAX_SINGLE_BIT_ERROR_RATE" address="0x434" mask="0xFFFFFFFF" permission="rw" description="Max single bit error rate" parameters="default=0x00FF"/>
<node id="PHY_MAX_MULTI_BIT_ERROR_RATE" address="0x435" mask="0xFFFFFFFF" permission="rw" description="Max multi bit error rate" parameters="default=0x00FF"/>
<node id="PHY_MAX_SOFT_ERROR_RATE" address="0x434" mask="0xFFFFFFFF" permission="rw" description="Max soft error rate" parameters="default=0x00FF"/>
<node id="PHY_MAX_HARD_ERROR_RATE" address="0x435" mask="0xFFFFFFFF" permission="rw" description="Max hard error rate" parameters="default=0x00FF"/>

</node>

7 changes: 2 additions & 5 deletions address_table/modules/CM_C2C_CNT.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<node id="CNT">
<node id="ERRORS_ALL_TIME" address="0x0" permission="r" description="Counter for all errors while locked" parameters="Table=C2C;Column=_2_3;Row=PHY_ERRORS;Status=1;Show=nz;Format=u"/>
<node id="ERRORS_SINCE_LOCKED" address="0x1" permission="r" description="Counter for errors since locked" parameters="Table=C2C;Column=_2_3;Row=PHY_ERRORS_CURRENT;Status=1;Show=nz;Format=u"/>
<node id="CONFIG_ERROR_COUNT" address="0x2" permission="r" description="Counter for CONFIG_ERROR" parameters="Table=C2C;Column=_2_3;Row=CONFIG_ERROR_COUNT;Status=1;Show=nz;Format=u"/>
<node id="LINK_ERROR_COUNT" address="0x3" permission="r" description="Counter for LINK_ERROR" parameters="Table=C2C;Column=_2_3;Row=LINK_ERROR_COUNT;Status=1;Show=nz;Format=u"/>
<node id="MB_ERROR_COUNT" address="0x4" permission="r" description="Counter for MB_ERROR" parameters="Table=C2C;Column=_2_3;Row=MB_ERROR_COUNT;Status=1;Show=nz;Format=u"/>
<node id="PHY_HARD_ERROR_COUNT" address="0x5" permission="r" description="Counter for PHY_HARD_ERROR" parameters="Table=C2C;Column=_2_3;Row=PHY_HARD_ERR_COUNT;Status=1;Show=nz;Format=u"/>
<node id="PHY_SOFT_ERROR_COUNT" address="0x6" permission="r" description="Counter for PHY_SOFT_ERROR" parameters="Table=C2C;Column=_2_3;Row=PHY_SOFT_ERR_COUNT;Status=1;Show=nz;Format=u"/>
<node id="PHYLANE_STATE" address="0x7" permission="r" description="Current state of phy_lane_control module" parameters="Table=C2C;Column=_2_3;Row=PHYLANE_STATE;Status=1;Format=t_0_INIT_1_resetWAIT_2_initWAIT_4_RUNNING" mask="0x7"/>
Expand All @@ -12,8 +9,8 @@
<node id="USER_CLK_FREQ" address="0xA" permission="r" description="Frequency of the user C2C clk" parameters="Table=C2C;Column=_2_3;Row=C2C_FREQ;Status=2;Show=nz;Format=m_1_1_1000000_1_0_1"/>
<node id="XCVR_RESETS" address="0xB" permission="r" description="Count for phylane in error state" parameters="Table=C2C;Column=_2_3;Row=PHY_RESETS;Status=1;Show=nz;Format=u"/>
<node id="WAITING_TIMEOUTS" address="0xC" permission="r" description="Count for phylane in error state" parameters="Table=C2C;Column=_2_3;Row=WAITING_TIMEOUTS;Status=1;Show=nz;Format=u"/>
<node id="SB_ERROR_RATE" address="0xD" permission="r" description="single bit error rate" parameters="Table=C2C;Column=_2_3;Row=SB_ERROR_RATE;Status=1;Show=nz;Format=u"/>
<node id="MB_ERROR_RATE" address="0xE" permission="r" description="multi bit error rate" parameters="Table=C2C;Column=_2_3;Row=MB_ERROR_RATE;Status=1;Show=nz;Format=u"/>
<node id="SOFT_ERROR_RATE" address="0xD" permission="r" description="single bit error rate" parameters="Table=C2C;Column=_2_3;Row=SOFT_ERROR_RATE;Status=1;Show=nz;Format=u"/>
<node id="HARD_ERROR_RATE" address="0xE" permission="r" description="multi bit error rate" parameters="Table=C2C;Column=_2_3;Row=HARD_ERROR_RATE;Status=1;Show=nz;Format=u"/>

</node>

1 change: 1 addition & 0 deletions address_table/modules/CM_C2C_Status.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<node id="PHY_LANE_UP" address="0x0" mask="0x00003000" permission="r" description="Aurora phy lanes up" parameters="Table=C2C;Column=_2_3;Row=PHY_LANE_UP;Status=1"/>
<node id="PHY_HARD_ERR" address="0x0" mask="0x00010000" permission="r" description="Aurora phy hard error" parameters="Table=C2C;Column=_2_3;Row=PHY_HARD_ERR;Status=2;Show=nz"/>
<node id="PHY_SOFT_ERR" address="0x0" mask="0x00020000" permission="r" description="Aurora phy soft error" parameters="Table=C2C;Column=_2_3;Row=PHY_SOFT_ERR;Status=2;Show=nz"/>
<node id="PB_RESET" address="0x0" mask="0x00040000" permission="r" description="Reset of the C2C PHY" />
<node id="LINK_IN_FW" address="0x0" mask="0x80000000" permission="r" description="FW includes this link" parameters="Table=C2C;Column=_2_3;Row=LINK_IN_FW;Status=2;Show=nz;default=0x0"/>
</node>

4 changes: 2 additions & 2 deletions address_table/modules/CM_C2C_USP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<node id="PHY_READ_TIME" address="0x431" mask="0x00FFFFFF" permission="rw" description="Time spent waiting for phylane to stabilize" parameters="default=0x4C4B40"/> <!-- 100ms default -->
<node id="PHY_LANE_STABLE" address="0x432" mask="0x000FFFFF" permission="rw" description="Contious phy_lane_up signals required to lock phylane control" parameters="default=0xFF"/>
<node id="PHY_LANE_ERRORS_TO_RESET" address="0x433" mask="0x000000FF" permission="rw" description="Number of failures before we reset the pma" parameters="default=0xFF"/>
<node id="PHY_MAX_SINGLE_BIT_ERROR_RATE" address="0x434" mask="0xFFFFFFFF" permission="rw" description="Max single bit error rate" parameters="default=0x00FF"/>
<node id="PHY_MAX_MULTI_BIT_ERROR_RATE" address="0x435" mask="0xFFFFFFFF" permission="rw" description="Max multi bit error rate" parameters="default=0x00FF"/>
<node id="PHY_MAX_SOFT_ERROR_RATE" address="0x434" mask="0xFFFFFFFF" permission="rw" description="Max soft error rate" parameters="default=0x00FF"/>
<node id="PHY_MAX_HARD_ERROR_RATE" address="0x435" mask="0xFFFFFFFF" permission="rw" description="Max hard error rate" parameters="default=0x00FF"/>

</node>

Expand Down
5 changes: 5 additions & 0 deletions address_table/modules/CM_PB.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<node id="PB">
<node id="MEM" mode="incremental" size="0x800" address="0x0" fwinfo="type=mem18_0x800" />
<node id="RESET" address="0x800" mask="0x00000001" permission="rw"/>
<node id="IRQ_COUNT" address="0x801" mask="0xFFFFFFFF" permission="rw" parameters="default=5000000"/>
</node>
8 changes: 2 additions & 6 deletions address_table/modules/CM_USP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<node id="CM_1" address="0x0000" fwinfo="type=array" module="file://CM_single_USP.xml"/>
<node id="CM_2" address="0x2000" fwinfo="type=array" module="file://CM_single_USP.xml"/>

<node id="PB" address="0x4000">
<node id="MEM" mode="incremental" size="0x800" address="0x0" fwinfo="type=mem18_0x800" />
<node id="RESET" address="0x800" mask="0x00000001" permission="rw"/>
<node id="IRQ_COUNT" address="0x801" mask="0xFFFFFFFF" permission="rw" parameters="default=5000000"/>
</node>
<node id="C2C_RESET" address="0x4810" mask="0x00000001" permission="w"/>
<node id="C2C_RESET" address="0x4810" mask="0x00000001" permission="w"/>
<node id="C2C_REFCLK_FREQ" address="0x4811" mask="0xFFFFFFFF" permission="r" parameters="Table=CLOCKING;Column=FREQ;Row=C2C_REFCLK;Status=3;Show=nz;Format=m_1_1_1000000_1_0_1"/>
</node>
14 changes: 10 additions & 4 deletions address_table/modules/CM_single_7s.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<node id="CM"> <!-- CTRL 0x0 -> 0x434 mapped to 0x0 -> 0x434 -->
<node id="C2C_1" fwinfo="type=array" address="0x000" module="file://CM_C2C_7s.xml"/>
<node id="CM"> <!-- CTRL 0x0 -> 0x434 mapped to 0x0 -> 0x434 -->
<node id="C2C_1" fwinfo="type=array" address="0x0000" module="file://CM_C2C_7s.xml"/>
<!-- CTRL 0x0 -> 0x434 mapped to 0x800 -> 0xc34 -->
<node id="C2C_2" fwinfo="type=array" address="0x800" module="file://CM_C2C_7s.xml"/>
<node id="C2C_2" fwinfo="type=array" address="0x0800" module="file://CM_C2C_7s.xml"/>
<!-- CTRL 0x0 -> 0x3 mapped to 0xd00 -> 0xd03 -->
<node id="CTRL" address="0x1000" module="file://CM_CTRL.xml"/>
<!-- MONITOR 0x0 -> 0xA mapped to 0xd10 -> 0xd1a -->
<node id="MONITOR" address="0x1070" module="file://CM_Mon.xml"/>


<node id="PB" address="0x1700">
<node id="RESET" address="0x000" mask="0x00000001" permission="rw"/>
<node id="IRQ_COUNT" address="0x001" mask="0xFFFFFFFF" permission="rw" parameters="default=5000000"/>
<node id="MEM" address="0x100" mode="incremental" size="0x800" fwinfo="type=mem18_0x800" />
</node>

</node>
7 changes: 7 additions & 0 deletions address_table/modules/CM_single_USP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,11 @@
<node id="CTRL" address="0x1000" module="file://CM_CTRL.xml"/>
<!-- MONITOR 0x0 -> 0xA mapped to 0xd10 -> 0xd1a -->
<node id="MONITOR" address="0x1070" module="file://CM_Mon.xml"/>

<node id="PB" address="0x1700">
<node id="RESET" address="0x000" mask="0x00000001" permission="rw"/>
<node id="IRQ_COUNT" address="0x001" mask="0xFFFFFFFF" permission="rw" parameters="default=5000000"/>
<node id="MEM" address="0x100" mode="incremental" size="0x800" fwinfo="type=mem18_0x800" />
</node>

</node>
2 changes: 1 addition & 1 deletion address_table/modules/FW_INFO.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<node id="MIN" permission="r" mask="0xFF00"/>
<node id="HOUR" permission="r" mask="0xFF0000"/>
</node>
<node id="FPGA" address="0x12">
<node id="FPGA" address="0x12" mode="incremental" size="0x9" parameters="Format=c;">
<node id="WORD_00" address="0x0" permission="r" mask="0xFFFFFFFF"/>
<node id="WORD_01" address="0x1" permission="r" mask="0xFFFFFFFF"/>
<node id="WORD_02" address="0x2" permission="r" mask="0xFFFFFFFF"/>
Expand Down
26 changes: 13 additions & 13 deletions address_table/modules/MONITOR_USP.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<node id="KINTEX_SYS_MGMT">
<node id="TEMP" address="0x100" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_5093140064_10240000000_0_2802308787_10000000;Status=1"/>
<node id="VCCINT" address="0x101" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=2"/>
<node id="VCCAUX" address="0x102" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=2"/>
<node id="VCCBRAM" address="0x107" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=2"/>
<node id="TEMP_MAX" address="0x120" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_5093140064_10240000000_0_2802308787_10000000;Status=1"/>
<node id="VCCINT_MAX" address="0x121" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCAUX_MAX" address="0x122" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCBRAM_MAX" address="0x123" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="TEMP_MIN" address="0x124" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_5093140064_10240000000_0_2802308787_10000000;Status=1"/>
<node id="VCCINT_MIN" address="0x125" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCAUX_MIN" address="0x126" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCBRAM_MIN" address="0x127" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=KINTEX;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="MONITOR">
<node id="TEMP" address="0x100" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_5093140064_10240000000_0_2802308787_10000000;Status=1"/>
<node id="VCCINT" address="0x101" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=2"/>
<node id="VCCAUX" address="0x102" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=2"/>
<node id="VCCBRAM" address="0x107" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=2"/>
<node id="TEMP_MAX" address="0x120" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_5093140064_10240000000_0_2802308787_10000000;Status=1"/>
<node id="VCCINT_MAX" address="0x121" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCAUX_MAX" address="0x122" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCBRAM_MAX" address="0x123" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="TEMP_MIN" address="0x124" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_5093140064_10240000000_0_2802308787_10000000;Status=1"/>
<node id="VCCINT_MIN" address="0x125" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCAUX_MIN" address="0x126" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
<node id="VCCBRAM_MIN" address="0x127" permission="r" mask="0xFFC0" parameters="Table=STATUS;Row=Zynq;Column=_2;Format=m_1_28023087870_102400000000_1_0_1;Status=3"/>
</node>
Loading

0 comments on commit 868432f

Please sign in to comment.