rfnoc: Add mb_controller base class and X300/MPMD implementations

8 files changed, 246 insertions, 0 deletions

diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
index 7197bc9c4..1c2997f80 100644
--- a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
@@ -9,6 +9,7 @@
 
 #include <uhd/device.hpp>
 #include <uhd/exception.hpp>
+#include <uhd/rfnoc/mb_controller.hpp>
 #include <uhdlib/rfnoc/client_zero.hpp>
 #include <uhdlib/rfnoc/mb_iface.hpp>
 #include <boost/shared_ptr.hpp>
@@ -41,6 +42,12 @@ public:
         return *_iface_registry.at(mb_idx);
     }
 
+    //! Return a reference to an MB controller
+    mb_controller::sptr get_mb_controller(const size_t mb_idx) const
+    {
+        return _mbc_registry.at(mb_idx);
+    }
+
     /*! Return the number of motherboards in this device
      */
     size_t get_num_mbs()
@@ -73,8 +80,14 @@ protected:
         _iface_registry.emplace(mb_idx, std::move(mb_if));
     }
 
+    void register_mb_controller(const size_t mb_idx, mb_controller::sptr mbc)
+    {
+        _mbc_registry.emplace(mb_idx, mbc);
+    }
+
 private:
     std::unordered_map<size_t, mb_iface::uptr> _iface_registry;
+    std::unordered_map<size_t, mb_controller::sptr> _mbc_registry;
 }; // class rfnoc_device
 
 }}} // namespace uhd::rfnoc::detail
diff --git a/host/lib/rfnoc/rfnoc_graph.cpp b/host/lib/rfnoc/rfnoc_graph.cpp
index 01f669c62..201920366 100644
--- a/host/lib/rfnoc/rfnoc_graph.cpp
+++ b/host/lib/rfnoc/rfnoc_graph.cpp
@@ -140,6 +140,11 @@ private:
             throw uhd::key_error(std::string("Found no RFNoC devices for ----->\n")
                                  + dev_addr.to_pp_string());
         }
+        _tree = _device->get_tree();
+        _num_mboards = _tree->list("/mboards").size();
+        for (size_t i = 0; i < _num_mboards; ++i) {
+            _mb_controllers.emplace(i, _device->get_mb_controller(i));
+        }
 
         // Create a graph stream manager
         // FIXME get these from mb_iface or something
diff --git a/host/lib/usrp/mpmd/CMakeLists.txt b/host/lib/usrp/mpmd/CMakeLists.txt
index 221329c63..21511e6da 100644
--- a/host/lib/usrp/mpmd/CMakeLists.txt
+++ b/host/lib/usrp/mpmd/CMakeLists.txt
@@ -20,6 +20,7 @@ if(ENABLE_MPMD)
         ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_image_loader.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_impl.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_mboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_mb_controller.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_prop_tree.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_xport.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/mpmd_xport_mgr.cpp
diff --git a/host/lib/usrp/mpmd/mpmd_mb_controller.cpp b/host/lib/usrp/mpmd/mpmd_mb_controller.cpp
new file mode 100644
index 000000000..6c2954fb8
--- /dev/null
+++ b/host/lib/usrp/mpmd/mpmd_mb_controller.cpp
@@ -0,0 +1,36 @@
+//
+// Copyright 2019 Ettus Research, a National Instruments Brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#include "mpmd_mb_controller.hpp"
+
+using namespace uhd::rfnoc;
+
+
+uint64_t mpmd_mb_controller::mpmd_timekeeper::get_ticks_now()
+{
+    return _rpc->request_with_token<uint64_t>("get_timekeeper_time", _tk_idx, false);
+}
+
+uint64_t mpmd_mb_controller::mpmd_timekeeper::get_ticks_last_pps()
+{
+    return _rpc->request_with_token<uint64_t>("get_timekeeper_time", _tk_idx, true);
+}
+
+void mpmd_mb_controller::mpmd_timekeeper::set_ticks_now(const uint64_t ticks)
+{
+    _rpc->notify_with_token("set_timekeeper_time", _tk_idx, ticks, false);
+}
+
+void mpmd_mb_controller::mpmd_timekeeper::set_ticks_next_pps(const uint64_t ticks)
+{
+    _rpc->notify_with_token("set_timekeeper_time", _tk_idx, ticks, true);
+}
+
+void mpmd_mb_controller::mpmd_timekeeper::set_period(const uint64_t period_ns)
+{
+    _rpc->notify_with_token("set_tick_period", _tk_idx, period_ns);
+}
+
diff --git a/host/lib/usrp/mpmd/mpmd_mb_controller.hpp b/host/lib/usrp/mpmd/mpmd_mb_controller.hpp
new file mode 100644
index 000000000..65e5dc468
--- /dev/null
+++ b/host/lib/usrp/mpmd/mpmd_mb_controller.hpp
@@ -0,0 +1,73 @@
+//
+// Copyright 2019 Ettus Research, a National Instruments Brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#ifndef INCLUDED_LIBUHD_MPMD_MB_CONTROLLER_HPP
+#define INCLUDED_LIBUHD_MPMD_MB_CONTROLLER_HPP
+
+#include <uhd/rfnoc/mb_controller.hpp>
+#include <uhdlib/utils/rpc.hpp>
+
+namespace uhd { namespace rfnoc {
+
+/*! X300-Specific version of the mb_controller
+ *
+ * Reminder: There is one of these per motherboard.
+ */
+class mpmd_mb_controller : public mb_controller
+{
+public:
+
+
+    //! Return reference to the RPC client
+    uhd::rpc_client::sptr get_rpc_client() { return _rpc; }
+
+    //! X300-specific version of the timekeeper controls
+    class mpmd_timekeeper : public mb_controller::timekeeper
+    {
+    public:
+        mpmd_timekeeper(const size_t tk_idx, uhd::rpc_client::sptr rpc_client)
+            : _tk_idx(tk_idx), _rpc(rpc_client)
+        {
+            // nop
+        }
+
+        uint64_t get_ticks_now();
+
+        uint64_t get_ticks_last_pps();
+
+        void set_ticks_now(const uint64_t ticks);
+
+        void set_ticks_next_pps(const uint64_t ticks);
+
+        void set_period(const uint64_t period_ns);
+
+    private:
+        /*! Shorthand to perform an RPC request. Saves some typing.
+         */
+        template <typename return_type, typename... Args>
+        return_type request(std::string const& func_name, Args&&... args)
+        {
+            UHD_LOG_TRACE("X300MBCTRL", "[RPC] Calling " << func_name);
+            return _rpc->request_with_token<return_type>(
+                func_name, std::forward<Args>(args)...);
+        };
+
+        const size_t _tk_idx;
+
+        uhd::rpc_client::sptr _rpc;
+    };
+
+private:
+    /**************************************************************************
+     * Attributes
+     *************************************************************************/
+    //! Reference to RPC interface
+    uhd::rpc_client::sptr _rpc;
+};
+
+}} // namespace uhd::rfnoc
+
+#endif /* INCLUDED_LIBUHD_MPMD_MB_CONTROLLER_HPP */
diff --git a/host/lib/usrp/x300/CMakeLists.txt b/host/lib/usrp/x300/CMakeLists.txt
index 062db3f16..a19a6a4e8 100644
--- a/host/lib/usrp/x300/CMakeLists.txt
+++ b/host/lib/usrp/x300/CMakeLists.txt
@@ -27,6 +27,7 @@ if(ENABLE_X300)
         ${CMAKE_CURRENT_SOURCE_DIR}/x300_dboard_iface.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/x300_clock_ctrl.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/x300_image_loader.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/x300_mb_controller.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/x300_mb_eeprom_iface.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/x300_mb_eeprom.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/x300_mboard_type.hpp
diff --git a/host/lib/usrp/x300/x300_mb_controller.cpp b/host/lib/usrp/x300/x300_mb_controller.cpp
new file mode 100644
index 000000000..9762f486d
--- /dev/null
+++ b/host/lib/usrp/x300/x300_mb_controller.cpp
@@ -0,0 +1,38 @@
+//
+// Copyright 2019 Ettus Research, a National Instruments Brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#include "x300_mb_controller.hpp"
+
+using namespace uhd::rfnoc;
+
+
+uint64_t x300_mb_controller::x300_timekeeper::get_ticks_now()
+{
+    // tbw
+    return 0;
+}
+
+uint64_t x300_mb_controller::x300_timekeeper::get_ticks_last_pps()
+{
+    // tbw
+    return 0;
+}
+
+void x300_mb_controller::x300_timekeeper::set_ticks_now(const uint64_t ticks)
+{
+    // tbw
+}
+
+void x300_mb_controller::x300_timekeeper::set_ticks_next_pps(const uint64_t ticks)
+{
+    // tbw
+}
+
+void x300_mb_controller::x300_timekeeper::set_period(const uint64_t period_ns)
+{
+    // tbw
+}
+
diff --git a/host/lib/usrp/x300/x300_mb_controller.hpp b/host/lib/usrp/x300/x300_mb_controller.hpp
new file mode 100644
index 000000000..9a220ab00
--- /dev/null
+++ b/host/lib/usrp/x300/x300_mb_controller.hpp
@@ -0,0 +1,79 @@
+//
+// Copyright 2019 Ettus Research, a National Instruments Brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#ifndef INCLUDED_LIBUHD_X300_MB_CONTROLLER_HPP
+#define INCLUDED_LIBUHD_X300_MB_CONTROLLER_HPP
+
+#include "x300_clock_ctrl.hpp"
+#include <uhd/rfnoc/mb_controller.hpp>
+#include <uhd/types/wb_iface.hpp>
+
+namespace uhd { namespace rfnoc {
+
+/*! X300-Specific version of the mb_controller
+ *
+ * Reminder: There is one of these per motherboard.
+ */
+class x300_mb_controller : public mb_controller
+{
+public:
+    x300_mb_controller(uhd::i2c_iface::sptr zpu_i2c,
+        uhd::wb_iface::sptr zpu_ctrl,
+        x300_clock_ctrl::sptr clock_ctrl)
+        : _zpu_i2c(zpu_i2c), _zpu_ctrl(zpu_ctrl), _clock_ctrl(clock_ctrl)
+    {
+        // nop
+    }
+
+    //! Return reference to the ZPU-owned I2C controller
+    uhd::i2c_iface::sptr get_zpu_i2c()
+    {
+        return _zpu_i2c;
+    }
+
+    //! Reference to the ZPU peek/poke interface
+    uhd::wb_iface::sptr get_zpu_ctrl() { return _zpu_ctrl; }
+
+    //! Return reference to LMK clock controller
+    x300_clock_ctrl::sptr get_clock_ctrl() { return _clock_ctrl; }
+
+    //! X300-specific version of the timekeeper controls
+    class x300_timekeeper : public mb_controller::timekeeper
+    {
+    public:
+        x300_timekeeper(uhd::wb_iface::sptr zpu_ctrl) : _zpu_ctrl(zpu_ctrl) {}
+
+        uint64_t get_ticks_now();
+
+        uint64_t get_ticks_last_pps();
+
+        void set_ticks_now(const uint64_t ticks);
+
+        void set_ticks_next_pps(const uint64_t ticks);
+
+        void set_period(const uint64_t period_ns);
+
+    private:
+        uhd::wb_iface::sptr _zpu_ctrl;
+    };
+
+private:
+    /**************************************************************************
+     * Attributes
+     *************************************************************************/
+    //! Reference to the ZPU-owned I2C controller
+    uhd::i2c_iface::sptr _zpu_i2c;
+
+    //! Reference to the ZPU peek/poke interface
+    uhd::wb_iface::sptr _zpu_ctrl;
+
+    //! Reference to LMK clock controller
+    x300_clock_ctrl::sptr _clock_ctrl;
+};
+
+}} // namespace uhd::rfnoc
+
+#endif /* INCLUDED_LIBUHD_X300_MB_CONTROLLER_HPP */