[cru] Set the system id for the virtual links

Author: kostorr

src/Cru/Constants.h

@@ -279,6 +279,7 @@ static constexpr Register DATALINK_CONTROL(0x00000000);
 // [15 - 0] FEE ID
 // [23 - 16] SYSTEM ID
 static constexpr Register DATALINK_IDS(0x00000004);
+static constexpr Register VIRTUAL_LINKS_IDS(0x00100014);
 /*static constexpr uint32_t GBT_PACKET(0x1); 
 static constexpr uint32_t GBT_STREAMING(0x0);*/
 

src/Cru/CruBar.cxx

@@ -762,6 +762,8 @@ void CruBar::configure(bool force)
     toggleRunStatsLink(mRunStatsEnabled);
   }
 
+  setVirtualLinksIds(mSystemId);
+
   /* UL + CL */
   if (mUserAndCommonLogicEnabled != reportInfo.userAndCommonLogicEnabled || force) {
     log("Toggling User and Common Logic", LogInfoDevel);
@@ -971,6 +973,12 @@ uint16_t CruBar::getCruId()
   return (readRegister(Cru::Registers::BSP_USER_CONTROL.index) >> 16) & 0x0fff;
 }
 
+void CruBar::setVirtualLinksIds(uint16_t systemId)
+{
+  mPdaBar->modifyRegister(Cru::Registers::VIRTUAL_LINKS_IDS.index, 16, 8, systemId);
+  mPdaBar->modifyRegister(Cru::Registers::VIRTUAL_LINKS_IDS.index, 0, 16, 0x0);
+}
+
 void CruBar::emulateCtp(Cru::CtpInfo ctpInfo)
 {
   Ttc ttc = Ttc(mPdaBar, mSerial);

src/Cru/CruBar.h

@@ -128,6 +128,8 @@ class CruBar final : public BarInterfaceBase
   void setCruId(uint16_t cruId);
   uint16_t getCruId();
 
+  void setVirtualLinksIds(uint16_t systemId);
+
   FirmwareFeatures parseFirmwareFeatures();
   FirmwareFeatures mFeatures;
 

src/Cru/cru_constants_populate.py

@@ -107,6 +107,7 @@
 'add_bsp_i2c_si5345_2':'SI5345_2',
 'add_bsp_i2c_si5344':'SI5344',
 'add_pcie_dma_ep_id':'ENDPOINT_ID',
+'add_ro_prot_system_id':'VIRTUAL_LINKS_IDS',
 
 ### SCA ###
 'add_gbt_sc':'SC_BASE_INDEX',

src/Cru/pack_cru_core.vhd

@@ -98,6 +98,7 @@ constant add_ro_prot_check_mask 		: unsigned(31 downto 0):=X"0000_0004"+add_ro_p
 constant add_ro_prot_alloc_fail 		: unsigned(31 downto 0):=X"0000_0008"+add_ro_protocol_base;
 constant add_ro_prot_ttc_linkerr 	        : unsigned(31 downto 0):=X"0000_000C"+add_ro_protocol_base;
 constant add_ro_prot_nack_dly_reg 	        : unsigned(31 downto 0):=X"0000_0010"+add_ro_protocol_base;
+constant add_ro_prot_system_id   	        : unsigned(31 downto 0):=add_ro_protocol_base+X"0000_0014";
 
 -------------------------------------------------------------------------------
 -- GBT address tables
@@ -313,10 +314,10 @@ constant add_serial_flash_wr_data : unsigned(31 downto 0):=X"00B0_0004";
 -------------------------------------------------------------------------------
 -- BSP address tables
 -------------------------------------------------------------------------------
-constant add_bsp_info	          : unsigned(31 downto 0):=add_bsp+X"0000_0000";
-constant add_bsp_hkeeping	      : unsigned(31 downto 0):=add_bsp+X"0001_0000";
-constant add_bsp_rsu     	      : unsigned(31 downto 0):=add_bsp+X"0002_0000";
-constant add_bsp_i2c	          : unsigned(31 downto 0):=add_bsp+X"0003_0000";
+constant add_bsp_info	       : unsigned(31 downto 0):=add_bsp+X"0000_0000";
+constant add_bsp_hkeeping      : unsigned(31 downto 0):=add_bsp+X"0001_0000";
+constant add_bsp_rsu           : unsigned(31 downto 0):=add_bsp+X"0002_0000";
+constant add_bsp_i2c	       : unsigned(31 downto 0):=add_bsp+X"0003_0000";
 
 constant add_bsp_info_dirtystatus  : unsigned(31 downto 0)   :=add_bsp_info+X"0000_0000";
 constant add_bsp_info_shorthash    : unsigned(31 downto 0)   :=add_bsp_info+X"0000_0004";
@@ -431,7 +432,7 @@ component bsp is
     DEBUGCTRL   : out std_logic_vector(31 downto 0);
     ---------------------------------------------------------------------------
     USERCTRL    : out std_logic_vector(31 downto 0);
-    USERTXSEL   : out std_logic_vector(2*g_NUM_GBT_LINKS-1 downto 0);
+    USERTXSEL   : out std_logic_vector(4*g_NUM_GBT_LINKS-1 downto 0);
     ---------------------------------------------------------------------------
     spare_in       : in  std_logic_vector(31 downto 0);  -- general purpose in
     ---------------------------------------------------------------------------