From 68c63571fd6829a57814e25f5d5f73ba601a977e Mon Sep 17 00:00:00 2001
From: Rander Wang <rander.wang@intel.com>
Date: Fri, 8 Dec 2023 13:38:29 +0800
Subject: [PATCH] lmdk: add dummy loadable smart amp support

It will be built will __SOF_MODULE_SERVICE_BUILD__ enabled

Signed-off-by: Rander Wang <rander.wang@intel.com>
---
 lmdk/cmake/ldscripts/data_linker_script.txt   |   2 +-
 lmdk/libraries/smart_amp_test/CMakeLists.txt  |  25 ++++
 .../smart_amp_test/smart_amp_test.toml        |  79 ++++++++++
 lmdk/modules/smart_amp_test/CMakeLists.txt    |  13 ++
 src/include/ipc4/base-config.h                |   3 +-
 .../sof/samples/audio/smart_amp_test.h        |  16 +-
 src/samples/audio/smart_amp_test_ipc4.c       | 138 ++++++++++--------
 7 files changed, 215 insertions(+), 61 deletions(-)
 create mode 100644 lmdk/libraries/smart_amp_test/CMakeLists.txt
 create mode 100644 lmdk/libraries/smart_amp_test/smart_amp_test.toml
 create mode 100644 lmdk/modules/smart_amp_test/CMakeLists.txt

diff --git a/lmdk/cmake/ldscripts/data_linker_script.txt b/lmdk/cmake/ldscripts/data_linker_script.txt
index cbdf8001c0be..63eed21cb07a 100644
--- a/lmdk/cmake/ldscripts/data_linker_script.txt
+++ b/lmdk/cmake/ldscripts/data_linker_script.txt
@@ -15,7 +15,7 @@ SECTIONS {
         _data_end = ABSOLUTE(.);
     } >HPSRAM_seg : data_phdr
 
-    .rodata : {
+    .rodata : ALIGN(4096) {
         _rodata_start = ABSOLUTE(.);
         *(.gnu.linkonce.r.*)
         *(.rodata)
diff --git a/lmdk/libraries/smart_amp_test/CMakeLists.txt b/lmdk/libraries/smart_amp_test/CMakeLists.txt
new file mode 100644
index 000000000000..0282a83bbf90
--- /dev/null
+++ b/lmdk/libraries/smart_amp_test/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.20)
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../cmake/xtensa-toolchain.cmake")
+
+project(smart_amp_test)
+
+macro(is_zephyr ret)
+        if(CONFIG_ZEPHYR_SOF_MODULE)
+                set(${ret} TRUE)
+        else()
+                set(${ret} FALSE)
+        endif()
+endmacro()
+
+# list of modules to be built and included into this loadable library
+set(MODULES_LIST smart_amp_test)
+
+# toml file for rimage to generate manifets
+set(TOML "${CMAKE_CURRENT_LIST_DIR}/smart_amp_test.toml")
+
+# TODO: Move it somewhere???
+add_definitions(-DMAJOR_IADSP_API_VERSION=5)
+add_definitions(-DMIDDLE_IADSP_API_VERSION=0)
+add_definitions(-DMINOR_IADSP_API_VERSION=0)
+
+include(../../cmake/build.cmake)
diff --git a/lmdk/libraries/smart_amp_test/smart_amp_test.toml b/lmdk/libraries/smart_amp_test/smart_amp_test.toml
new file mode 100644
index 000000000000..34f3463343dd
--- /dev/null
+++ b/lmdk/libraries/smart_amp_test/smart_amp_test.toml
@@ -0,0 +1,79 @@
+version = [3, 0]
+
+[adsp]
+name = "mtl"
+image_size = "0x2C0000" # (22) bank * 128KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x1FF80000"
+size = "0x400"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xA104A000"
+size = "0x2000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xa00f0000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x40000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xA0000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x464"
+[[cse.entry]]
+name = "ADSP.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "ADSP"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "ADSP.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x40000"
+
+[module]
+count = 1
+
+	[[module.entry]]
+		name = "SMATEST"
+		uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
+		affinity_mask = "0x1"
+		instance_count = "1"
+		domain_types = "0"
+		load_type = "0"
+		init_config = "1"
+		module_type = "0xD"
+		auto_start = "0"
+		sched_caps = [1, 0x00008000]
+
+		# pin = [dir, type, sample rate, size, container, channel-cfg]
+		pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+				0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+				1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+		# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+		mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/lmdk/modules/smart_amp_test/CMakeLists.txt b/lmdk/modules/smart_amp_test/CMakeLists.txt
new file mode 100644
index 000000000000..37fcdb87108b
--- /dev/null
+++ b/lmdk/modules/smart_amp_test/CMakeLists.txt
@@ -0,0 +1,13 @@
+target_sources(smart_amp_test PRIVATE ${SOF_BASE}/src/samples/audio/smart_amp_test_ipc4.c)
+
+set_target_properties(smart_amp_test PROPERTIES
+	HPSRAM_ADDR "0xa06c1000"
+)
+
+target_compile_definitions(smart_amp_test PRIVATE
+	__SOF_MODULE_SERVICE_BUILD__=1
+	CONFIG_XTENSA=1
+	CONFIG_IPC_MAJOR_4=1
+)
+
+target_include_directories(smart_amp_test PRIVATE "${SOF_BASE}/src/include")
diff --git a/src/include/ipc4/base-config.h b/src/include/ipc4/base-config.h
index b95ecbd3e1f9..07a35a47e9aa 100644
--- a/src/include/ipc4/base-config.h
+++ b/src/include/ipc4/base-config.h
@@ -23,8 +23,9 @@
 
 #ifndef __SOF_IPC4_BASE_CONFIG_H__
 #define __SOF_IPC4_BASE_CONFIG_H__
-
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 #include <sof/compiler_attributes.h>
+#endif
 #include <module/ipc4/base-config.h>
 
 struct sof_ipc_stream_params;
diff --git a/src/include/sof/samples/audio/smart_amp_test.h b/src/include/sof/samples/audio/smart_amp_test.h
index 3feda5005125..c5ddd8032d99 100644
--- a/src/include/sof/samples/audio/smart_amp_test.h
+++ b/src/include/sof/samples/audio/smart_amp_test.h
@@ -8,8 +8,10 @@
 #ifndef __SOF_AUDIO_SMART_AMP_H__
 #define __SOF_AUDIO_SMART_AMP_H__
 
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 #include <sof/audio/component.h>
 #include <sof/audio/data_blob.h>
+#endif
 
 #if CONFIG_IPC_MAJOR_4
 #include <ipc4/base-config.h>
@@ -19,10 +21,20 @@
 
 #define SMART_AMP_MAX_STREAM_CHAN   8
 
+/* Max channels for all intel platforms are 8 */
+#define MAX_CHANNELS	8
+
 /** IPC blob types */
 #define SOF_SMART_AMP_CONFIG	0
 #define SOF_SMART_AMP_MODEL	1
 
+#ifdef __SOF_MODULE_SERVICE_BUILD__
+#define LOG_ERR(...)
+#define LOG_WRN(...)
+#define LOG_DBG(...)
+#define LOG_INF(...)
+#endif
+
 struct smart_amp_model_data {
 	uint32_t data_size;
 	void *data;
@@ -83,8 +95,8 @@ struct smart_amp_model_data {
 struct sof_smart_amp_config {
 	uint32_t size;
 	uint32_t feedback_channels;
-	int8_t source_ch_map[PLATFORM_MAX_CHANNELS];
-	int8_t feedback_ch_map[PLATFORM_MAX_CHANNELS];
+	int8_t source_ch_map[MAX_CHANNELS];
+	int8_t feedback_ch_map[MAX_CHANNELS];
 };
 
 #if CONFIG_IPC_MAJOR_4
diff --git a/src/samples/audio/smart_amp_test_ipc4.c b/src/samples/audio/smart_amp_test_ipc4.c
index 5395f1a6ef08..f6ffd6dae115 100644
--- a/src/samples/audio/smart_amp_test_ipc4.c
+++ b/src/samples/audio/smart_amp_test_ipc4.c
@@ -3,8 +3,9 @@
 // Copyright(c) 2020 Intel Corporation. All rights reserved.
 //
 // Author: Bartosz Kokoszko <bartoszx.kokoszko@linux.intel.com>
+
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 #include <sof/compiler_attributes.h>
-#include <sof/samples/audio/smart_amp_test.h>
 #include <sof/audio/module_adapter/module/generic.h>
 #include <sof/audio/ipc-config.h>
 #include <sof/trace/trace.h>
@@ -18,6 +19,7 @@
 #include <ipc4/module.h>
 
 LOG_MODULE_REGISTER(smart_amp_test, CONFIG_SOF_LOG_LEVEL);
+#include <zephyr/logging/log.h>
 
 /* 167a961e-8ae4-11ea-89f1-000c29ce1635 */
 DECLARE_SOF_RT_UUID("smart_amp-test", smart_amp_test_comp_uuid, 0x167a961e, 0x8ae4,
@@ -25,6 +27,22 @@ DECLARE_SOF_RT_UUID("smart_amp-test", smart_amp_test_comp_uuid, 0x167a961e, 0x8a
 
 DECLARE_TR_CTX(smart_amp_test_comp_tr, SOF_UUID(smart_amp_test_comp_uuid),
 	       LOG_LEVEL_INFO);
+#else
+#include <string.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <module/base.h>
+#include <module/api_ver.h>
+#include <module/interface.h>
+#include <iadk/adsp_error_code.h>
+#include <rimage/sof/user/manifest.h>
+#include <audio/source_api.h>
+#include <audio/sink_api.h>
+#include <ipc4/module.h>
+#include <sof/math/numbers.h>
+#endif
+#include <sof/samples/audio/smart_amp_test.h>
 
 typedef void (*smart_amp_proc)(int8_t const *src_ptr,
 			       int8_t const *src_begin,
@@ -37,57 +55,53 @@ typedef void (*smart_amp_proc)(int8_t const *src_ptr,
 struct smart_amp_data {
 	struct sof_smart_amp_ipc4_config ipc4_cfg;
 	struct sof_smart_amp_config config;
-	struct comp_data_blob_handler *model_handler;
-	void *data_blob;
-	size_t data_blob_size;
 	smart_amp_proc process;
 	uint32_t out_channels;
 };
 
+#ifdef __SOF_MODULE_SERVICE_BUILD__
+static struct smart_amp_data smart_amp_priv;
+#endif
+
 static int smart_amp_init(struct processing_module *mod)
 {
 	struct smart_amp_data *sad;
-	struct comp_dev *dev = mod->dev;
 	struct module_data *mod_data = &mod->priv;
-	const size_t in_size = sizeof(struct ipc4_input_pin_format) * SMART_AMP_NUM_IN_PINS;
-	const size_t out_size = sizeof(struct ipc4_output_pin_format) * SMART_AMP_NUM_OUT_PINS;
 	int ret;
 	const struct ipc4_base_module_extended_cfg *base_cfg = mod_data->cfg.init_data;
 
-	comp_dbg(dev, "smart_amp_init()");
+	LOG_DBG("smart_amp_init()");
+
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 	sad = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*sad));
 	if (!sad)
 		return -ENOMEM;
-
+#else
+	sad = &smart_amp_priv;
+#endif
 	mod_data->private = sad;
 
-	/* component model data handler */
-	sad->model_handler = comp_data_blob_handler_new(dev);
-	if (!sad->model_handler) {
-		ret = -ENOMEM;
-		goto sad_fail;
-	}
-
 	if (base_cfg->base_cfg_ext.nb_input_pins != SMART_AMP_NUM_IN_PINS ||
 	    base_cfg->base_cfg_ext.nb_output_pins != SMART_AMP_NUM_OUT_PINS) {
-		comp_err(dev, "smart_amp_init(): Invalid pin configuration");
 		ret = -EINVAL;
 		goto sad_fail;
 	}
 
 	/* Copy the pin formats */
-	memcpy_s(sad->ipc4_cfg.input_pins, in_size,
-		 base_cfg->base_cfg_ext.pin_formats, in_size);
-	memcpy_s(&sad->ipc4_cfg.output_pin, out_size,
-		 &base_cfg->base_cfg_ext.pin_formats[in_size], out_size);
-
-	mod->max_sources = SMART_AMP_NUM_IN_PINS;
+	sad->ipc4_cfg.input_pins[0] =
+		*((struct ipc4_input_pin_format *)base_cfg->base_cfg_ext.pin_formats);
+	sad->ipc4_cfg.input_pins[1] =
+		*((struct ipc4_input_pin_format *)base_cfg->base_cfg_ext.pin_formats + 1);
+	sad->ipc4_cfg.output_pin =
+		*(struct ipc4_output_pin_format *)(base_cfg->base_cfg_ext.pin_formats
+			+ sizeof(sad->ipc4_cfg.input_pins));
 
 	return 0;
 
 sad_fail:
-	comp_data_blob_handler_free(sad->model_handler);
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 	rfree(sad);
+#endif
 	return ret;
 }
 
@@ -96,23 +110,21 @@ static int smart_amp_set_config(struct processing_module *mod, uint32_t config_i
 				const uint8_t *fragment, size_t fragment_size, uint8_t *response,
 				size_t response_size)
 {
-	struct comp_dev *dev = mod->dev;
 	struct smart_amp_data *sad = module_get_private_data(mod);
 
-	comp_dbg(dev, "smart_amp_set_config()");
+	LOG_DBG("smart_amp_set_config()");
 
 	switch (config_id) {
 	case SMART_AMP_SET_MODEL:
-		return comp_data_blob_set(sad->model_handler, pos,
-					 data_offset_size, fragment, fragment_size);
+		return 0;
 	case SMART_AMP_SET_CONFIG:
 		if (fragment_size != sizeof(sad->config)) {
-			comp_err(dev, "smart_amp_set_config(): invalid config size %u, expect %u",
-				 fragment_size, sizeof(struct sof_smart_amp_config));
+			LOG_ERR("smart_amp_set_config(): invalid config size %u, expect %u",
+				fragment_size, sizeof(struct sof_smart_amp_config));
 			return -EINVAL;
 		}
-		comp_dbg(dev, "smart_amp_set_config(): config size = %u", fragment_size);
-		memcpy_s(&sad->config, sizeof(sad->config), fragment, fragment_size);
+		LOG_DBG("smart_amp_set_config(): config size = %u", fragment_size);
+		sad->config = *(struct sof_smart_amp_config *)fragment;
 		return 0;
 	default:
 		return -EINVAL;
@@ -124,19 +136,12 @@ static inline int smart_amp_get_config(struct processing_module *mod,
 				       uint8_t *fragment, size_t fragment_size)
 {
 	struct smart_amp_data *sad = module_get_private_data(mod);
-	struct comp_dev *dev = mod->dev;
-	int ret;
 
-	comp_dbg(dev, "smart_amp_get_config()");
+	LOG_DBG("smart_amp_get_config()");
 
 	switch (config_id) {
 	case SMART_AMP_GET_CONFIG:
-		ret = memcpy_s(fragment, fragment_size, &sad->config, sizeof(sad->config));
-		if (ret) {
-			comp_err(dev, "smart_amp_get_config(): wrong config size %d",
-				 fragment_size);
-			return ret;
-		}
+		 *(struct sof_smart_amp_config *)fragment = sad->config;
 		*data_offset_size = sizeof(sad->config);
 		return 0;
 	default:
@@ -146,12 +151,14 @@ static inline int smart_amp_get_config(struct processing_module *mod,
 
 static int smart_amp_free(struct processing_module *mod)
 {
+	LOG_DBG("smart_amp_free()");
+
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 	struct smart_amp_data *sad = module_get_private_data(mod);
-	struct comp_dev *dev = mod->dev;
 
-	comp_dbg(dev, "smart_amp_free()");
-	comp_data_blob_handler_free(sad->model_handler);
 	rfree(sad);
+#endif
+
 	return 0;
 }
 
@@ -270,8 +277,6 @@ static int smart_amp_process(struct processing_module *mod,
 			     struct sof_source **sources, int num_of_sources,
 			     struct sof_sink **sinks, int num_of_sinks)
 {
-	struct smart_amp_data *sad = module_get_private_data(mod);
-	struct comp_dev *dev = mod->dev;
 	struct sof_source *fb_input = NULL;
 	/* if there is only one input stream, it should be the source input */
 	struct sof_source *src_input = sources[0];
@@ -309,9 +314,7 @@ static int smart_amp_process(struct processing_module *mod,
 
 static int smart_amp_reset(struct processing_module *mod)
 {
-	struct comp_dev *dev = mod->dev;
-
-	comp_dbg(dev, "smart_amp_reset()");
+	LOG_DBG("smart_amp_reset()");
 
 	return 0;
 }
@@ -325,6 +328,7 @@ static smart_amp_proc get_smart_amp_process(struct sof_sink *sink)
 	case SOF_IPC_FRAME_S32_LE:
 		return process_s32;
 	default:
+		LOG_ERR("smart_amp_process() error: not supported frame format");
 		return NULL;
 	}
 }
@@ -334,19 +338,15 @@ static int smart_amp_prepare(struct processing_module *mod,
 			     struct sof_sink **sinks, int num_of_sinks)
 {
 	struct smart_amp_data *sad = module_get_private_data(mod);
-	struct comp_dev *dev = mod->dev;
-	struct comp_buffer *source_buffer;
-	struct comp_buffer *sink_buffer;
-	struct list_item *blist;
-	int ret;
-	int i;
 
-	sad->process = get_smart_amp_process(sinks[0]);
+	LOG_DBG("smart_amp_prepare()");
 
+	sad->process = get_smart_amp_process(sinks[0]);
 	if (!sad->process) {
-		comp_err(dev, "smart_amp_prepare(): get_smart_amp_process failed");
+		LOG_ERR("smart_amp_prepare(): get_smart_amp_process failed");
 		return -EINVAL;
 	}
+
 	return 0;
 }
 
@@ -360,8 +360,32 @@ static const struct module_interface smart_amp_test_interface = {
 	.free = smart_amp_free
 };
 
+#ifndef __SOF_MODULE_SERVICE_BUILD__
 DECLARE_MODULE_ADAPTER(smart_amp_test_interface, smart_amp_test_comp_uuid, smart_amp_test_comp_tr);
 /* DECLARE_MODULE_ADAPTER() creates
  * "sys_comp_module_<smart_amp_test_interface>_init()" (and a lot more)
  */
 SOF_MODULE_INIT(smart_amp_test, sys_comp_module_smart_amp_test_interface_init);
+#else
+static const struct module_interface *loadable_module_main(void *mod_cfg,
+							   void *parent_ppl,
+							   void **mod_ptr)
+{
+	return &smart_amp_test_interface;
+}
+
+DECLARE_LOADABLE_MODULE_API_VERSION(smart_amp_test);
+
+__attribute__((section(".module")))
+const struct sof_man_module_manifest main_manifest = {
+	.module = {
+		.name = "SMATEST",
+		.uuid = {0x1E, 0x96, 0x7A, 0x16, 0xE4, 0x8A, 0xEA, 0x11,
+			 0x89, 0xF1, 0x00, 0x0C, 0x29, 0xCE, 0x16, 0x35},
+		.entry_point = (uint32_t)loadable_module_main,
+		.type = { .load_type = SOF_MAN_MOD_TYPE_MODULE,
+		.domain_ll = 1 },
+		.affinity_mask = 1,
+	}
+};
+#endif