library-manager: make disabling INTEL_MODULES possible

IADK is rarely needed, but when enabled it adds C++ objects to the
build, while otherwise builds are pure C. Disabling INTEL_MODULES
however is currently broken. Fix it to make modular builds without
IADK support possible.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/audio/module_adapter/CMakeLists.txt

@@ -25,17 +25,20 @@ if(zephyr) ###  Zephyr ###
 		zephyr_library_import(xa_mp3_enc ${CONFIG_CADENCE_CODEC_MP3_ENC_LIB})
 	endif()
 
-	zephyr_include_directories_ifdef(CONFIG_INTEL_MODULES
+	zephyr_include_directories_ifdef(CONFIG_LIBRARY_MANAGER
 		${SOF_SRC_PATH}/include/sof/audio/module_adapter/iadk/
 		${SOF_SRC_PATH}/include/sof/audio/module_adapter/library/
 	)
 
+	zephyr_library_sources_ifdef(CONFIG_LIBRARY_MANAGER
+		library/native_system_agent.c
+	)
+
 	zephyr_library_sources_ifdef(CONFIG_INTEL_MODULES
 		module/modules.c
 		iadk/module_initial_settings_concrete.cpp
 		iadk/iadk_module_adapter.cpp
 		iadk/system_agent.cpp
-		library/native_system_agent.c
 		library/native_system_service.c
 	)
 

src/include/sof/audio/module_adapter/library/native_system_service.h

@@ -7,7 +7,6 @@
 #define NATIVE_SYSTEM_SERVICE_H
 
 #include <stdint.h>
-#include <adsp_stddef.h>
 
 #ifdef __cplusplus
 extern "C" {

src/library_manager/lib_manager.c

@@ -485,7 +485,6 @@ const struct sof_man_module *lib_manager_get_module_manifest(const uint32_t modu
 					       SOF_MAN_MODULE_OFFSET(entry_index));
 }
 
-#if CONFIG_INTEL_MODULES
 /*
  * \brief Load module code, allocate its instance and create a module adapter component.
  * \param[in] drv - component driver pointer.
@@ -584,7 +583,18 @@ static void lib_manager_prepare_module_adapter(struct comp_driver *drv, const st
 	drv->ops.dai_ts_start = module_adapter_ts_start_op;
 	drv->ops.dai_ts_stop = module_adapter_ts_stop_op;
 	drv->ops.dai_ts_get = module_adapter_ts_get_op;
+#if CONFIG_INTEL_MODULES
 	drv->adapter_ops = &processing_module_adapter_interface;
+#endif
+}
+
+static const struct sof_module_api_build_info *lib_manager_get_build_info(
+							const struct sof_man_fw_desc *desc,
+							const struct sof_man_module *mod)
+{
+	return (const struct sof_module_api_build_info *)((const uint8_t *)desc -
+					SOF_MAN_ELF_TEXT_OFFSET +
+					mod->segment[SOF_MAN_SEGMENT_TEXT].file_offset);
 }
 
 int lib_manager_register_module(const uint32_t component_id)
@@ -638,9 +648,7 @@ int lib_manager_register_module(const uint32_t component_id)
 	 * llext modules store build info structure in separate section which is not accessible now.
 	 */
 	if (!module_is_llext(mod)) {
-		build_info = (const struct sof_module_api_build_info *)((const char *)desc -
-			     SOF_MAN_ELF_TEXT_OFFSET +
-			     mod->segment[SOF_MAN_SEGMENT_TEXT].file_offset);
+		build_info = lib_manager_get_build_info(desc, mod);
 
 		tr_info(&lib_manager_tr, "Module API version: %u.%u.%u, format: 0x%x",
 			build_info->api_version_number.fields.major,
@@ -679,14 +687,6 @@ int lib_manager_register_module(const uint32_t component_id)
 	return ret;
 }
 
-#else /* CONFIG_INTEL_MODULES */
-int lib_manager_register_module(const uint32_t component_id)
-{
-	tr_err(&lib_manager_tr, "Dynamic module loading is not supported");
-	return -ENOTSUP;
-}
-#endif /* CONFIG_INTEL_MODULES */
-
 static int lib_manager_dma_buffer_alloc(struct lib_manager_dma_ext *dma_ext,
 					uint32_t size)
 {
@@ -831,6 +831,7 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
 	void __sparse_cache *library_base_address;
 	const struct sof_man_fw_desc *man_desc = (struct sof_man_fw_desc *)
 		((__sparse_force uint8_t *)man_buffer + SOF_MAN_ELF_TEXT_OFFSET);
+	const struct sof_man_module *mod = (const struct sof_man_module *)(man_desc + 1);
 	uint32_t preload_size = man_desc->header.preload_page_count * PAGE_SZ;
 	int ret;
 
@@ -843,6 +844,17 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
 		return -EINVAL;
 	}
 
+	if (!IS_ENABLED(CONFIG_INTEL_MODULES) && !module_is_llext(mod)) {
+		const struct sof_module_api_build_info *build_info =
+			lib_manager_get_build_info(man_desc, mod);
+
+		if (build_info->format == IADK_MODULE_API_BUILD_INFO_FORMAT &&
+		    build_info->api_version_number.full == IADK_MODULE_API_CURRENT_VERSION) {
+			tr_err(&lib_manager_tr, "Unsupported module type %u", mod->type.load_type);
+			return -ENOTSUP;
+		}
+	}
+
 	/* Prepare storage memory, note: it is never freed, library unloading is unsupported */
 	/*
 	 * Prepare storage memory, note: it is never freed, it is assumed, that this