Move to libpldm APIs for Allocating Instance IDs and change Transport APIs

include/pldm_fw.hpp

@@ -2,6 +2,7 @@
 
 #include <libpldm/instance-id.h>
 #include <libpldm/transport.h>
+#include <libpldm/transport/af-mctp.h>
 #include <libpldm/transport/mctp-demux.h>
 #include <stdint.h>
 
@@ -71,7 +72,13 @@ class PldmFramework
     /** pldm transport instance  */
     pldm_transport* pldmTransport = nullptr;
 
-    pldm_transport_mctp_demux* mctpDemux = nullptr;
+    union TransportImpl
+    {
+        pldm_transport_mctp_demux* mctpDemux;
+        pldm_transport_af_mctp* afMctp;
+    };
+
+    TransportImpl impl;
 
     // Constants required for PLDM packet.
     static constexpr auto phypTerminusID = (types::Byte)208;
@@ -135,6 +142,11 @@ class PldmFramework
      */
     int openMctpDemuxTransport();
 
+    /** @brief Opens the MCTP AF_MCTP for sending and receiving messages.
+     *
+     */
+    int openAfMctpTransport();
+
     /** @brief Close the PLDM file */
     void pldmClose();
 

meson.build

@@ -34,6 +34,12 @@ systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
 
 service_file = 'service_files/com.ibm.panel.service'
 
+if(get_option('transport-implementation')) == 'mctp-demux'
+   add_project_arguments('-DPLDM_TRANSPORT_WITH_MCTP_DEMUX', language : 'cpp')
+else
+   add_project_arguments('-DPLDM_TRANSPORT_WITH_AF_MCTP', language: 'cpp')
+endif
+
 if cxx.has_header('poll.h')
   add_project_arguments('-DPLDM_HAS_POLL=1', language: 'cpp')
 endif

meson_options.txt

@@ -1,2 +1,8 @@
 option('tests', type: 'feature', value: 'enabled', description: 'Build tests.',)
 option('system-vpd-dependency', type: 'feature', description: 'Enable/disable system vpd dependency.', value: 'disabled')
+option(
+    'transport-implementation',
+    type: 'combo',
+    choices: ['mctp-demux', 'af-mctp'],
+    description: 'transport via af-mctp or mctp-demux'
+)

src/pldm_fw.cpp

@@ -60,7 +60,16 @@ int PldmFramework::openPldm()
         return fd;
     }
 
+#if defined(PLDM_TRANSPORT_WITH_MCTP_DEMUX)
     fd = openMctpDemuxTransport();
+#elif defined(PLDM_TRANSPORT_WITH_AF_MCTP)
+    fd = openAfMctpTransport();
+#else
+    std::cerr << "open: No valid transport defined!" << std::endl;
+    throw FunctionFailure("Required host dump action via PLDM is not allowed: "
+                          "No valid transport defined!");
+#endif
+
     if (fd < 0)
     {
         auto e = errno;
@@ -72,9 +81,10 @@ int PldmFramework::openPldm()
     return fd;
 }
 
-int PldmFramework::openMctpDemuxTransport()
+[[maybe_unused]] int PldmFramework::openMctpDemuxTransport()
 {
-    int rc = pldm_transport_mctp_demux_init(&mctpDemux);
+    impl.mctpDemux = nullptr;
+    int rc = pldm_transport_mctp_demux_init(&impl.mctpDemux);
     if (rc)
     {
         std::cerr << "openMctpDemuxTransport: Failed to init MCTP demux "
@@ -83,7 +93,7 @@ int PldmFramework::openMctpDemuxTransport()
         throw FunctionFailure("Failed to init MCTP demux transport");
     }
 
-    rc = pldm_transport_mctp_demux_map_tid(mctpDemux, tid, tid);
+    rc = pldm_transport_mctp_demux_map_tid(impl.mctpDemux, tid, tid);
     if (rc)
     {
         std::cerr << "openMctpDemuxTransport: Failed to setup tid to eid "
@@ -92,7 +102,7 @@ int PldmFramework::openMctpDemuxTransport()
         pldmClose();
         throw FunctionFailure("Failed to setup tid to eid mapping");
     }
-    pldmTransport = pldm_transport_mctp_demux_core(mctpDemux);
+    pldmTransport = pldm_transport_mctp_demux_core(impl.mctpDemux);
 
     struct pollfd pollfd;
     rc = pldm_transport_mctp_demux_init_pollfd(pldmTransport, &pollfd);
@@ -106,10 +116,50 @@ int PldmFramework::openMctpDemuxTransport()
     return pollfd.fd;
 }
 
+[[maybe_unused]] int PldmFramework::openAfMctpTransport()
+{
+    impl.afMctp = nullptr;
+    int rc = pldm_transport_af_mctp_init(&impl.afMctp);
+    if (rc)
+    {
+        std::cerr
+            << "openAfMctpTransport: Failed to init AF MCTP transport. rc = "
+            << rc << std::endl;
+        throw FunctionFailure("Failed to init AF MCTP transport");
+    }
+
+    rc = pldm_transport_af_mctp_map_tid(impl.afMctp, tid, tid);
+    if (rc)
+    {
+        std::cerr
+            << "openAfMctpTransport: Failed to setup tid to eid mapping. rc = "
+            << rc << std::endl;
+        pldmClose();
+        throw FunctionFailure("Failed to setup tid to eid mapping");
+    }
+    pldmTransport = pldm_transport_af_mctp_core(impl.afMctp);
+
+    struct pollfd pollfd;
+    rc = pldm_transport_af_mctp_init_pollfd(pldmTransport, &pollfd);
+    if (rc)
+    {
+        std::cerr << "openAfMctpTransport: Failed to get pollfd. rc = " << rc
+                  << std::endl;
+        pldmClose();
+        throw FunctionFailure("Failed to get pollfd");
+    }
+    return pollfd.fd;
+}
+
 void PldmFramework::pldmClose()
 {
-    pldm_transport_mctp_demux_destroy(mctpDemux);
-    mctpDemux = nullptr;
+#if defined(PLDM_TRANSPORT_WITH_MCTP_DEMUX)
+    pldm_transport_mctp_demux_destroy(impl.mctpDemux);
+    impl.mctpDemux = nullptr;
+#elif defined(PLDM_TRANSPORT_WITH_AF_MCTP)
+    pldm_transport_af_mctp_destroy(impl.afMctp);
+    impl.afMctp = nullptr;
+#endif
     pldmTransport = nullptr;
 }