Unverified Commit cb1eb6b5 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: Add code loading requests 



Before firmware and its modules can be used, they have to be loaded.
Code loading process is complex and is a combination of DMA and IPC
operations. Here, IPC part is being added and accounts for CLDMA and HDA
mechanisms both.

Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220311153544.136854-6-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2879516f

sound/soc/intel/avs/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



snd-soc-avs-objs := dsp.o ipc.o

snd-soc-avs-objs := dsp.o ipc.o messages.o



obj-$(CONFIG_SND_SOC_INTEL_AVS) += snd-soc-avs.o

sound/soc/intel/avs/messages.c

0 → 100644
+65 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

//

// Copyright(c) 2021-2022 Intel Corporation. All rights reserved.

//

// Authors: Cezary Rojewski <cezary.rojewski@intel.com>

//          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>

//



#include "avs.h"

#include "messages.h"



#define AVS_CL_TIMEOUT_MS	5000



int avs_ipc_load_modules(struct avs_dev *adev, u16 *mod_ids, u32 num_mod_ids)

{

	union avs_global_msg msg = AVS_GLOBAL_REQUEST(LOAD_MULTIPLE_MODULES);

	struct avs_ipc_msg request;

	int ret;



	msg.load_multi_mods.mod_cnt = num_mod_ids;

	request.header = msg.val;

	request.data = mod_ids;

	request.size = sizeof(*mod_ids) * num_mod_ids;



	ret = avs_dsp_send_msg_timeout(adev, &request, NULL, AVS_CL_TIMEOUT_MS);

	if (ret)

		avs_ipc_err(adev, &request, "load multiple modules", ret);



	return ret;

}



int avs_ipc_unload_modules(struct avs_dev *adev, u16 *mod_ids, u32 num_mod_ids)

{

	union avs_global_msg msg = AVS_GLOBAL_REQUEST(UNLOAD_MULTIPLE_MODULES);

	struct avs_ipc_msg request;

	int ret;



	msg.load_multi_mods.mod_cnt = num_mod_ids;

	request.header = msg.val;

	request.data = mod_ids;

	request.size = sizeof(*mod_ids) * num_mod_ids;



	ret = avs_dsp_send_msg_timeout(adev, &request, NULL, AVS_CL_TIMEOUT_MS);

	if (ret)

		avs_ipc_err(adev, &request, "unload multiple modules", ret);



	return ret;

}



int avs_ipc_load_library(struct avs_dev *adev, u32 dma_id, u32 lib_id)

{

	union avs_global_msg msg = AVS_GLOBAL_REQUEST(LOAD_LIBRARY);

	struct avs_ipc_msg request = {{0}};

	int ret;



	msg.load_lib.dma_id = dma_id;

	msg.load_lib.lib_id = lib_id;

	request.header = msg.val;



	ret = avs_dsp_send_msg_timeout(adev, &request, NULL, AVS_CL_TIMEOUT_MS);

	if (ret)

		avs_ipc_err(adev, &request, "load library", ret);



	return ret;

}

sound/soc/intel/avs/messages.h

+22 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ enum avs_msg_direction { 
};



enum avs_global_msg_type {

	AVS_GLB_LOAD_MULTIPLE_MODULES = 15,

	AVS_GLB_UNLOAD_MULTIPLE_MODULES = 16,

	AVS_GLB_LOAD_LIBRARY = 24,

	AVS_GLB_NOTIFICATION = 27,

};
@@ -38,6 +41,16 @@ union avs_global_msg { 
				u32 msg_direction:1;

				u32 msg_target:1;

			};

			/* module loading */

			struct {

				u32 mod_cnt:8;

			} load_multi_mods;

			/* library loading */

			struct {

				u32 dma_id:5;

				u32 rsvd:11;

				u32 lib_id:4;

			} load_lib;

		};

		union {

			u32 val;
@@ -84,6 +97,10 @@ union avs_reply_msg { 
		};

		union {

			u32 val;

			/* module loading */

			struct {

				u32 err_mod_id:16;

			} load_multi_mods;

		} ext;

	};

} __packed;
@@ -167,4 +184,9 @@ struct avs_notify_mod_data { 
	u32 data[];

} __packed;



/* Code loading messages */

int avs_ipc_load_modules(struct avs_dev *adev, u16 *mod_ids, u32 num_mod_ids);

int avs_ipc_unload_modules(struct avs_dev *adev, u16 *mod_ids, u32 num_mod_ids);

int avs_ipc_load_library(struct avs_dev *adev, u32 dma_id, u32 lib_id);



#endif /* __SOUND_SOC_INTEL_AVS_MSGS_H */