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

Commit 8d23afe6 authored by Shashi Kant Maurya's avatar Shashi Kant Maurya
Browse files

soc: add proxy ports for call screening in machine driver 



add machine driver changes for proxy port changes.
Pseudo AFE port based BE DAIs can be used for various use cases, including
but not limited to voice call. Add support for BE DAI link based on pseudo
port.

Change-Id: I02677676f6a23a05e3f10eb2ce09f3543837417c
Signed-off-by: default avatarShashi Kant Maurya <smaury@codeaurora.org>
parent 02e8ec96

include/sound/apr_audio-v2.h

+11 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 2020, The Linux Foundation. All rights reserved.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 2 and
@@ -1429,7 +1429,7 @@ struct adm_cmd_connect_afe_port_v5 { 
#define AFE_PORT_ID_SLIMBUS_RANGE_SIZE	0xA



/* Size of the range of port IDs for real-time proxy ports. */

#define  AFE_PORT_ID_RT_PROXY_PORT_RANGE_SIZE	0x2

#define  AFE_PORT_ID_RT_PROXY_PORT_RANGE_SIZE	0x4



/* Size of the range of port IDs for pseudoports. */

#define AFE_PORT_ID_PSEUDOPORT_RANGE_SIZE	0x5
@@ -1643,6 +1643,15 @@ struct adm_cmd_connect_afe_port_v5 { 
 */

#define AFE_PORT_ID_VOICE2_PLAYBACK_TX  0x8002

#define AFE_PORT_ID_VOICE_PLAYBACK_TX   0x8005

/*

 * Proxyport used for voice call data processing.

 * In cases like call-screening feature, where user can communicate

 * with caller with the help of "call screen" mode, and without

 * connecting the call with any HW input/output devices in the phon,

 * voice call can use Pseudo port to start voice data processing.

 */

#define RT_PROXY_PORT_002_TX  0x2003

#define RT_PROXY_PORT_002_RX  0x2002



#define AFE_PORT_ID_PRIMARY_TDM_RX \

	(AFE_PORT_ID_TDM_PORT_RANGE_START + 0x00)

include/sound/q6afe-v2.h

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, 2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -235,6 +235,9 @@ enum { 
	IDX_AFE_PORT_ID_QUATERNARY_MI2S_TX_2,

	IDX_AFE_PORT_ID_QUATERNARY_MI2S_TX_3,

	IDX_AFE_PORT_ID_QUATERNARY_MI2S_TX_4,

	/* IDX 167 -> 168 */

	IDX_RT_PROXY_PORT_002_RX,

	IDX_RT_PROXY_PORT_002_TX,

	AFE_MAX_PORTS

};

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+47 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1876,6 +1876,8 @@ static int msm_dai_q6_hw_params(struct snd_pcm_substream *substream, 
	case RT_PROXY_DAI_001_RX:

	case RT_PROXY_DAI_002_TX:

	case RT_PROXY_DAI_002_RX:

	case RT_PROXY_PORT_002_TX:

	case RT_PROXY_PORT_002_RX:

		rc = msm_dai_q6_afe_rtproxy_hw_params(params, dai);

		break;

	case VOICE_PLAYBACK_TX:
@@ -2872,6 +2874,42 @@ static struct snd_soc_dai_driver msm_dai_q6_incall_record_dai[] = { 
	},

};



static struct snd_soc_dai_driver msm_dai_q6_proxy_tx_dai = {

		.capture = {

			.stream_name = "Proxy Capture",

			.aif_name = "PROXY_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,

			.rate_max =     48000,

	},

	.ops = &msm_dai_q6_ops,

	.id = RT_PROXY_PORT_002_TX,

	.probe = msm_dai_q6_dai_probe,

	.remove = msm_dai_q6_dai_remove,

};



static struct snd_soc_dai_driver msm_dai_q6_proxy_rx_dai = {

		.playback = {

			.stream_name = "Proxy Playback",

			.aif_name = "PROXY_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,

			.rate_max =     48000,

	},

	.ops = &msm_dai_q6_ops,

	.id = RT_PROXY_PORT_002_RX,

	.probe = msm_dai_q6_dai_probe,

	.remove = msm_dai_q6_dai_remove,

};



static struct snd_soc_dai_driver msm_dai_q6_usb_rx_dai = {

	.playback = {

		.stream_name = "USB Audio Playback",
@@ -5872,7 +5910,14 @@ register_uplink_capture: 
			pr_err("%s: Device not found stream name %s\n",

			__func__, stream_name);

		break;



	case RT_PROXY_PORT_002_RX:

		rc = snd_soc_register_component(&pdev->dev,

			&msm_dai_q6_component, &msm_dai_q6_proxy_rx_dai, 1);

		break;

	case RT_PROXY_PORT_002_TX:

		rc = snd_soc_register_component(&pdev->dev,

			&msm_dai_q6_component, &msm_dai_q6_proxy_tx_dai, 1);

		break;

	default:

		rc = -ENODEV;

		break;

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+39 −2
Original line number Diff line number Diff line
@@ -593,7 +593,11 @@ struct msm_pcm_routing_bdai_data msm_bedais[MSM_BACKEND_DAI_MAX] = { 
	{ AFE_PORT_ID_QUATERNARY_MI2S_TX_3, 0, {0}, {0}, 0, 0, 0, 0, {0},

	  LPASS_BE_QUAT_MI2S_TX_3},

	{ AFE_PORT_ID_QUATERNARY_MI2S_TX_4, 0, {0}, {0}, 0, 0, 0, 0, {0},

	  LPASS_BE_QUAT_MI2S_TX_4}

	  LPASS_BE_QUAT_MI2S_TX_4},

	{ RT_PROXY_PORT_002_RX, 0, {0}, {0}, 0, 0, 0, 0, {0},

	  LPASS_BE_PROXY_RX},

	{ RT_PROXY_PORT_002_TX, 0, {0}, {0}, 0, 0, 0, 0, {0},

	  LPASS_BE_PROXY_TX}

};









/* Track ASM playback & capture sessions of DAI








@@ -3028,7 +3032,7 @@ static const char *const be_name[] = {







"INT0_MI2S_RX", "INT0_MI2S_TX", "INT1_MI2S_RX", "INT1_MI2S_TX",









"INT2_MI2S_RX", "INT2_MI2S_TX", "INT3_MI2S_RX", "INT3_MI2S_TX",









"INT4_MI2S_RX", "INT4_MI2S_TX", "INT5_MI2S_RX", "INT5_MI2S_TX",









"INT6_MI2S_RX", "INT6_MI2S_TX"









"INT6_MI2S_RX", "INT6_MI2S_TX", "PROXY_RX", "PROXY_TX"









};

















static SOC_ENUM_SINGLE_DECL(mm1_channel_mux,








@@ -13262,6 +13266,17 @@ static const struct snd_kcontrol_new tx_vowlan_mixer_controls[] = {







	msm_routing_put_voice_mixer),









};

















static const struct snd_kcontrol_new proxy_rx_voice_mixer_controls[] = {









	SOC_DOUBLE_EXT("VoiceMMode1", SND_SOC_NOPM,









	MSM_BACKEND_DAI_PROXY_RX,









	MSM_FRONTEND_DAI_VOICEMMODE1, 1, 0, msm_routing_get_voice_mixer,









	msm_routing_put_voice_mixer),









	SOC_DOUBLE_EXT("VoiceMMode2", SND_SOC_NOPM,









	MSM_BACKEND_DAI_PROXY_RX,









	MSM_FRONTEND_DAI_VOICEMMODE2, 1, 0, msm_routing_get_voice_mixer,









	msm_routing_put_voice_mixer),









};

















static const struct snd_kcontrol_new tx_voicemmode1_mixer_controls[] = {









	SOC_DOUBLE_EXT("PRI_TX_MMode1", SND_SOC_NOPM,









	MSM_BACKEND_DAI_PRI_I2S_TX,








@@ -13314,6 +13329,12 @@ static const struct snd_kcontrol_new tx_voicemmode1_mixer_controls[] = {







	SOC_DOUBLE_EXT("QUAT_TDM_TX_0_MMode1", SND_SOC_NOPM,









	MSM_BACKEND_DAI_QUAT_TDM_TX_0, MSM_FRONTEND_DAI_VOICEMMODE1,









	1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),









	SOC_DOUBLE_EXT("PROXY_TX_MMode1", SND_SOC_NOPM,









	MSM_BACKEND_DAI_PROXY_TX, MSM_FRONTEND_DAI_VOICEMMODE1,









	1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),









	SOC_DOUBLE_EXT("PROXY_TX_MMode2", SND_SOC_NOPM,









	MSM_BACKEND_DAI_PROXY_TX, MSM_FRONTEND_DAI_VOICEMMODE2,









	1, 0, msm_routing_get_voice_mixer, msm_routing_put_voice_mixer),









};

















static const struct snd_kcontrol_new tx_voicemmode2_mixer_controls[] = {








@@ -17636,6 +17657,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







	SND_SOC_DAPM_AIF_IN("SLIMBUS_8_TX", "Slimbus8 Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("USB_AUDIO_RX", "USB Audio Playback", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_IN("USB_AUDIO_TX", "USB Audio Capture", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_OUT("PROXY_RX", "Proxy Playback", 0, 0, 0, 0),









	SND_SOC_DAPM_AIF_IN("PROXY_TX", "Proxy Capture", 0, 0, 0, 0),

















	/* Switch Definitions */









	SND_SOC_DAPM_SWITCH("SLIMBUS_DL_HL", SND_SOC_NOPM, 0, 0,








@@ -17985,6 +18008,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {







	SND_SOC_DAPM_MIXER("Voice2_Tx Mixer",









			   SND_SOC_NOPM, 0, 0, tx_voice2_mixer_controls,









			   ARRAY_SIZE(tx_voice2_mixer_controls)),









	SND_SOC_DAPM_MIXER("PROXY_RX_Voice Mixer",









				SND_SOC_NOPM, 0, 0,









				proxy_rx_voice_mixer_controls,









				ARRAY_SIZE(proxy_rx_voice_mixer_controls)),









	SND_SOC_DAPM_MIXER("Voip_Tx Mixer",









				SND_SOC_NOPM, 0, 0, tx_voip_mixer_controls,









				ARRAY_SIZE(tx_voip_mixer_controls)),








@@ -20334,6 +20361,12 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"QUAT_TDM_RX_2_Voice Mixer", "DTMF", "DTMF_DL_HL"},









	{"QUAT_TDM_RX_2", NULL, "QUAT_TDM_RX_2_Voice Mixer"},

















	{"PROXY_RX_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},









	{"PROXY_RX", NULL, "PROXY_RX_Voice Mixer"},

















	{"PROXY_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},









	{"PROXY_RX", NULL, "PROXY_RX_Voice Mixer"},

















	{"VOC_EXT_EC MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},









	{"VOC_EXT_EC MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"},









	{"VOC_EXT_EC MUX", "TERT_MI2S_TX" , "TERT_MI2S_TX"},








@@ -20524,6 +20557,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"VoiceMMode1_Tx Mixer", "TERT_AUX_PCM_TX_MMode1", "TERT_AUX_PCM_TX"},









	{"VoiceMMode1_Tx Mixer", "QUAT_AUX_PCM_TX_MMode1", "QUAT_AUX_PCM_TX"},









	{"VoiceMMode1_Tx Mixer", "QUAT_TDM_TX_0_MMode1", "QUAT_TDM_TX_0"},









	{"VoiceMMode1_Tx Mixer", "PROXY_TX_MMode1", "PROXY_TX"},









	{"VOICEMMODE1_UL", NULL, "VoiceMMode1_Tx Mixer"},

















	{"VoiceMMode2_Tx Mixer", "PRI_TX_MMode2", "PRI_I2S_TX"},








@@ -20541,6 +20575,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"VoiceMMode2_Tx Mixer", "SEC_AUX_PCM_TX_MMode2", "SEC_AUX_PCM_TX"},









	{"VoiceMMode2_Tx Mixer", "TERT_AUX_PCM_TX_MMode2", "TERT_AUX_PCM_TX"},









	{"VoiceMMode2_Tx Mixer", "QUAT_AUX_PCM_TX_MMode2", "QUAT_AUX_PCM_TX"},









	{"VoiceMMode2_Tx Mixer", "PROXY_TX_MMode2", "PROXY_TX"},









	{"VOICEMMODE2_UL", NULL, "VoiceMMode2_Tx Mixer"},

















	{"Voip_Tx Mixer", "PRI_TX_Voip", "PRI_I2S_TX"},








@@ -21370,6 +21405,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"BE_OUT", NULL, "QUAT_MI2S_RX_2"},









	{"BE_OUT", NULL, "QUAT_MI2S_RX_3"},









	{"BE_OUT", NULL, "QUAT_MI2S_RX_4"},









	{"BE_OUT", NULL, "PROXY_RX"},

















	{"PRI_I2S_TX", NULL, "BE_IN"},









	{"MI2S_TX", NULL, "BE_IN"},








@@ -21445,6 +21481,7 @@ static const struct snd_soc_dapm_route intercon[] = {







	{"QUAT_TDM_TX_1", NULL, "BE_IN"},









	{"QUAT_TDM_TX_2", NULL, "BE_IN"},









	{"QUAT_TDM_TX_3", NULL, "BE_IN"},









	{"PROXY_TX", NULL, "BE_IN"},









};

















static int msm_pcm_routing_hw_params(struct snd_pcm_substream *substream,

























sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h



+4
−0






























Original line number
Diff line number
Diff line







@@ -45,6 +45,8 @@







#define LPASS_BE_VOICE2_PLAYBACK_TX "VOICE2_PLAYBACK_TX"









#define LPASS_BE_INCALL_RECORD_RX "INCALL_RECORD_RX"









#define LPASS_BE_INCALL_RECORD_TX "INCALL_RECORD_TX"









#define LPASS_BE_PROXY_RX "PROXY_RX"









#define LPASS_BE_PROXY_TX "PROXY_TX"









#define LPASS_BE_SEC_I2S_RX "SECONDARY_I2S_RX"









#define LPASS_BE_SPDIF_RX "SPDIF_RX"


















@@ -429,6 +431,8 @@ enum {







	MSM_BACKEND_DAI_QUATERNARY_MI2S_TX_2,









	MSM_BACKEND_DAI_QUATERNARY_MI2S_TX_3,









	MSM_BACKEND_DAI_QUATERNARY_MI2S_TX_4,









	MSM_BACKEND_DAI_PROXY_RX,









	MSM_BACKEND_DAI_PROXY_TX,









	MSM_BACKEND_DAI_MAX,









};