Addition of systemC based gpex for systemC based pci devices

CMakeLists.txt

@@ -301,6 +301,68 @@ build_lua()
 
 if (NOT WITHOUT_QEMU)
 
+    # TODO(Jhieb) pull request changes to make sure capabilities are DWORD aligned.
+    CPMAddPackage(
+        NAME pcie_model
+        GIT_REPOSITORY "https://github.com/joshwhieb/pcie-model.git"
+        GIT_TAG "master"
+        GIT_SHALLOW TRUE
+    )
+
+
+    set(LIBPCIE_DIR ${pcie_model_SOURCE_DIR}/libpcie)
+    set(LIBPCIE_C_SOURCES
+        ${LIBPCIE_DIR}/src/pcie/cosim_common.c
+        ${LIBPCIE_DIR}/src/pcie/cosim_socket.c
+        ${LIBPCIE_DIR}/src/pcie/cosim_tlp.c
+        ${LIBPCIE_DIR}/src/pcie/pcie.c
+        ${LIBPCIE_DIR}/src/pcie/pseudocore.c
+        ${LIBPCIE_DIR}/src/pcie/platform.c
+        ${LIBPCIE_DIR}/src/pcie/pcie_cfgspc.c
+        ${LIBPCIE_DIR}/src/pcie/pcie_cfgutil.c
+        ${LIBPCIE_DIR}/src/pcie/pcie_msix.c
+    )
+
+    # C++ sources from the TLM modules
+    set(LIBPCIE_CXX_SOURCES
+        ${pcie_model_SOURCE_DIR}/tlm-modules/pcie-controller.cc
+        ${pcie_model_SOURCE_DIR}/tlm-modules/libpcie-callbacks.cc
+    )
+
+    # Create the static library
+    add_library(libpcie STATIC 
+        ${LIBPCIE_C_SOURCES}
+        ${LIBPCIE_CXX_SOURCES}
+    )
+
+    # Set the output name to libpcie.a (without the extra 'lib' prefix)
+    set_target_properties(libpcie PROPERTIES OUTPUT_NAME pcie)
+
+    # Add compile definitions
+    target_compile_definitions(libpcie PRIVATE
+        __STDC_WANT_LIB_EXT2__=1
+        CONFIG_TLM=1
+    )
+
+    # Set include directories
+    target_include_directories(libpcie PUBLIC
+        ${LIBPCIE_DIR}/src
+        ${pcie_model_SOURCE_DIR}
+        ${systemclanguage_SOURCE_DIR}/src
+    )
+
+    # Set compile options (matching the original Makefile)
+    target_compile_options(libpcie PRIVATE
+        -fPIC
+        $<$<CONFIG:Debug>:-g3 -O0>
+        $<$<CONFIG:Release>:-O2>
+    )
+
+    # Link against SystemC
+    target_link_libraries(libpcie PUBLIC
+        SystemC::systemc
+    )
+
     CPMAddPackage(
         NAME libslirp
         GIT_REPOSITORY https://gitlab.freedesktop.org/slirp/libslirp.git
@@ -436,6 +498,8 @@ target_include_directories(
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/systemc-components/common/include>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}>
     ${LIBELF_INCLUDE_DIR}
+    ${pcie_model_SOURCE_DIR}
+    ${pcie_model_SOURCE_DIR}/libpcie/src
     )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
@@ -446,7 +510,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
         ${CROW_DEP}
         zip
         ${PYBIND11_EMBED}
-        ${CMAKE_DL_LIBS}  
+        ${CMAKE_DL_LIBS}
+        libpcie
 )
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/systemc-components" DESTINATION ${CMAKE_INSTALL_PREFIX})

qemu-components/common/include/libqemu-cxx/libqemu-cxx.h

@@ -318,6 +318,8 @@ class MemoryRegionOps
     struct MemTxAttrs {
         bool secure = false;
         bool debug = false;
+        /* Requester ID (for MSI for example) */
+        unsigned int requester_id:16;
 
         MemTxAttrs() = default;
         MemTxAttrs(const ::MemTxAttrs& qemu_attrs);

qemu-components/common/include/ports/target.h

@@ -14,6 +14,7 @@
 #include "qemu-instance.h"
 #include "tlm-extensions/qemu-cpu-hint.h"
 #include "tlm-extensions/qemu-mr-hint.h"
+#include "tlm-extensions/pcie_extension.h"
 #include <tlm_sockets_buswidth.h>
 
 class TlmTargetToQemuBridge : public tlm::tlm_fw_transport_if<>
@@ -93,6 +94,13 @@ class TlmTargetToQemuBridge : public tlm::tlm_fw_transport_if<>
             return;
         }
 
+        // Extract PCIe extension if present
+        gs::PcieExtension* pcie_ext = nullptr;
+        trans.get_extension(pcie_ext);
+        if (pcie_ext) {
+            attrs.requester_id = pcie_ext->requester_id;
+        }
+
         current_cpu_save = push_current_cpu(trans);
 
         switch (trans.get_command()) {

qemu-components/common/include/tlm-extensions/pcie_extension.h

@@ -0,0 +1,31 @@
+#ifndef _GREENSOCS_PCIE_EXTENSION_H
+#define _GREENSOCS_PCIE_EXTENSION_H
+
+#include <tlm>
+
+namespace gs {
+
+class PcieExtension : public tlm::tlm_extension<PcieExtension>
+{
+public:
+    uint16_t requester_id;
+    uint8_t tag;
+
+    PcieExtension() : requester_id(0), tag(0) {}
+
+    virtual tlm_extension_base* clone() const override {
+        PcieExtension* ext = new PcieExtension();
+        ext->requester_id = this->requester_id;
+        ext->tag = this->tag;
+        return ext;
+    }
+
+    virtual void copy_from(tlm_extension_base const& ext) override {
+        requester_id = static_cast<PcieExtension const&>(ext).requester_id;
+        tag = static_cast<PcieExtension const&>(ext).tag;
+    }
+};
+
+} // namespace gs
+
+#endif

qemu-components/common/src/libqemu-cxx/memory.cc

@@ -301,6 +301,7 @@ AddressSpace::MemTxResult AddressSpace::write(uint64_t addr, const void* data, s
     ::MemTxResult qemu_res;
 
     qemu_attrs.secure = attrs.secure;
+    qemu_attrs.requester_id = attrs.requester_id;
 
     qemu_res = m_int->exports().address_space_write(m_as, addr, qemu_attrs, data, size);
 

qemu-components/nvme/include/nvme.h

@@ -26,11 +26,11 @@ class nvme_disk : public qemu_gpex::Device
     std::string m_drive_id;
 
 public:
-    nvme_disk(const sc_core::sc_module_name& name, sc_core::sc_object* o)
-        : nvme_disk(name, *(dynamic_cast<QemuInstance*>(o)))
+    nvme_disk(const sc_core::sc_module_name& name, sc_core::sc_object* o, sc_core::sc_object* gpex)
+        : nvme_disk(name, *(dynamic_cast<QemuInstance*>(o)), *(dynamic_cast<qemu_gpex*>(gpex)))
     {
     }
-    nvme_disk(const sc_core::sc_module_name& name, QemuInstance& inst)
+    nvme_disk(const sc_core::sc_module_name& name, QemuInstance& inst, qemu_gpex& gpex)
         : qemu_gpex::Device(name, inst, "nvme")
         , p_serial("serial", basename(), "Serial name of the nvme disk")
         , p_blob_file("blob_file", "", "Blob file to load as data storage")
@@ -44,6 +44,7 @@ class nvme_disk : public qemu_gpex::Device
         opts << "if=sd,id=" << m_drive_id << ",file=" << file << ",format=raw";
         m_inst.add_arg("-drive");
         m_inst.add_arg(opts.str().c_str());
+        gpex.add_device(*this);
     }
 
     void before_end_of_elaboration() override

qemu-components/nvme/src/nvme.cc

@@ -8,4 +8,4 @@
 
 #include "nvme.h"
 
-void module_register() { GSC_MODULE_REGISTER_C(nvme_disk, sc_core::sc_object*); }
+void module_register() { GSC_MODULE_REGISTER_C(nvme_disk, sc_core::sc_object*, sc_core::sc_object*); }

systemc-components/CMakeLists.txt

@@ -7,6 +7,7 @@ add_subdirectory(macs)
 add_subdirectory(gs_memory)
 add_subdirectory(memory_dumper)
 add_subdirectory(pass)
+add_subdirectory(pci)
 if((NOT WITHOUT_PYTHON_BINDER) AND (NOT GS_ONLY))
     add_subdirectory(python_binder)
 endif()

systemc-components/pci/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(gs_gpex)
+add_subdirectory(nvme_ssd)

systemc-components/pci/gs_gpex/CMakeLists.txt

@@ -0,0 +1,6 @@
+gs_create_dymod(gs_gpex)
+
+target_include_directories(
+    gs_gpex PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/qemu-components/common/include>
+)