mpm: N310 updates FPGA information on init

-Adding MboardRegsControl.get_fpga_type(), which reads the SFP info
registers and determines the FPGA image type (HG, XG, AA, etc). This is
a minor FPGA compat number bump.
-Adding N310._update_fpga_type(), which updates the component
information using the get_fpga_type() function described above. This
information can then be accessed through get_component_info().

3 files changed, 44 insertions, 2 deletions

diff --git a/fpga-src b/fpga-src
-Subproject 09948814069d4695a6d9863dc929b37bb70972a
+Subproject 8570a45339bd35ebb445f7c455f1c80a804f7c0
diff --git a/images/manifest.txt b/images/manifest.txt
index 2fa728a88..8ed7ef6b5 100644
--- a/images/manifest.txt
+++ b/images/manifest.txt
@@ -9,7 +9,7 @@ x3xx_x300_fpga_default          fpga-30cc152        x3xx/fpga-30cc152/x3xx_x300_
 # E-Series
 e3xx_e310_fpga_default          fpga-30cc152        e3xx/fpga-30cc152/e3xx_e310_fpga_default.zip      c2c996190be6c4ada2e176a0e2b647dfe7a56100cc3c140ca5bc702411747530
 # N300-Series
-n3xx_n310_fpga_default          fpga-76daf66        n3xx/fpga-76daf66/n3xx_n310_fpga_default.zip      6d74d9846ec191bb28902be2a21358c6b3190b6b4dd94220e9d8e696fba60e9f
+n3xx_n310_fpga_default          fpga-8570a45        n3xx/fpga-8570a45/n3xx_n310_fpga_default.zip      3e53a28ccf8cf01128e8f05e7741fa68beccd9b7b50abddd6c06a4d7f8bd6fd9
 n3xx_n310_fpga_aurora           fpga-6bea23d        n3xx/fpga-6bea23d/n3xx_n310_fpga_aurora.zip       62a12a2c85526f759c96a1eb7db226e715cdd83b9c277d29f037ae00c72bf7fa
 #n3xx_n310_cpld_default         fpga-6bea23d        n3xx/fpga-6bea23d/n3xx_n310_cpld_default.zip      0
 # N3XX Mykonos firmware
diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py
index d0fb7feee..e51e4228d 100644
--- a/mpm/python/usrp_mpm/periph_manager/n310.py
+++ b/mpm/python/usrp_mpm/periph_manager/n310.py
@@ -33,8 +33,9 @@ N3XX_DEFAULT_CLOCK_SOURCE = 'internal'
 N3XX_DEFAULT_TIME_SOURCE = 'internal'
 N3XX_DEFAULT_ENABLE_GPS = True
 N3XX_DEFAULT_ENABLE_FPGPIO = True
-N3XX_FPGA_COMPAT = (5, 0)
+N3XX_FPGA_COMPAT = (5, 1)
 N3XX_MONITOR_THREAD_INTERVAL = 1.0 # seconds
+N3XX_SFP_TYPES = {0:"", 1:"1G", 2:"10G", 3:"A"}
 
 ###############################################################################
 # Additional peripheral controllers specific to Magnesium
@@ -182,6 +183,8 @@ class MboardRegsControl(object):
     MB_XADC_RB      = 0x001C
     MB_BUS_CLK_RATE = 0x0020
     MB_BUS_COUNTER  = 0x0024
+    MB_SFP0_INFO    = 0x0028
+    MB_SFP1_INFO    = 0x002C
 
     # Bitfield locations for the MB_CLOCK_CTRL register.
     MB_CLOCK_CTRL_PPS_SEL_INT_10 = 0 # pps_sel is one-hot encoded!
@@ -327,6 +330,37 @@ class MboardRegsControl(object):
             self.log.trace("Measurement clock MMCM locked!")
         return locked
 
+    def get_fpga_type(self):
+        """
+        Reads the type of the FPGA image currently loaded
+        Returns a string with the type (ie HG, XG, AA, etc.)
+        """
+        with self.regs.open():
+            sfp0_info_rb = self.peek32(self.MB_SFP0_INFO)
+            sfp1_info_rb = self.peek32(self.MB_SFP1_INFO)
+        # Print the registers values as 32-bit hex values
+        self.log.trace("SFP0 Info: 0x{0:0{1}X}".format(sfp0_info_rb, 8))
+        self.log.trace("SFP1 Info: 0x{0:0{1}X}".format(sfp1_info_rb, 8))
+
+        sfp0_type = N3XX_SFP_TYPES.get((sfp0_info_rb & 0x0000FF00) >> 8, "")
+        sfp1_type = N3XX_SFP_TYPES.get((sfp1_info_rb & 0x0000FF00) >> 8, "")
+        self.log.trace("SFP types: ({}, {})".format(sfp0_type, sfp1_type))
+        if (sfp0_type == "") or (sfp1_type == ""):
+            return ""
+        elif (sfp0_type == "1G") and (sfp1_type == "10G"):
+            return "HG"
+        elif (sfp0_type == "10G") and (sfp1_type == "10G"):
+            return "XG"
+        elif (sfp0_type == "10G") and (sfp1_type == "A"):
+            return "XA"
+        elif (sfp0_type == "A") and (sfp1_type == "A"):
+            return "AA"
+        else:
+            self.log.warning("Unrecognized SFP type combination: ({}, {})".format(
+                sfp0_type, sfp1_type
+            ))
+            return ""
+
 
 ###############################################################################
 # Transport managers
@@ -564,6 +598,7 @@ class n310(PeriphManagerBase):
         self.mboard_regs_control.get_git_hash()
         self.mboard_regs_control.get_build_timestamp()
         self._check_fpga_compat()
+        self._update_fpga_type()
         # Init clocking
         self.enable_ref_clock(enable=True)
         self._ext_clock_freq = None
@@ -1113,6 +1148,13 @@ class n310(PeriphManagerBase):
         return True
 
     @no_rpc
+    def _update_fpga_type(self):
+        """Update the fpga type stored in the updateable components"""
+        fpga_type = self.mboard_regs_control.get_fpga_type()
+        self.log.debug("Updating mboard FPGA type info to {}".format(fpga_type))
+        self.updateable_components['fpga']['type'] = fpga_type
+
+    @no_rpc
     def update_dts(self, filepath, metadata):
         """
         Update the DTS image in the filesystem