Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ed1afb authored by Aditya Bavanari's avatar Aditya Bavanari
Browse files

ASoC: msm: qdsp6v2: Update rtac driver to support Instance ID 



Add support to set and get rtac params with
Instance ID support. Maintain support for non
Instance ID set and get param structures as well.
Use common pack and set param functions to set and
get parameters to DSP instead of handling them at an
individual module level.

CRs-Fixed: 2151551
Change-Id: Ic07cb109b9e469dccf510f89ba9917e8c9eccbd8
Signed-off-by: default avatarSiena Richard <sienar@codeaurora.org>
Signed-off-by: default avatarAditya Bavanari <abavanar@codeaurora.org>
parent 43f8fb60

include/sound/apr_audio-v2.h

+71 −35
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ struct adm_cmd_device_open_v6 { 
/* Sets one or more parameters to a COPP.

*/

#define ADM_CMD_SET_PP_PARAMS_V5                        0x00010328

#define ADM_CMD_SET_PP_PARAMS_V6 0x0001035D



/*  Payload of the #ADM_CMD_SET_PP_PARAMS_V5 command.

 *	If the data_payload_addr_lsw and data_payload_addr_msw element
@@ -723,6 +724,7 @@ struct adm_cmd_rsp_device_open_v5 { 
/* This command allows a query of one COPP parameter.

*/

#define ADM_CMD_GET_PP_PARAMS_V5                                0x0001032A

#define ADM_CMD_GET_PP_PARAMS_V6 0x0001035E



/*  Payload an #ADM_CMD_GET_PP_PARAMS_V5 command.

*/
@@ -1600,49 +1602,80 @@ struct afe_sidetone_iir_filter_config_params { 
#define AFE_PARAM_ID_LOOPBACK_GAIN_PER_PATH	0x00010206



/* Used by RTAC */

struct afe_rtac_set_param_v2 {

struct afe_rtac_user_data_set_v2 {

	/* Port interface and direction (Rx or Tx) to start. */

	u16 port_id;

/* Port interface and direction (Rx or Tx) to start.

 */



	u16 payload_size;

	/* Actual size of the payload in bytes.

	 * This is used for parsing the parameter payload.

	 * Supported values: > 0

	 */

	u16 payload_size;



u32 payload_address_lsw;

/* LSW of 64 bit Payload address.

 * Address should be 32-byte,

 * 4kbyte aligned and must be contiguous memory.

 */

	/* The header detailing the memory mapping for out of band. */

	struct mem_mapping_hdr mem_hdr;



u32 payload_address_msw;

/* MSW of 64 bit Payload address.

 * In case of 32-bit shared memory address,

 * this field must be set to zero.

 * In case of 36-bit shared memory address,

 * bit-4 to bit-31 must be set to zero.

 * Address should be 32-byte, 4kbyte aligned

 * and must be contiguous memory.

 */

	/* The parameter header for the parameter data to set */

	struct param_hdr_v1 param_hdr;



u32 mem_map_handle;

/* Memory map handle returned by

 * AFE_SERVICE_CMD_SHARED_MEM_MAP_REGIONS commands.

 * Supported Values:

 * - NULL -- Message. The parameter data is in-band.

 * - Non-NULL -- The parameter data is Out-band.Pointer to

 * the physical address

 * in shared memory of the payload data.

 * An optional field is available if parameter

 * data is in-band:

 * afe_param_data_v2 param_data[...].

 * For detailed payload content, see the

 * afe_port_param_data_v2 structure.

	/* The parameter data to be filled when sent inband */

	u32 *param_data;

} __packed;



struct afe_rtac_user_data_set_v3 {

	/* Port interface and direction (Rx or Tx) to start. */

	u16 port_id;

	/* Reserved for future enhancements. Must be 0. */

	u16 reserved;



	/* The header detailing the memory mapping for out of band. */

	struct mem_mapping_hdr mem_hdr;



	/* The size of the parameter header and parameter data */

	u32 payload_size;



	/* The parameter header for the parameter data to set */

	struct param_hdr_v3 param_hdr;



	/* The parameter data to be filled when sent inband */

	u32 *param_data;

} __packed;



struct afe_rtac_user_data_get_v2 {

	/* Port interface and direction (Rx or Tx) to start. */

	u16 port_id;



	/* Actual size of the payload in bytes.

	 * This is used for parsing the parameter payload.

	 * Supported values: > 0

	 */

	u16 payload_size;



	/* The header detailing the memory mapping for out of band. */

	struct mem_mapping_hdr mem_hdr;



	/* The module ID of the parameter to get */

	u32 module_id;



	/* The parameter ID of the parameter to get */

	u32 param_id;



	/* The parameter data to be filled when sent inband */

	struct param_hdr_v1 param_hdr;

} __packed;



struct afe_rtac_user_data_get_v3 {

	/* Port interface and direction (Rx or Tx) to start. */

	u16 port_id;

	/* Reserved for future enhancements. Must be 0. */

	u16 reserved;



	/* The header detailing the memory mapping for out of band. */

	struct mem_mapping_hdr mem_hdr;



	/* The parameter data to be filled when sent inband */

	struct param_hdr_v3 param_hdr;

} __packed;

#define AFE_PORT_CMD_SET_PARAM_V2	0x000100EF

struct afe_port_cmd_set_param_v2 {

	/* APR Header */
@@ -6503,6 +6536,7 @@ struct asm_stream_cmd_open_transcode_loopback_t { 


#define ASM_STREAM_CMD_FLUSH_READBUFS   0x00010C09

#define ASM_STREAM_CMD_SET_PP_PARAMS_V2 0x00010DA1

#define ASM_STREAM_CMD_SET_PP_PARAMS_V3 0x0001320D



struct asm_stream_cmd_set_pp_params_v2 {

	u32                  data_payload_addr_lsw;
@@ -6556,6 +6590,7 @@ struct asm_stream_param_data_v2 { 
} __packed;



#define ASM_STREAM_CMD_GET_PP_PARAMS_V2		0x00010DA2

#define ASM_STREAM_CMD_GET_PP_PARAMS_V3 0x0001320E



struct asm_stream_cmd_get_pp_params_v2 {

	u32                  data_payload_addr_lsw;
@@ -6734,6 +6769,7 @@ struct asm_aac_dual_mono_mapping_param { 
} __packed;



#define ASM_STREAM_CMDRSP_GET_PP_PARAMS_V2 0x00010DA4

#define ASM_STREAM_CMDRSP_GET_PP_PARAMS_V3 0x0001320F



struct asm_stream_cmdrsp_get_pp_params_v2 {

	u32                  status;

sound/soc/msm/qdsp6v2/q6asm.c

+10 −10
Original line number Diff line number Diff line
@@ -1898,10 +1898,10 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv) 
			break;

		}

		case ASM_STREAM_CMD_GET_PP_PARAMS_V2:

			pr_debug("%s: ASM_STREAM_CMD_GET_PP_PARAMS_V2 session %d opcode 0x%x token 0x%x src %d dest %d\n",

				__func__, ac->session,

				data->opcode, data->token,

				data->src_port, data->dest_port);

		case ASM_STREAM_CMD_GET_PP_PARAMS_V3:

			pr_debug("%s: ASM_STREAM_CMD_GET_PP_PARAMS session %d opcode 0x%x token 0x%x src %d dest %d\n",

				__func__, ac->session, data->opcode,

				data->token, data->src_port, data->dest_port);

			/* Should only come here if there is an APR */

			/* error or malformed APR packet. Otherwise */

			/* response will be returned as */
@@ -1971,12 +1971,12 @@ static int32_t q6asm_callback(struct apr_client_data *data, void *priv) 
		break;

	}

	case ASM_STREAM_CMDRSP_GET_PP_PARAMS_V2:

		pr_debug("%s: ASM_STREAM_CMDRSP_GET_PP_PARAMS_V2 session %d opcode 0x%x token 0x%x src %d dest %d\n",

				__func__, ac->session, data->opcode,

				data->token,

	case ASM_STREAM_CMDRSP_GET_PP_PARAMS_V3:

		pr_debug("%s: ASM_STREAM_CMDRSP_GET_PP_PARAMS session %d opcode 0x%x token 0x%x src %d dest %d\n",

			__func__, ac->session, data->opcode, data->token,

			data->src_port, data->dest_port);

		if (payload[0] != 0) {

			pr_err("%s: ASM_STREAM_CMDRSP_GET_PP_PARAMS_V2 returned error = 0x%x\n",

			pr_err("%s: ASM_STREAM_CMDRSP_GET_PP_PARAMS returned error = 0x%x\n",

			       __func__, payload[0]);

		} else if (generic_get_data) {

			generic_get_data->valid = 1;

sound/soc/msm/qdsp6v2/q6voice.c

+7 −3
Original line number Diff line number Diff line
@@ -6728,6 +6728,7 @@ static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv) 
							data->payload_size);

				break;

			case VSS_ICOMMON_CMD_GET_PARAM_V2:

			case VSS_ICOMMON_CMD_GET_PARAM_V3:

				pr_debug("%s: VSS_ICOMMON_CMD_GET_PARAM_V2\n",

					 __func__);

				/* Should only come here if there is an APR */
@@ -6860,7 +6861,8 @@ static int32_t qdsp_cvs_callback(struct apr_client_data *data, void *priv) 
		pr_debug("Recd VSS_ISTREAM_EVT_NOT_READY\n");

	} else if (data->opcode == VSS_ISTREAM_EVT_READY) {

		pr_debug("Recd VSS_ISTREAM_EVT_READY\n");

	} else if (data->opcode == VSS_ICOMMON_RSP_GET_PARAM) {

	} else if (data->opcode == VSS_ICOMMON_RSP_GET_PARAM ||

		   VSS_ICOMMON_RSP_GET_PARAM_V3) {

		pr_debug("%s: VSS_ICOMMON_RSP_GET_PARAM\n", __func__);

		ptr = data->payload;

		if (ptr[0] != 0) {
@@ -7020,12 +7022,13 @@ static int32_t qdsp_cvp_callback(struct apr_client_data *data, void *priv) 
						data->payload_size);

					break;

				default:

					pr_debug("%s: invalid token for command VSS_ICOMMON_CMD_SET_PARAM_V2: %d\n",

					pr_debug("%s: invalid token for command VSS_ICOMMON_CMD_SET_PARAM: %d\n",

						__func__, data->token);

					break;

				}

				break;

			case VSS_ICOMMON_CMD_GET_PARAM_V2:

			case VSS_ICOMMON_CMD_GET_PARAM_V3:

				pr_debug("%s: VSS_ICOMMON_CMD_GET_PARAM_V2\n",

					 __func__);

				/* Should only come here if there is an APR */
@@ -7092,7 +7095,8 @@ static int32_t qdsp_cvp_callback(struct apr_client_data *data, void *priv) 
				break;

			}

		}

	} else if (data->opcode == VSS_ICOMMON_RSP_GET_PARAM) {

	} else if (data->opcode == VSS_ICOMMON_RSP_GET_PARAM ||

		   VSS_ICOMMON_RSP_GET_PARAM_V3) {

		pr_debug("%s: VSS_ICOMMON_RSP_GET_PARAM\n", __func__);

		ptr = data->payload;

		if (ptr[0] != 0) {

sound/soc/msm/qdsp6v2/rtac.c

+306 −202

File changed.

Preview size limit exceeded, changes collapsed.