e310: Fix issues in MPM and UHD

- Remove superfluous INFO logging
- Improve formatting in many places
- Improve Pylint score in various places
- Add tear_down to DB object
- Simplify custom EEPROM code for E310
- Fix time source selection code
- Remove references to GPS_CTRL and GPS_STATUS (are E320 only)
- Move clock source control out of MboardRegs object

6 files changed, 162 insertions, 182 deletions

diff --git a/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.cpp b/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.cpp
index b7524e04c..97a90ad5b 100644
--- a/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.cpp
+++ b/host/lib/usrp/dboard/e3xx/e31x_radio_control_impl.cpp
@@ -115,9 +115,7 @@ uint32_t e31x_radio_control_impl::get_rx_switches(
         vctxrx_sw = (fe_chan == 0) ? VCTXRX1_SW_RX: VCTXRX2_SW_RX;
     }
 
-    RFNOC_LOG_INFO("RX freq = " << freq);
     const auto band = e3xx_radio_control_impl::map_freq_to_rx_band(freq);
-    RFNOC_LOG_INFO("RX band = " << int(band));
 
     switch(band) {
     case rx_band::LB_B2:
@@ -161,11 +159,9 @@ uint32_t e31x_radio_control_impl::get_rx_switches(
         UHD_THROW_INVALID_CODE_PATH();
         break;
     }
-    RFNOC_LOG_INFO("RX SW1 = " << rx_sw1);
-    RFNOC_LOG_INFO("RX SWC = " << rx_swc);
-    RFNOC_LOG_INFO("RX SWB = " << rx_swb);
-    RFNOC_LOG_INFO("RX VCRX_SW = " << vcrx_sw);
-    RFNOC_LOG_INFO("RX VCTXRX_SW = " << vctxrx_sw);
+    RFNOC_LOG_TRACE("RX SW1=" << rx_sw1 << " RX SWC=" << rx_swc << " RX SWB=" << rx_swb
+                              << " RX VCRX_SW=" << vcrx_sw
+                              << " RX VCTXRX_SW=" << vctxrx_sw);
 
     auto rx_regs = 0 |
              vcrx_sw << VCRX_SW_SHIFT |
diff --git a/mpm/include/mpm/dboards/e31x_db_manager.hpp b/mpm/include/mpm/dboards/e31x_db_manager.hpp
index 8777778e9..3a91ff90d 100644
--- a/mpm/include/mpm/dboards/e31x_db_manager.hpp
+++ b/mpm/include/mpm/dboards/e31x_db_manager.hpp
@@ -8,25 +8,29 @@
 #pragma once
 
 #include <mpm/ad9361/ad9361_ctrl.hpp>
-#include <mpm/types/lockable.hpp>
 #include <mpm/types/regs_iface.hpp>
-#include <boost/shared_ptr.hpp>
 #include <memory>
 #include <mutex>
 
 namespace mpm { namespace dboards {
-    class e31x_db_manager
-    {
-    public:
-        e31x_db_manager(const std::string &catalina_spidev);
 
-        /*! Return a reference to the radio chip controls
-         */
-        mpm::chips::ad9361_ctrl::sptr get_radio_ctrl(){ return _catalina_ctrl; }
+/*! Container for the E310s AD9361 access
+ */
+class e31x_db_manager
+{
+public:
+    e31x_db_manager(const std::string& catalina_spidev);
+
+    /*! Return a reference to the RFIC controls
+     */
+    mpm::chips::ad9361_ctrl::sptr get_radio_ctrl()
+    {
+        return _catalina_ctrl;
+    }
 
-    private:
-        mpm::chips::ad9361_ctrl::sptr _catalina_ctrl;
-    };
+private:
+    mpm::chips::ad9361_ctrl::sptr _catalina_ctrl;
+};
 
 }}; /* namespace mpm::dboards */
 
diff --git a/mpm/python/usrp_mpm/dboard_manager/e31x_db.py b/mpm/python/usrp_mpm/dboard_manager/e31x_db.py
index add77553f..8c38fa652 100644
--- a/mpm/python/usrp_mpm/dboard_manager/e31x_db.py
+++ b/mpm/python/usrp_mpm/dboard_manager/e31x_db.py
@@ -126,6 +126,18 @@ class E31x_db(DboardManagerBase):
         self.set_catalina_clock_rate(self.master_clock_rate)
         return True
 
+    def tear_down(self):
+        """
+        De-init this object as much as possible.
+        """
+        self.log.trace("Tearing down E310 DB object!")
+        for method in [
+                x for x in dir(self.catalina)
+                if not x.startswith("_") and \
+                        callable(getattr(self.catalina, x))]:
+            delattr(self, method)
+        self.catalina = None
+
     def get_master_clock_rate(self):
         " Return master clock rate (== sampling rate) "
         return self.master_clock_rate
@@ -197,7 +209,7 @@ class E31x_db(DboardManagerBase):
         """
         Async call to catalina set_clock_rate
         """
-        self.log.trace("Setting Clock rate to {}".format(rate))
+        self.log.trace("Setting Clock rate to {} MHz".format(rate/1e6))
         async_exec(lib.ad9361, "set_clock_rate", self.catalina, rate)
         return rate
 
diff --git a/mpm/python/usrp_mpm/e31x_legacy_eeprom.py b/mpm/python/usrp_mpm/e31x_legacy_eeprom.py
index 4c0fb19a5..70e6632ae 100644
--- a/mpm/python/usrp_mpm/e31x_legacy_eeprom.py
+++ b/mpm/python/usrp_mpm/e31x_legacy_eeprom.py
@@ -1,18 +1,17 @@
 #
-# Copyright 2017 Ettus Research, a National Instruments Company
+# Copyright 2019 Ettus Research, a National Instruments Brand
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 """
-EEPROM management code
+E310 EEPROM management code
 """
 
 import struct
-import zlib
 from builtins import zip
 from builtins import object
 
-
+# pylint: disable=too-few-public-methods
 class MboardEEPROM(object):
     """
     Given a nvmem path, read out EEPROM values from the motherboard's EEPROM.
@@ -33,10 +32,17 @@ class MboardEEPROM(object):
     to know the MAC address of an interface, we can fish it out the raw data,
     or ask the system.
     """
-
     # Refer e300_eeprom_manager.hpp.
     eeprom_header_format = "<H H 6s H H 7s 12s 8s"
-    eeprom_header_keys = ('data_version_major', 'data_version_minor', 'mac_address', 'pid', 'rev', 'serial', 'pad', 'user_name')
+    eeprom_header_keys = (
+        'data_version_major',
+        'data_version_minor',
+        'mac_address',
+        'pid',
+        'rev',
+        'serial',
+        'pad',
+        'user_name')
 
 class DboardEEPROM(object):
     """
@@ -52,13 +58,19 @@ class DboardEEPROM(object):
     - 8 bytes serial number (zero-terminated string of 7 characters)
     - 12 bytes padding
     """
-
     # Refer e300_eeprom_manager.hpp.
     eeprom_header_format = "<H H H H 7s 12s"
-    eeprom_header_keys = ('data_version_major', 'data_version_minor', 'pid', 'rev', 'serial', 'pad')
+    eeprom_header_keys = (
+        'data_version_major',
+        'data_version_minor',
+        'pid',
+        'rev',
+        'serial',
+        'pad')
+# pylint: disable=too-few-public-methods
 
 def read_eeprom(
-        isMotherboard,
+        is_motherboard,
         nvmem_path,
         offset,
         eeprom_header_format,
@@ -75,7 +87,6 @@ def read_eeprom(
     eeprom_header_keys -- List of keys for the entries in the EEPROM
     max_size -- Max number of bytes to be read. If omitted, will read the full file.
     """
-
     max_size = max_size or -1
     with open(nvmem_path, "rb") as nvmem_file:
         data = nvmem_file.read(max_size)[offset:]
@@ -83,7 +94,7 @@ def read_eeprom(
     eeprom_keys = eeprom_header_keys
     parsed_data = eeprom_parser.unpack_from(data)
 
-    if isMotherboard: # E310 MB.
+    if is_motherboard: # E310 MB.
         # Rectify the PID and REV parsing. Reverse the bytes.
         # PID and REV are the 4th and 5th elements in the tuple.
         parsed_data_list = list(parsed_data)
@@ -99,5 +110,5 @@ def read_eeprom(
         parsed_data_list[3] = struct.unpack("<H", struct.pack(">H", parsed_data_list[3]))[0]
         parsed_data = tuple(parsed_data_list)
 
-    ret_val = (dict(list(zip(eeprom_keys, parsed_data))),data)
-    return ret_val
\ No newline at end of file
+    ret_val = (dict(list(zip(eeprom_keys, parsed_data))), data)
+    return ret_val
diff --git a/mpm/python/usrp_mpm/periph_manager/e31x.py b/mpm/python/usrp_mpm/periph_manager/e31x.py
index fb0624117..93e404658 100644
--- a/mpm/python/usrp_mpm/periph_manager/e31x.py
+++ b/mpm/python/usrp_mpm/periph_manager/e31x.py
@@ -28,6 +28,7 @@ from usrp_mpm import e31x_legacy_eeprom
 E310_DEFAULT_CLOCK_SOURCE = 'internal'
 E310_DEFAULT_TIME_SOURCE = 'internal'
 E310_DEFAULT_ENABLE_FPGPIO = True
+E310_DEFAULT_DONT_RELOAD_FPGA = False # False means idle image gets reloaded
 E310_FPGA_COMPAT = (5, 0)
 E310_DBOARD_SLOT_IDX = 0
 
@@ -59,6 +60,7 @@ class e31x(ZynqComponents, PeriphManagerBase):
     # 0x77d2 and 0x77d3
     pids = {0x77D2: 'e310_sg1', #sg1
             0x77D3: 'e310_sg3'} #sg3
+    # The E310 has a single EEPROM that stores both DB and MB information
     mboard_eeprom_addr = "e0004000.i2c"
     mboard_eeprom_offset = 0
     mboard_eeprom_max_len = 64
@@ -71,14 +73,13 @@ class e31x(ZynqComponents, PeriphManagerBase):
         'temp_fpga' : 'get_fpga_temp_sensor',
         'temp_mb' : 'get_mb_temp_sensor',
     }
+    # The E310 has a single EEPROM that stores both DB and MB information
     dboard_eeprom_addr = "e0004000.i2c"
-
+    dboard_eeprom_path_index = 0
     # Actual DB EEPROM bytes are just 28. Reading just a couple more.
     # Refer e300_eeprom_manager.hpp
     dboard_eeprom_max_len = 32
-
     max_num_dboards = 1
-
     # We're on a Zynq target, so the following two come from the Zynq standard
     # device tree overlay (tree/arch/arm/boot/dts/zynq-7000.dtsi)
     dboard_spimaster_addrs = ["e0006000.spi"]
@@ -121,15 +122,11 @@ class e31x(ZynqComponents, PeriphManagerBase):
     @staticmethod
     def list_required_dt_overlays(device_info):
         """
-        Lists device tree overlays that need to be applied before this class can
-        be used. List of strings.
-        Are applied in order.
-
-        eeprom_md -- Dictionary of info read out from the mboard EEPROM
-        device_args -- Arbitrary dictionary of info, typically user-defined
+        Returns the name of the overlay for the regular image (not idle).
+        Either returns e310_sg1 or e310_sg3.
         """
         return [device_info['product']]
-
+    ### End of overridables ###################################################
 
     @staticmethod
     def get_idle_dt_overlay(device_info):
@@ -147,8 +144,6 @@ class e31x(ZynqComponents, PeriphManagerBase):
         """
         Does partial initialization which loads low power idle image
         """
-        self._do_not_reload = False
-        self._tear_down = False
         self._clock_source = None
         self._time_source = None
         self.dboards = []
@@ -156,24 +151,42 @@ class e31x(ZynqComponents, PeriphManagerBase):
         self.mboard_regs_control = None
         self._xport_mgrs = {}
         self._initialization_status = ""
-        super(e31x, self).__init__()
-        # Start clean by removing MPM-owned overlays.
-        active_overlays = self.list_active_overlays()
-        mpm_overlays = self.list_owned_overlays()
-        for overlay in active_overlays:
-            if overlay in mpm_overlays:
-                dtoverlay.rm_overlay(overlay)
-        # Apply idle overlay on boot to save power until
-        # an application tries to use the device.
-        self.args_cached = args
-        self.apply_idle_overlay()
         self._device_initialized = False
+        self.args_cached = args
+        # This will load the regular image to obtain all FPGA info
+        super(e31x, self).__init__()
+        args = self._update_default_args(args)
+        # Permanently store the value from mpm.conf:
+        self._do_not_reload_default = \
+            str2bool(args.get("no_reload_fpga", E310_DEFAULT_DONT_RELOAD_FPGA))
+        # This flag can change depending on UHD args:
+        self._do_not_reload = self._do_not_reload_default
+        # If we don't want to reload, we'll complete initialization now:
+        if self._do_not_reload:
+            try:
+                self.log.info("Not reloading FPGA images!")
+                self._init_normal()
+            except BaseException as ex:
+                self.log.error("Failed to initialize motherboard: %s", str(ex))
+                self._initialization_status = str(ex)
+                self._device_initialized = False
+        else: # Otherwise, put the USRP into low-power mode:
+            # Start clean by removing MPM-owned overlays.
+            active_overlays = self.list_active_overlays()
+            mpm_overlays = self.list_owned_overlays()
+            for overlay in active_overlays:
+                if overlay in mpm_overlays:
+                    dtoverlay.rm_overlay(overlay)
+            # Apply idle overlay on boot to save power until
+            # an application tries to use the device.
+            self.apply_idle_overlay()
+            self._device_initialized = False
 
     def _init_normal(self):
         """
         Does full initialization. This gets called during claim(), because the
         E310 usually gets freshly initialized on every UHD session for power
-        usage reasons.
+        usage reasons, unless no_reload_fpga was provided in mpm.conf.
         """
         if self._device_initialized:
             return
@@ -184,9 +197,6 @@ class e31x(ZynqComponents, PeriphManagerBase):
         if not self._device_initialized:
             # Don't try and figure out what's going on. Just give up.
             return
-        # Initialize _do_not_reload with value from _default_args (mpm.conf)
-        self._do_not_reload = str2bool(self._default_args.get("no_reload_fpga", "False"))
-        self._tear_down = False
         self._clock_source = None
         self._time_source = None
         self.dboard = self.dboards[E310_DBOARD_SLOT_IDX]
@@ -213,9 +223,9 @@ class e31x(ZynqComponents, PeriphManagerBase):
         dboard_info = dboard_infos[0]
         # Set up the SPI nodes
         assert len(self.dboard_spimaster_addrs) == 1
-        spi_nodes = [get_spidev_nodes(self.dboard_spimaster_addrs[0])]
-        self.log.trace("Found spidev node: {0}".format(spi_nodes[0]))
+        spi_nodes = get_spidev_nodes(self.dboard_spimaster_addrs[0])
         assert spi_nodes
+        self.log.trace("Found spidev nodes: {0}".format(str(spi_nodes)))
         dboard_info.update({
             'spi_nodes': spi_nodes,
             'default_args': default_args,
@@ -293,72 +303,55 @@ class e31x(ZynqComponents, PeriphManagerBase):
 
         If no EEPROM is defined, returns empty values.
         """
-        if not self.mboard_eeprom_addr:
-            (eeprom_head, eeprom_rawdata) = e31x_legacy_eeprom.read_eeprom(
-                True, # isMotherboard
-                get_eeprom_paths(self.mboard_eeprom_addr)[self.mboard_eeprom_path_index],
-                self.mboard_eeprom_offset,
-                e31x_legacy_eeprom.MboardEEPROM.eeprom_header_format,
-                e31x_legacy_eeprom.MboardEEPROM.eeprom_header_keys,
-                self.mboard_eeprom_max_len
-            )
-            self.log.trace("Found EEPROM metadata: `%s'", str(eeprom_head))
-            self.log.trace("Read %d bytes of EEPROM data.", len(eeprom_rawdata))
-            return eeprom_head, eeprom_rawdata
-        # Nothing defined? Return defaults.
-        self.log.trace("No mboard EEPROM path defined. "
-                       "Skipping mboard EEPROM readout.")
-        return {}, b''
+        eeprom_path = \
+            get_eeprom_paths(self.mboard_eeprom_addr)[self.mboard_eeprom_path_index]
+        if not eeprom_path:
+            self.log.error("Could not identify EEPROM path for %s!",
+                           self.mboard_eeprom_addr)
+            return {}, b''
+        self.log.trace("MB EEPROM: Using path {}".format(eeprom_path))
+        (eeprom_head, eeprom_rawdata) = e31x_legacy_eeprom.read_eeprom(
+            True, # is_motherboard
+            eeprom_path,
+            self.mboard_eeprom_offset,
+            e31x_legacy_eeprom.MboardEEPROM.eeprom_header_format,
+            e31x_legacy_eeprom.MboardEEPROM.eeprom_header_keys,
+            self.mboard_eeprom_max_len
+        )
+        self.log.trace("Read %d bytes of EEPROM data.", len(eeprom_rawdata))
+        return eeprom_head, eeprom_rawdata
 
     def _get_dboard_eeprom_info(self):
         """
         Read back EEPROM info from the daughterboards
         """
-        if self.dboard_eeprom_addr is None:
-            self.log.debug("No dboard EEPROM addresses given.")
-            return []
-        dboard_eeprom_addrs = self.dboard_eeprom_addr \
-                              if isinstance(self.dboard_eeprom_addr, list) \
-                              else [self.dboard_eeprom_addr]
-        dboard_eeprom_paths = []
-        self.log.trace("Identifying dboard EEPROM paths from addrs `{}'..."
-                       .format(",".join(dboard_eeprom_addrs)))
-        for dboard_eeprom_addr in dboard_eeprom_addrs:
-            self.log.trace("Resolving %s...", dboard_eeprom_addr)
-            dboard_eeprom_paths += get_eeprom_paths(dboard_eeprom_addr)
-        self.log.trace("Found dboard EEPROM paths: {}"
-                       .format(",".join(dboard_eeprom_paths)))
-        if len(dboard_eeprom_paths) > self.max_num_dboards:
-            self.log.warning("Found more EEPROM paths than daughterboards. "
-                             "Ignoring some of them.")
-            dboard_eeprom_paths = dboard_eeprom_paths[:self.max_num_dboards]
-        dboard_info = []
-        for dboard_idx, dboard_eeprom_path in enumerate(dboard_eeprom_paths):
-            self.log.debug("Reading EEPROM info for dboard %d...", dboard_idx)
-            dboard_eeprom_md, dboard_eeprom_rawdata = e31x_legacy_eeprom.read_eeprom(
-                False, # is not motherboard.
-                dboard_eeprom_path,
-                self.dboard_eeprom_offset,
-                e31x_legacy_eeprom.DboardEEPROM.eeprom_header_format,
-                e31x_legacy_eeprom.DboardEEPROM.eeprom_header_keys,
-                self.dboard_eeprom_max_len
-            )
-            self.log.trace("Found dboard EEPROM metadata: `{}'"
-                           .format(str(dboard_eeprom_md)))
-            self.log.trace("Read %d bytes of dboard EEPROM data.",
-                           len(dboard_eeprom_rawdata))
-            db_pid = dboard_eeprom_md.get('pid')
-            if db_pid is None:
-                self.log.warning("No dboard PID found in dboard EEPROM!")
-            else:
-                self.log.debug("Found dboard PID in EEPROM: 0x{:04X}"
-                               .format(db_pid))
-            dboard_info.append({
-                'eeprom_md': dboard_eeprom_md,
-                'eeprom_rawdata': dboard_eeprom_rawdata,
-                'pid': db_pid,
-            })
-        return dboard_info
+        assert self.dboard_eeprom_addr
+        self.log.trace("Identifying dboard EEPROM paths from `{}'..."
+                       .format(self.dboard_eeprom_addr))
+        dboard_eeprom_path = \
+            get_eeprom_paths(self.dboard_eeprom_addr)[self.dboard_eeprom_path_index]
+        self.log.trace("Using dboard EEPROM paths: {}".format(dboard_eeprom_path))
+        self.log.debug("Reading EEPROM info for dboard...")
+        dboard_eeprom_md, dboard_eeprom_rawdata = e31x_legacy_eeprom.read_eeprom(
+            False, # is not motherboard.
+            dboard_eeprom_path,
+            self.dboard_eeprom_offset,
+            e31x_legacy_eeprom.DboardEEPROM.eeprom_header_format,
+            e31x_legacy_eeprom.DboardEEPROM.eeprom_header_keys,
+            self.dboard_eeprom_max_len
+        )
+        self.log.trace("Read %d bytes of dboard EEPROM data.",
+                       len(dboard_eeprom_rawdata))
+        db_pid = dboard_eeprom_md.get('pid')
+        if db_pid is None:
+            self.log.warning("No DB PID found in dboard EEPROM!")
+        else:
+            self.log.debug("Found DB PID in EEPROM: 0x{:04X}".format(db_pid))
+        return [{
+            'eeprom_md': dboard_eeprom_md,
+            'eeprom_rawdata': dboard_eeprom_rawdata,
+            'pid': db_pid,
+        }]
 
     ###########################################################################
     # Session init and deinit
@@ -377,8 +370,7 @@ class e31x(ZynqComponents, PeriphManagerBase):
 
     def init(self, args):
         """
-        Calls init() on the parent class, and then programs the Ethernet
-        dispatchers accordingly.
+        Calls init() on the parent class, and updates time/clock source.
         """
         if not self._device_initialized:
             self.log.warning(
@@ -389,7 +381,8 @@ class e31x(ZynqComponents, PeriphManagerBase):
         if args.get("time_source", "") != "":
             self.set_time_source(args.get("time_source"))
         if "no_reload_fpga" in args:
-            self._do_not_reload = str2bool(args.get("no_reload_fpga")) or args.get("no_reload_fpga") == ""
+            self._do_not_reload = \
+                str2bool(args.get("no_reload_fpga")) or args.get("no_reload_fpga") == ""
         result = super(e31x, self).init(args)
         for xport_mgr in itervalues(self._xport_mgrs):
             xport_mgr.init(args)
@@ -434,11 +427,10 @@ class e31x(ZynqComponents, PeriphManagerBase):
         super(e31x, self).deinit()
         for xport_mgr in itervalues(self._xport_mgrs):
             xport_mgr.deinit()
-        self.log.trace("Resetting SID pool...")
         if not self._do_not_reload:
             self.tear_down()
         # Reset back to value from _default_args (mpm.conf)
-        self._do_not_reload = str2bool(self._default_args.get("no_reload_fpga", "False"))
+        self._do_not_reload = self._do_not_reload_default
 
     def tear_down(self):
         """
@@ -447,8 +439,8 @@ class e31x(ZynqComponents, PeriphManagerBase):
         For E310, this means the overlay.
         """
         self.log.trace("Tearing down E310 device...")
-        self._tear_down = True
         self.dboards = []
+        self.dboard.tear_down()
         self.dboard = None
         self.mboard_regs_control = None
         self._device_initialized = False
@@ -459,6 +451,7 @@ class e31x(ZynqComponents, PeriphManagerBase):
         for overlay in active_overlays:
             dtoverlay.rm_overlay(overlay)
         self.apply_idle_overlay()
+        self.log.debug("Teardown complete!")
 
     def is_idle(self):
         """
@@ -487,7 +480,7 @@ class e31x(ZynqComponents, PeriphManagerBase):
         """
         assert xport_type == 'liberio', \
             "Invalid xport_type! Must be 'liberio'"
-        self._xport_mgrs['liberio'].get_chdr_link_options()
+        return self._xport_mgrs['liberio'].get_chdr_link_options()
 
     ###########################################################################
     # Device info
@@ -522,18 +515,12 @@ class e31x(ZynqComponents, PeriphManagerBase):
 
     def set_clock_source(self, *args):
         """
-        Switch reference clock.
-
-        Throws if clock_source is not a valid value.
+        Note: E310 only supports one clock source ('internal'), so no need to do
+        an awful lot here.
         """
         clock_source = args[0]
-        assert clock_source in self.get_clock_sources()
-        self.log.debug("Setting clock source to `{}'".format(clock_source))
-        if clock_source == self.get_clock_source():
-            self.log.trace("Nothing to do -- clock source already set.")
-            return
-        self._clock_source = clock_source
-        self.mboard_regs_control.set_clock_source(clock_source)
+        assert clock_source in self.get_clock_sources(), \
+            "Cannot set to invalid clock source: {}".format(clock_source)
 
     def get_time_sources(self):
         " Returns list of valid time sources "
@@ -545,7 +532,8 @@ class e31x(ZynqComponents, PeriphManagerBase):
 
     def set_time_source(self, time_source):
         " Set a time source "
-        assert time_source in self.get_time_sources()
+        assert time_source in self.get_time_sources(), \
+            "Cannot set to invalid time source: {}".format(time_source)
         if time_source == self.get_time_source():
             self.log.trace("Nothing to do -- time source already set.")
             return
@@ -596,7 +584,8 @@ class e31x(ZynqComponents, PeriphManagerBase):
     ###########################################################################
     def get_ref_lock_sensor(self):
         """
-        #TODO: Where is ref lock signal coming from?
+        Return main refclock lock status. In the FPGA, this is the reflck output
+        of the ppsloop module.
         """
         self.log.trace("Querying ref lock status.")
         lock_status = bool(self.mboard_regs_control.get_refclk_lock())
@@ -676,7 +665,6 @@ class e31x(ZynqComponents, PeriphManagerBase):
         See PeriphManagerBase.set_mb_eeprom() for docs.
         """
         self.log.warn("Called set_mb_eeprom(), but not implemented!")
-        raise NotImplementedError
 
     def get_db_eeprom(self, dboard_idx):
         """
@@ -693,7 +681,6 @@ class e31x(ZynqComponents, PeriphManagerBase):
         See PeriphManagerBase.set_db_eeprom() for docs.
         """
         self.log.warn("Called set_db_eeprom(), but not implemented!")
-        raise NotImplementedError
 
     ###########################################################################
     # Component updating
diff --git a/mpm/python/usrp_mpm/periph_manager/e31x_periphs.py b/mpm/python/usrp_mpm/periph_manager/e31x_periphs.py
index 84c60d2ce..33c90ceb7 100644
--- a/mpm/python/usrp_mpm/periph_manager/e31x_periphs.py
+++ b/mpm/python/usrp_mpm/periph_manager/e31x_periphs.py
@@ -48,26 +48,14 @@ class MboardRegsControl(MboardRegsCommon):
     MB_DBOARD_CTRL      = 0x0040
     MB_DBOARD_STATUS    = 0x0044
 
+    # PPS select values for MB_CLOCK_CTRL (for reading and writing)
+    MB_CLOCK_CTRL_PPS_SEL_GPS = 0
+    # Note: 1 is also valid, but we've always used 2 in SW so let's keep doing that
+    MB_CLOCK_CTRL_PPS_SEL_INT = 2
+    MB_CLOCK_CTRL_PPS_SEL_INT_ALT = 1
+    MB_CLOCK_CTRL_PPS_SEL_EXT = 3
     # Bitfield locations for the MB_CLOCK_CTRL register.
-    MB_CLOCK_CTRL_PPS_SEL_INT = 0
-    MB_CLOCK_CTRL_PPS_SEL_EXT = 1
-    # FIXME: This value is probably wrong
-    MB_CLOCK_CTRL_PPS_SEL_GPS = 2
-    MB_CLOCK_CTRL_REF_CLK_LOCKED = 2
-
-    # Bitfield locations for the MB_GPS_CTRL register.
-    #FIXME: Update for E310
-    MB_GPS_CTRL_PWR_EN = 0
-    MB_GPS_CTRL_RST_N = 1
-    MB_GPS_CTRL_INITSURV_N = 2
-
-    # Bitfield locations for the MB_GPS_STATUS register.
-    #FIXME: Update for E310
-    MB_GPS_STATUS_LOCK = 0
-    MB_GPS_STATUS_ALARM = 1
-    MB_GPS_STATUS_PHASELOCK = 2
-    MB_GPS_STATUS_SURVEY = 3
-    MB_GPS_STATUS_WARMUP = 4
+    MB_CLOCK_CTRL_REF_CLK_LOCKED = 3
 
     # Bitfield locations for the MB_DBOARD_CTRL register.
     MB_DBOARD_CTRL_MIMO = 0
@@ -141,15 +129,6 @@ class MboardRegsControl(MboardRegsCommon):
             self.log.trace("Writing MB_CLOCK_CTRL to 0x{:08X}".format(reg_val))
             self.poke32(self.MB_CLOCK_CTRL, reg_val)
 
-    def set_clock_source(self, clock_source):
-        """
-        Set clock source
-        """
-        if clock_source == 'internal':
-            self.log.trace("Setting clock source to internal")
-        else:
-            assert False, "Cannot set to invalid clock source: {}".format(clock_source)
-
     def get_fpga_type(self):
         """
         Reads the type of the FPGA image currently loaded
@@ -158,15 +137,6 @@ class MboardRegsControl(MboardRegsCommon):
         #TODO: Add SG1 and SG3?
         return ""
 
-    def get_gps_status(self):
-        """
-        Get GPS status
-        """
-        mask = 0x1F
-        with self.regs:
-            gps_status = self.peek32(self.MB_GPS_STATUS) & mask
-        return gps_status
-
     def get_refclk_lock(self):
         """
         Check the status of the reference clock in FPGA.
@@ -224,7 +194,7 @@ class MboardRegsControl(MboardRegsCommon):
 
     def get_ad9361_rx_lo_lock(self):
         """
-        Check the status of RX LO lock from CTRL_OUT pins from Catalina
+        Check the status of RX LO lock from CTRL_OUT pins from the RFIC
         """
         mask = 0b1 << self.MB_DBOARD_STATUS_RX_LOCK
         with self.regs: