rfnoc: Centralize initialization state of SEPs to epid_allocator

Because the initialization state of SEPs is a graph-wide property,
link_stream_managers and mgmt_portals cannot rely on their private
members to determine if they can reset an SEP. Move the call to
init SEPs into the epid_allocator, and have it call into a
mgmt_portal to gain access to the SEP.

Thus, link_stream_managers only request that an epid_allocator
ensure an SEP is numbered and initialized, and they provide a path
to communicate with the SEP. The epid_allocator will ensure init
only happens once, so a stream currently running on another
link_stream_manager does not get interrupted. This could happen,
for example, if the OSTRM went to one device, and the ISTRM came
from another. In general, EPIDs should only be assigned once.

1 files changed, 14 insertions, 1 deletions

diff --git a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp
index 850cee460..9251634bd 100644
--- a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp
+++ b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp
@@ -8,6 +8,7 @@
 #define INCLUDED_LIBUHD_MGMT_PORTAL_HPP
 
 #include <uhdlib/rfnoc/chdr_ctrl_xport.hpp>
+#include <uhdlib/rfnoc/chdr_packet.hpp>
 #include <uhdlib/rfnoc/chdr_types.hpp>
 #include <memory>
 #include <set>
@@ -55,6 +56,8 @@ public:
 
     //! Initialize a stream endpoint and assign an endpoint ID to it
     //
+    // This should only be called by the epid_allocator
+    //
     // \param xport The host stream endpoint's CTRL transport
     // \param addr The physical address of the stream endpoint
     // \param epid The endpoint ID to assign to this endpoint
@@ -62,11 +65,21 @@ public:
     virtual void initialize_endpoint(
         chdr_ctrl_xport& xport, const sep_addr_t& addr, const sep_id_t& epid) = 0;
 
+    //! Register an already-initialized stream endpoint's endpoint ID
+    //
+    // This should only be called by the epid_allocator
+    //
+    // \param addr The physical address of the stream endpoint
+    // \param epid The endpoint ID to assign to this endpoint
+    //
+    virtual void register_endpoint(
+        const sep_addr_t& addr, const sep_id_t& epid) = 0;
+
     //! Get information about a discovered (reachable) stream endpoint
     //
     // \param epid The endpoint ID of the endpoint to lookup
     //
-    virtual bool is_endpoint_initialized(const sep_id_t& epid) const = 0;
+    virtual bool is_endpoint_registered(const sep_id_t& epid) const = 0;
 
     //! Get information about a discovered (reachable) stream endpoint
     //