ASoC: qcom: fixes and improvements
Subsystems (5)
v2 cover ASoC: qcom: fixes and improvements
v2:
- add stable, fixes, and pull R-b for the first (q6afe) patch
- add channel assignments to the sm8250 TDM patch
v1: https://lore.kernel.org/all/[email protected]/
Val Packett (6):
ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
ASoC: qcom: qdsp6: q6routing: add Senary MI2S ports
ASoC: qcom: sm8250: add Senary MI2S RX support
ASoC: qcom: sm8250: add TDM RX support
ASoC: qcom: sm8250: shut down MI2S/TDM AFE port clocks
ASoC: qcom: sm8250: apply codec_fmt to all codec DAIs
sound/soc/qcom/qdsp6/q6afe.c | 10 +- sound/soc/qcom/qdsp6/q6routing.c | 11 ++ sound/soc/qcom/sm8250.c | 284 +++++++++++++++++++++++++++++-- 3 files changed, 285 insertions(+), 20 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/6 ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
The response sent by the firmware when requesting a clock vote (opcode AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST) does not actually have the same opcode + status payload as APR_BASIC_RSP_RESULT. Rather, it returns one single u32 which is the client_handle that must be used in future unvote requests for the same clock.
As a result of this type confusion, the status returned by the callback to q6afe_vote_lpass_core_hw was actually an out-of-bounds read. It was only interpreted as success (0) most of the time due to luck, but there are some reports of random errors such as:
[ 20.961100] qcom-q6afe aprsvc:service:4:4: AFE failed to vote (3) [ 20.961131] Failed to prepare clk 'core': -110
Fix by correctly interpreting the response as a single u32, and actually store it as the client_handle to ensure unvote would work correctly.
--- sound/soc/qcom/qdsp6/q6afe.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/soc/qcom/qdsp6/q6afe.c +8 -2
@@ -379,6 +379,7 @@ struct q6afe {struct q6core_svc_api_info ainfo;struct mutex lock;struct aprv2_ibasic_rsp_result_t result; +uint32_t vote_result;wait_queue_head_t wait;struct list_head port_list;spinlock_t port_list_lock;
@@ -968,13 +969,14 @@ static int q6afe_callback(struct apr_device *adev, const struct apr_resp_pkt *daconst struct aprv2_ibasic_rsp_result_t *res;const struct apr_hdr *hdr = &data->hdr;struct q6afe_port *port; +uint32_t *vote_res;if (!data->payload_size)return 0 ; - res = data->payload;switch (hdr->opcode) {case APR_BASIC_RSP_RESULT : { + res = data->payload;if (res->status) {dev_err (afe->dev,"cmd = 0x%x returned error = 0x%x\n" , res->opcode, res->status);
@@ -1001,8 +1003,10 @@ static int q6afe_callback(struct apr_device *adev, const struct apr_resp_pkt *da }break ;case AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST : + vote_res = data->payload; afe->result.opcode = hdr->opcode; - afe->result.status = res->status; + afe->result.status =0 ; + afe->vote_result = *vote_res;wake_up (&afe->wait);break ;default :
@@ -1899,6 +1903,8 @@ int q6afe_vote_lpass_core_hw(struct device *dev, uint32_t hw_block_id, AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST);if (ret)dev_err (afe->dev,"AFE failed to vote (%d)\n" , hw_block_id); +else + *client_handle = afe->vote_result;return ret; }
Signature · 1 line
2.53.0
Mark Brown
maintainerRe: [PATCH v2 1/6] ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
Quoted 5 lines · Val Packett
The response sent by the firmware when requesting a clock vote (opcode
AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST) does not actually have the same opcode + status payload asAPR_BASIC_RSP_RESULT. Rather, it returns one single u32 which is theclient_handlethat must be used in future unvote requests for the same clock.
Please send cover letters for your serieses, it helps tooling. Please also supply inter version changelogs.
Re: [PATCH v2 1/6] ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
Quoted 8 lines · Mark Brown
Quoted 5 lines · Val Packett
The response sent by the firmware when requesting a clock vote (opcode
AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST) does not actually have the same opcode + status payload asAPR_BASIC_RSP_RESULT. Rather, it returns one single u32 which is theclient_handlethat must be used in future unvote requests for the same clock.Please send cover letters for your serieses, it helps tooling. Please also supply inter version changelogs.
ummm:
https://lore.kernel.org/all/[email protected]/
I even Cc'd all(?) the lists, as usual.. Oh, sorry- not stable@ I guess.
I didn't even realize the Cc from the sign-off section would actually immediately be used by git send-email, I thought it would only get sent to stable when merged.
~val
Mark Brown
maintainerRe: [PATCH v2 1/6] ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
Quoted 10 lines · Val Packett
Quoted 2 lines · Mark Brown
Please send cover letters for your serieses, it helps tooling. Please also supply inter version changelogs.
ummm:
https://lore.kernel.org/all/[email protected]/
I even Cc'd all(?) the lists, as usual.. Oh, sorry- not stable@ I guess.
Nor me, if the mail doesn't end up in my inbox then I'm going to have no idea that it exists. You need to not only write a cover letter, but also send it to the relevant maintainers just like the patches.
Re: [PATCH v2 1/6] ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
Quoted 8 lines · Mark Brown
Quoted 6 lines · Val Packett
Quoted 2 lines · Mark Brown
Please send cover letters for your serieses, it helps tooling. Please also supply inter version changelogs.
ummm:
Quoted 7 lines
Quoted 3 lines
https://lore.kernel.org/all/[email protected]/
I even Cc'd all(?) the lists, as usual.. Oh, sorry- not stable@ I guess.
Nor me, if the mail doesn't end up in my inbox then I'm going to have no idea that it exists. You need to not only write a cover letter, but also send it to the relevant maintainers just like the patches.
(which the b4 tool will do for you)
Konrad
Mark Brown
maintainerRe: [PATCH v2 1/6] ASoC: qcom: qdsp6: q6afe: fix clk vote response type mismatch
Quoted 9 lines · Konrad Dybcio
Quoted 3 lines · Mark Brown
Nor me, if the mail doesn't end up in my inbox then I'm going to have no idea that it exists. You need to not only write a cover letter, but also send it to the relevant maintainers just like the patches.
(which the b4 tool will do for you)
TBH so will git send-email - it's a pretty unusual flow won't do this.
PATCH v2 2/6 ASoC: qcom: qdsp6: q6routing: add Senary MI2S ports
In reply to Val PackettThis commit adds support for senary MI2S mixers.
--- sound/soc/qcom/qdsp6/q6routing.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/qcom/qdsp6/q6routing.c +11 -0
@@ -68,6 +68,7 @@ { mix_name, "SEC_MI2S_TX", "SEC_MI2S_TX" }, \ { mix_name, "QUAT_MI2S_TX", "QUAT_MI2S_TX" }, \ { mix_name, "QUIN_MI2S_TX", "QUIN_MI2S_TX" }, \ + { mix_name, "SEN_MI2S_TX", "SEN_MI2S_TX" }, \ { mix_name, "TERT_MI2S_TX", "TERT_MI2S_TX" }, \ { mix_name, "SLIMBUS_0_TX", "SLIMBUS_0_TX" }, \ { mix_name, "SLIMBUS_1_TX", "SLIMBUS_1_TX" }, \
@@ -145,6 +146,9 @@SOC_SINGLE_EXT ("QUIN_MI2S_TX" ,QUINARY_MI2S_TX , \ id,1 ,0 , msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \ +SOC_SINGLE_EXT ("SEN_MI2S_TX" ,SENARY_MI2S_TX , \ + id,1 ,0 , msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \SOC_SINGLE_EXT ("SLIMBUS_0_TX" ,SLIMBUS_0_TX , \ id,1 ,0 , msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \
@@ -535,6 +539,9 @@ static const struct snd_kcontrol_new quaternary_mi2s_rx_mixer_controls[] = {static const struct snd_kcontrol_new quinary_mi2s_rx_mixer_controls[] = {Q6ROUTING_RX_MIXERS (QUINARY_MI2S_RX ) }; +static const struct snd_kcontrol_new senary_mi2s_rx_mixer_controls[] = { +Q6ROUTING_RX_MIXERS (SENARY_MI2S_RX ) }; +static const struct snd_kcontrol_new tertiary_mi2s_rx_mixer_controls[] = {Q6ROUTING_RX_MIXERS (TERTIARY_MI2S_RX ) };
@@ -777,6 +784,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {SND_SOC_DAPM_MIXER ("QUIN_MI2S_RX Audio Mixer" ,SND_SOC_NOPM ,0 ,0 , quinary_mi2s_rx_mixer_controls,ARRAY_SIZE (quinary_mi2s_rx_mixer_controls)), +SND_SOC_DAPM_MIXER ("SEN_MI2S_RX Audio Mixer" ,SND_SOC_NOPM ,0 ,0 , + senary_mi2s_rx_mixer_controls, +ARRAY_SIZE (senary_mi2s_rx_mixer_controls)),SND_SOC_DAPM_MIXER ("TERT_MI2S_RX Audio Mixer" ,SND_SOC_NOPM ,0 ,0 , tertiary_mi2s_rx_mixer_controls, ARRAY_SIZE(tertiary_mi2s_rx_mixer_controls)),
@@ -969,6 +979,7 @@ static const struct snd_soc_dapm_route intercon[] = {Q6ROUTING_RX_DAPM_ROUTE ("SLIMBUS_6_RX Audio Mixer" ,"SLIMBUS_6_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("QUAT_MI2S_RX Audio Mixer" ,"QUAT_MI2S_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("QUIN_MI2S_RX Audio Mixer" ,"QUIN_MI2S_RX" ), +Q6ROUTING_RX_DAPM_ROUTE ("SEN_MI2S_RX Audio Mixer" ,"SEN_MI2S_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("TERT_MI2S_RX Audio Mixer" ,"TERT_MI2S_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("SEC_MI2S_RX Audio Mixer" ,"SEC_MI2S_RX" ), Q6ROUTING_RX_DAPM_ROUTE("PRI_MI2S_RX Audio Mixer", "PRI_MI2S_RX"),
Signature · 1 line
2.53.0
Re: [PATCH v2 2/6] ASoC: qcom: qdsp6: q6routing: add Senary MI2S ports
Quoted 4 lines · Val Packett
This commit adds support for senary MI2S mixers.
Signed-off-by Val Packett <[email protected]>---
lgtm,
Quoted 53 lines
sound/soc/qcom/qdsp6/q6routing.c | 11 +++++++++++ 1 file changed, 11 insertions(+)sound/soc/qcom/qdsp6/q6routing.c +11
-0@@ -68,6 +68,7 @@ { mix_name, "SEC_MI2S_TX", "SEC_MI2S_TX" }, \ { mix_name, "QUAT_MI2S_TX", "QUAT_MI2S_TX" }, \ { mix_name, "QUIN_MI2S_TX", "QUIN_MI2S_TX" }, \ + { mix_name, "SEN_MI2S_TX", "SEN_MI2S_TX" }, \ { mix_name, "TERT_MI2S_TX", "TERT_MI2S_TX" }, \ { mix_name, "SLIMBUS_0_TX", "SLIMBUS_0_TX" }, \ { mix_name, "SLIMBUS_1_TX", "SLIMBUS_1_TX" }, \@@ -145,6 +146,9 @@SOC_SINGLE_EXT ("QUIN_MI2S_TX" ,QUINARY_MI2S_TX , \ id,1 ,0 , msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \ +SOC_SINGLE_EXT ("SEN_MI2S_TX" ,SENARY_MI2S_TX , \ + id,1 ,0 , msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \SOC_SINGLE_EXT ("SLIMBUS_0_TX" ,SLIMBUS_0_TX , \ id,1 ,0 , msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \@@ -535,6 +539,9 @@ static const struct snd_kcontrol_new quaternary_mi2s_rx_mixer_controls[] = {static const struct snd_kcontrol_new quinary_mi2s_rx_mixer_controls[] = {Q6ROUTING_RX_MIXERS (QUINARY_MI2S_RX ) }; +static const struct snd_kcontrol_new senary_mi2s_rx_mixer_controls[] = { +Q6ROUTING_RX_MIXERS (SENARY_MI2S_RX ) }; +static const struct snd_kcontrol_new tertiary_mi2s_rx_mixer_controls[] = {Q6ROUTING_RX_MIXERS (TERTIARY_MI2S_RX ) };@@ -777,6 +784,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {SND_SOC_DAPM_MIXER ("QUIN_MI2S_RX Audio Mixer" ,SND_SOC_NOPM ,0 ,0 , quinary_mi2s_rx_mixer_controls,ARRAY_SIZE (quinary_mi2s_rx_mixer_controls)), +SND_SOC_DAPM_MIXER ("SEN_MI2S_RX Audio Mixer" ,SND_SOC_NOPM ,0 ,0 , + senary_mi2s_rx_mixer_controls, +ARRAY_SIZE (senary_mi2s_rx_mixer_controls)),SND_SOC_DAPM_MIXER ("TERT_MI2S_RX Audio Mixer" ,SND_SOC_NOPM ,0 ,0 , tertiary_mi2s_rx_mixer_controls, ARRAY_SIZE(tertiary_mi2s_rx_mixer_controls)),@@ -969,6 +979,7 @@ static const struct snd_soc_dapm_route intercon[] = {Q6ROUTING_RX_DAPM_ROUTE ("SLIMBUS_6_RX Audio Mixer" ,"SLIMBUS_6_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("QUAT_MI2S_RX Audio Mixer" ,"QUAT_MI2S_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("QUIN_MI2S_RX Audio Mixer" ,"QUIN_MI2S_RX" ), +Q6ROUTING_RX_DAPM_ROUTE ("SEN_MI2S_RX Audio Mixer" ,"SEN_MI2S_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("TERT_MI2S_RX Audio Mixer" ,"TERT_MI2S_RX" ),Q6ROUTING_RX_DAPM_ROUTE ("SEC_MI2S_RX Audio Mixer" ,"SEC_MI2S_RX" ), Q6ROUTING_RX_DAPM_ROUTE("PRI_MI2S_RX Audio Mixer", "PRI_MI2S_RX"),
PATCH v2 3/6 ASoC: qcom: sm8250: add Senary MI2S RX support
In reply to Val PackettAdd support for the SENARY_MI2S_RX DAI which is used on some devices to send audio data to speaker amplifiers.
--- sound/soc/qcom/sm8250.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/qcom/sm8250.c +8 -0
@@ -112,6 +112,14 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ; +case SENARY_MI2S_RX : + codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (cpu_dai, fmt); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ;default :break ; }
Signature · 1 line
2.53.0
Re: [PATCH v2 3/6] ASoC: qcom: sm8250: add Senary MI2S RX support
Quoted 5 lines · Val Packett
Add support for the
SENARY_MI2S_RXDAI which is used on some devices to send audio data to speaker amplifiers.Signed-off-by Val Packett <[email protected]>---
Quoted 22 lines
sound/soc/qcom/sm8250.c | 8 ++++++++ 1 file changed, 8 insertions(+)sound/soc/qcom/sm8250.c +8
-0@@ -112,6 +112,14 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ; +case SENARY_MI2S_RX : + codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (cpu_dai, fmt); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ;default :break ; }
PATCH v2 4/6 ASoC: qcom: sm8250: add TDM RX support
In reply to Val PackettAdd support for TDM RX DAIs which are used on some devices to send audio data to speaker amplifiers. Channels are assigned based on the codec DAI names for a quad-speaker setup such as on the xiaomi-pipa tablet.
--- sound/soc/qcom/sm8250.c | 141 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+)
sound/soc/qcom/sm8250.c +141 -0
@@ -17,6 +17,10 @@#include "sdw.h" #define MI2S_BCLK_RATE 1536000 +#define TDM_BCLK_RATE 6144000 +#define NUM_TDM_SLOTS 8 + +static unsigned int tdm_slot_offset[8 ] = {0 ,4 ,8 ,12 ,16 ,20 ,24 ,28 };struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ];
@@ -55,6 +59,89 @@ static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) } +static int sm8250_tdm_snd_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); +struct snd_soc_dai *codec_dai; +unsigned int rx_mask; +int ret =0 , j; +int channels, slot_width; + +switch (params_format (params)) { +case SNDRV_PCM_FORMAT_S16_LE : + slot_width =16 ; +break ; +default : +dev_err (rtd->dev,"%s: invalid param format 0x%x\n" , + __func__,params_format (params)); +return -EINVAL ; + } + + channels =params_channels (params); + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + ret =snd_soc_dai_set_tdm_slot (cpu_dai,0 ,0x3 , +8 , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); + goto end; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai,0 ,NULL , + channels, tdm_slot_offset); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); + goto end; + } + }else { + ret =snd_soc_dai_set_tdm_slot (cpu_dai,0xf ,0 , +8 , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); + goto end; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai, channels, + tdm_slot_offset,0 ,NULL ); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); + goto end; + } + } + +for_each_rtd_codec_dais (rtd, j, codec_dai) { +if (strstr (codec_dai->component->name_prefix,"PL" )) { + rx_mask =BIT (0 ); + }else if (strstr (codec_dai->component->name_prefix,"PR" )) { + rx_mask =BIT (1 ); + }else if (strstr (codec_dai->component->name_prefix,"SL" )) { + rx_mask =BIT (2 ); + }else if (strstr (codec_dai->component->name_prefix,"SR" )) { + rx_mask =BIT (3 ); + }else { + rx_mask =0 ; +dev_warn (rtd->dev,"%s: codec DAI name '%s' not recognized\n" , + __func__, codec_dai->component->name_prefix); + } + ret =snd_soc_dai_set_tdm_slot (codec_dai,0 , rx_mask, +NUM_TDM_SLOTS , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set TDM slot, err:%d\n" , + __func__, ret); + goto end; + } + } + +end: +return ret; +} +static int sm8250_be_hw_params_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {
@@ -120,6 +207,41 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ; +case PRIMARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case SECONDARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case TERTIARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case QUATERNARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case QUINARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ;default :break ; }
@@ -145,10 +267,29 @@ static int sm8250_snd_hw_free(struct snd_pcm_substream *substream)return qcom_snd_sdw_hw_free (substream, &data->stream_prepared[cpu_dai->id]); } +static int sm8250_snd_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); +int ret =0 ; + +switch (cpu_dai->id) { + case PRIMARY_TDM_RX_0...QUINARY_TDM_TX_7: + ret =sm8250_tdm_snd_hw_params (substream, params); +break ; +default : +break ; + } + +return ret; +} +static const struct snd_soc_ops sm8250_be_ops = { .startup = sm8250_snd_startup, .shutdown = qcom_snd_sdw_shutdown, .hw_free = sm8250_snd_hw_free, + .hw_params = sm8250_snd_hw_params, .prepare = sm8250_snd_prepare, };
Signature · 1 line
2.53.0
Re: [PATCH v2 4/6] ASoC: qcom: sm8250: add TDM RX support
Quoted 14 lines · Val Packett
Add support for TDM RX DAIs which are used on some devices to send audio data to speaker amplifiers. Channels are assigned based on the codec DAI names for a quad-speaker setup such as on the xiaomi-pipa tablet.
Signed-off-by Val Packett <[email protected]>--- sound/soc/qcom/sm8250.c | 141 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+)sound/soc/qcom/sm8250.c +0
-0
sound/soc/qcom/sm8250.c line 23
Quoted 7 lines
sound/soc/qcom/sm8250.c +4
-0@@ -17,6 +17,10 @@#include "sdw.h" #define MI2S_BCLK_RATE 1536000 +#define TDM_BCLK_RATE 6144000 +#define NUM_TDM_SLOTS 8 + +static unsigned int tdm_slot_offset[8 ] = {0 ,4 ,8 ,12 ,16 ,20 ,24 ,28 };
static const ?
Quoted 11 lines
sound/soc/qcom/sm8250.c +4
-0struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ];@@ -55,6 +59,89 @@ static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) } +static int sm8250_tdm_snd_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 75
Quoted 10 lines
sound/soc/qcom/sm8250.c +10
-0+struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); +struct snd_soc_dai *codec_dai; +unsigned int rx_mask; +int ret =0 , j; +int channels, slot_width; + +switch (params_format (params)) { +case SNDRV_PCM_FORMAT_S16_LE : + slot_width =16 ; +break ;
Any reason only S16?
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 85
Quoted 10 lines
sound/soc/qcom/sm8250.c +10
-0+default : +dev_err (rtd->dev,"%s: invalid param format 0x%x\n" , + __func__,params_format (params)); +return -EINVAL ; + } + + channels =params_channels (params); + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0, 0x3,
Please define the magic constants like 0x3 here.
Quoted 25 lines
sound/soc/qcom/sm8250.c +25
-0+ 8, slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); + goto end; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai,0 ,NULL , + channels, tdm_slot_offset); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); + goto end; + } + }else { + ret =snd_soc_dai_set_tdm_slot (cpu_dai,0xf ,0 , +8 , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); + goto end; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai, channels, + tdm_slot_offset,0 ,NULL );
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 119
Quoted 10 lines
sound/soc/qcom/sm8250.c +9
-0+if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); + goto end; + } + } + +for_each_rtd_codec_dais (rtd, j, codec_dai) { +if (strstr (codec_dai->component->name_prefix,"PL" )) {
name prefix can be null.
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 121
Quoted 2 lines
sound/soc/qcom/sm8250.c +2
-0+ rx_mask =BIT (0 ); + }else if (strstr (codec_dai->component->name_prefix,"PR" )) {
name prefix comparision is fragile design, this will break very soon. and this is not a binding too.
This also raises question about the using this generic driver for such specific combination. Can these be made specific to compatible ?
Quoted 6 lines
sound/soc/qcom/sm8250.c +6
-0+ rx_mask =BIT (1 ); + }else if (strstr (codec_dai->component->name_prefix,"SL" )) { + rx_mask =BIT (2 ); + }else if (strstr (codec_dai->component->name_prefix,"SR" )) { + rx_mask =BIT (3 ); + }else {
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 134
Quoted 10 lines
sound/soc/qcom/sm8250.c +7
-0+ rx_mask =0 ; +dev_warn (rtd->dev,"%s: codec DAI name '%s' not recognized\n" , + __func__, codec_dai->component->name_prefix); + } + ret =snd_soc_dai_set_tdm_slot (codec_dai,0 , rx_mask, +NUM_TDM_SLOTS , slot_width); +if (ret <0 ) {
Can we handle -ENOSUPP?
Quoted 85 lines
sound/soc/qcom/sm8250.c +64
-0+dev_err (rtd->dev,"%s: failed to set TDM slot, err:%d\n" , + __func__, ret); + goto end; + } + } + +end: +return ret; +} +static int sm8250_be_hw_params_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {@@ -120,6 +207,41 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ; +case PRIMARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case SECONDARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case TERTIARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case QUATERNARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ; +case QUINARY_TDM_RX_0 : + codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +break ;default :break ; }@@ -145,10 +267,29 @@ static int sm8250_snd_hw_free(struct snd_pcm_substream *substream)return qcom_snd_sdw_hw_free (substream, &data->stream_prepared[cpu_dai->id]); } +static int sm8250_snd_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); +int ret =0 ; + +switch (cpu_dai->id) { + case PRIMARY_TDM_RX_0...QUINARY_TDM_TX_7: + ret =sm8250_tdm_snd_hw_params (substream, params); +break ; +default : +break ; + } + +return ret; +} +static const struct snd_soc_ops sm8250_be_ops = { .startup = sm8250_snd_startup, .shutdown = qcom_snd_sdw_shutdown, .hw_free = sm8250_snd_hw_free, + .hw_params = sm8250_snd_hw_params, .prepare = sm8250_snd_prepare, };
Re: [PATCH v2 4/6] ASoC: qcom: sm8250: add TDM RX support
Quoted 17 lines · Srinivas Kandagatla
Quoted 16 lines · Val Packett
Add support for TDM RX DAIs which are used on some devices to send audio data to speaker amplifiers. Channels are assigned based on the codec DAI names for a quad-speaker setup such as on the xiaomi-pipa tablet.
Signed-off-by Val Packett <[email protected]>--- sound/soc/qcom/sm8250.c | 141 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+)sound/soc/qcom/sm8250.c +0
-0@@ -17,6 +17,10 @@#include "sdw.h"
Quoted 6 lines
sound/soc/qcom/sm8250.c line 23
Quoted 5 lines
sound/soc/qcom/sm8250.c +4
-0#define MI2S_BCLK_RATE 1536000 +#define TDM_BCLK_RATE 6144000 +#define NUM_TDM_SLOTS 8 + +static unsigned int tdm_slot_offset[8 ] = {0 ,4 ,8 ,12 ,16 ,20 ,24 ,28 };static const ?
ack
Quoted 6 lines
Quoted 6 lines
sound/soc/qcom/sm8250.c +0
-0struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ];@@ -55,6 +59,89 @@ static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) }
Quoted 15 lines
Quoted 4 lines
sound/soc/qcom/sm8250.c +4
-0+static int sm8250_tdm_snd_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 75
Quoted 10 lines
sound/soc/qcom/sm8250.c +10
-0+struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); +struct snd_soc_dai *codec_dai; +unsigned int rx_mask; +int ret =0 , j; +int channels, slot_width; + +switch (params_format (params)) { +case SNDRV_PCM_FORMAT_S16_LE : + slot_width =16 ; +break ;Any reason only S16?
The entire driver is "locked" to S16 since 89be3c15a58b ("ASoC: qcom: sm8250: explicitly set format in sm8250_be_hw_params_fixup()"). Which was due to compressed playback, according to that commit message.. But in reality there's also hardcoded MI2S_BCLK_RATE (so I did the same thing for TDM for now).
I cooould try unhardcoding that, but this kind of thing is really annoying to test with the whole combinatorial explosion of parameters x_x
Quoted 39 lines
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 85
Quoted 10 lines
sound/soc/qcom/sm8250.c +10
-0+default : +dev_err (rtd->dev,"%s: invalid param format 0x%x\n" , + __func__,params_format (params)); +return -EINVAL ; + } + + channels =params_channels (params); + +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0, 0x3,Please define the magic constants like
0x3here.Quoted 27 lines
sound/soc/qcom/sm8250.c +27
-0+ 8, slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); + goto end; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai,0 ,NULL , + channels, tdm_slot_offset); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set channel map, err:%d\n" , + __func__, ret); + goto end; + } + }else { + ret =snd_soc_dai_set_tdm_slot (cpu_dai,0xf ,0 , +8 , slot_width); +if (ret <0 ) { +dev_err (rtd->dev,"%s: failed to set tdm slot, err:%d\n" , + __func__, ret); + goto end; + } + + ret =snd_soc_dai_set_channel_map (cpu_dai, channels, + tdm_slot_offset,0 ,NULL ); +if (ret <0 ) { + dev_err(rtd->dev, "%s: failed to set channel map, err:%d\n",
Quoted 8 lines
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 119
Quoted 7 lines
sound/soc/qcom/sm8250.c +7
-0+ __func__, ret); + goto end; + } + } + +for_each_rtd_codec_dais (rtd, j, codec_dai) { +if (strstr (codec_dai->component->name_prefix,"PL" )) {name prefix can be null.
ack
Quoted 4 lines
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 121
Quoted 2 lines
sound/soc/qcom/sm8250.c +2
-0+ rx_mask =BIT (0 ); + }else if (strstr (codec_dai->component->name_prefix,"PR" )) {name prefix comparision is fragile design, this will break very soon. and this is not a binding too.
Right, but how would one even define a binding when this is supposed to be(?) part of the sndcard and the prefixes themselves are set on codecs' own nodes..?
I just copied what's been done for sdm845 so far, even though it doesn't seem great to me either.
Quoted 2 lines
This also raises question about the using this generic driver for such specific combination. Can these be made specific to compatible ?
Yeah, sure. I don't think we'll see other combinations in practice though, for 2 channels regular I2S is used, the only reason for TDM is to have 4 channels. Or more but I don't think any device has more than 4. (And surely no one has 3..)
Quoted 6 lines
Quoted 6 lines
sound/soc/qcom/sm8250.c +6
-0+ rx_mask =BIT (1 ); + }else if (strstr (codec_dai->component->name_prefix,"SL" )) { + rx_mask =BIT (2 ); + }else if (strstr (codec_dai->component->name_prefix,"SR" )) { + rx_mask =BIT (3 ); + }else {
Quoted 8 lines
sound/soc/qcom/sm8250.c static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) · line 134
Quoted 7 lines
sound/soc/qcom/sm8250.c +7
-0+ rx_mask =0 ; +dev_warn (rtd->dev,"%s: codec DAI name '%s' not recognized\n" , + __func__, codec_dai->component->name_prefix); + } + ret =snd_soc_dai_set_tdm_slot (codec_dai,0 , rx_mask, +NUM_TDM_SLOTS , slot_width); +if (ret <0 ) {Can we handle
-ENOSUPP?
By not erroring out here? Yeah
Quoted 1 line
[..]
Thanks,
~val
PATCH v2 5/6 ASoC: qcom: sm8250: shut down MI2S/TDM AFE port clocks
In reply to Val PackettThese port clocks were never being turned off, leading to increased power consumption after a sound was played through any of these ports for the first time. Use enable counters to disable the clocks in the shutdown callback, similar to how it's done for sdm845.
--- sound/soc/qcom/sm8250.c | 150 +++++++++++++++++++++++++++++++--------- 1 file changed, 119 insertions(+), 31 deletions(-)
sound/soc/qcom/sm8250.c +119 -31
@@ -24,6 +24,7 @@ static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28};struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ]; +uint32_t clk_count[AFE_PORT_MAX ];struct snd_soc_card *card;struct snd_soc_jack jack;struct snd_soc_jack usb_offload_jack;
@@ -163,83 +164,95 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)unsigned int fmt =SND_SOC_DAIFMT_BP_FP ;unsigned int codec_dai_fmt =SND_SOC_DAIFMT_BC_FC ;struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_card *card = rtd->card; +struct sm8250_snd_data *data =snd_soc_card_get_drvdata (card);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct snd_soc_dai *codec_dai =snd_soc_rtd_to_codec (rtd,0 );switch (cpu_dai->id) {case PRIMARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[PRIMARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[SECONDARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[TERTIARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[QUINARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SENARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[SENARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case PRIMARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[PRIMARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[SECONDARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[TERTIARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUATERNARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[QUATERNARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[QUINARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;default :
@@ -249,6 +262,81 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)return qcom_snd_sdw_startup (substream); } +static void sm8250_snd_shutdown (struct snd_pcm_substream *substream) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_card *card = rtd->card; +struct sm8250_snd_data *data =snd_soc_card_get_drvdata (card); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); + +switch (cpu_dai->id) { +case PRIMARY_MI2S_RX : +if (--(data->clk_count[PRIMARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case SECONDARY_MI2S_RX : +if (--(data->clk_count[SECONDARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case TERTIARY_MI2S_RX : +if (--(data->clk_count[TERTIARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case QUINARY_MI2S_RX : +if (--(data->clk_count[QUINARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case SENARY_MI2S_RX : +if (--(data->clk_count[SENARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case PRIMARY_TDM_RX_0 : +if (--(data->clk_count[PRIMARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case SECONDARY_TDM_RX_0 : +if (--(data->clk_count[SECONDARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case TERTIARY_TDM_RX_0 : +if (--(data->clk_count[TERTIARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case QUATERNARY_TDM_RX_0 : +if (--(data->clk_count[QUATERNARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case QUINARY_TDM_RX_0 : +if (--(data->clk_count[QUINARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +default : +break ; + } + +qcom_snd_sdw_shutdown (substream); +} +static int sm8250_snd_prepare (struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);
@@ -287,7 +375,7 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream,static const struct snd_soc_ops sm8250_be_ops = { .startup = sm8250_snd_startup, - .shutdown = qcom_snd_sdw_shutdown, + .shutdown = sm8250_snd_shutdown, .hw_free = sm8250_snd_hw_free, .hw_params = sm8250_snd_hw_params, .prepare = sm8250_snd_prepare,
Signature · 1 line
2.53.0
Re: [PATCH v2 5/6] ASoC: qcom: sm8250: shut down MI2S/TDM AFE port clocks
Quoted 15 lines · Val Packett
These port clocks were never being turned off, leading to increased power consumption after a sound was played through any of these ports for the first time. Use enable counters to disable the clocks in the shutdown callback, similar to how it's done for sdm845.
Signed-off-by Val Packett <[email protected]>--- sound/soc/qcom/sm8250.c | 150 +++++++++++++++++++++++++++++++--------- 1 file changed, 119 insertions(+), 31 deletions(-)sound/soc/qcom/sm8250.c +0
-0
sound/soc/qcom/sm8250.c static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28}; · line 27
Quoted 4 lines
sound/soc/qcom/sm8250.c +1
-0@@ -24,6 +24,7 @@ static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28};struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ]; +uint32_t clk_count[AFE_PORT_MAX ];
In your setup are you sharing BE dais to multiple FE?
if not you would really not need the count, startup and shutdown are paired for single PCM stream.
If yes, then you need some protection against these counters.
Quoted 220 lines
sound/soc/qcom/sm8250.c +118
-31struct snd_soc_card *card;struct snd_soc_jack jack;struct snd_soc_jack usb_offload_jack;@@ -163,83 +164,95 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)unsigned int fmt =SND_SOC_DAIFMT_BP_FP ;unsigned int codec_dai_fmt =SND_SOC_DAIFMT_BC_FC ;struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_card *card = rtd->card; +struct sm8250_snd_data *data =snd_soc_card_get_drvdata (card);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 );struct snd_soc_dai *codec_dai =snd_soc_rtd_to_codec (rtd,0 );switch (cpu_dai->id) {case PRIMARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[PRIMARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[SECONDARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[TERTIARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[QUINARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SENARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , -MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[SENARY_MI2S_RX ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , +MI2S_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (cpu_dai, fmt);snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case PRIMARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[PRIMARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[SECONDARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[TERTIARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUATERNARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[QUATERNARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ; -snd_soc_dai_set_sysclk (cpu_dai, -Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , -TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); +if (++(data->clk_count[QUINARY_TDM_RX_0 ]) ==1 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , +TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK );snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;default :@@ -249,6 +262,81 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)return qcom_snd_sdw_startup (substream); } +static void sm8250_snd_shutdown (struct snd_pcm_substream *substream) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct snd_soc_card *card = rtd->card; +struct sm8250_snd_data *data =snd_soc_card_get_drvdata (card); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); + +switch (cpu_dai->id) { +case PRIMARY_MI2S_RX : +if (--(data->clk_count[PRIMARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case SECONDARY_MI2S_RX : +if (--(data->clk_count[SECONDARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case TERTIARY_MI2S_RX : +if (--(data->clk_count[TERTIARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case QUINARY_MI2S_RX : +if (--(data->clk_count[QUINARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case SENARY_MI2S_RX : +if (--(data->clk_count[SENARY_MI2S_RX ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case PRIMARY_TDM_RX_0 : +if (--(data->clk_count[PRIMARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case SECONDARY_TDM_RX_0 : +if (--(data->clk_count[SECONDARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case TERTIARY_TDM_RX_0 : +if (--(data->clk_count[TERTIARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case QUATERNARY_TDM_RX_0 : +if (--(data->clk_count[QUATERNARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +case QUINARY_TDM_RX_0 : +if (--(data->clk_count[QUINARY_TDM_RX_0 ]) ==0 ) +snd_soc_dai_set_sysclk (cpu_dai, +Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT , +0 ,SNDRV_PCM_STREAM_PLAYBACK ); +break ; +default : +break ; + } + +qcom_snd_sdw_shutdown (substream); +} +static int sm8250_snd_prepare (struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);@@ -287,7 +375,7 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream,static const struct snd_soc_ops sm8250_be_ops = { .startup = sm8250_snd_startup, - .shutdown = qcom_snd_sdw_shutdown, + .shutdown = sm8250_snd_shutdown, .hw_free = sm8250_snd_hw_free, .hw_params = sm8250_snd_hw_params, .prepare = sm8250_snd_prepare,
Re: [PATCH v2 5/6] ASoC: qcom: sm8250: shut down MI2S/TDM AFE port clocks
Quoted 22 lines · Srinivas Kandagatla
Quoted 15 lines · Val Packett
These port clocks were never being turned off, leading to increased power consumption after a sound was played through any of these ports for the first time. Use enable counters to disable the clocks in the shutdown callback, similar to how it's done for sdm845.
Signed-off-by Val Packett <[email protected]>--- sound/soc/qcom/sm8250.c | 150 +++++++++++++++++++++++++++++++--------- 1 file changed, 119 insertions(+), 31 deletions(-)sound/soc/qcom/sm8250.c +0
-0sound/soc/qcom/sm8250.c static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28}; · line 27
Quoted 4 lines
sound/soc/qcom/sm8250.c +1
-0@@ -24,6 +24,7 @@ static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28};struct sm8250_snd_data {bool stream_prepared[AFE_PORT_MAX ]; +uint32_t clk_count[AFE_PORT_MAX ];In your setup are you sharing BE dais to multiple FE?
Quoted 4 lines
if not you would really not need the count, startup and shutdown are paired for single PCM stream.
If yes, then you need some protection against these counters.
Hmm, possibly not? I don't entirely understand how the q6 hardware works, sorry.. Who's the BE in this situation?
Basically what we have is e.g.:
- a dai-link between speakers (<&aw88261_l>, <&aw88261_r>) and the digital interface they're connected to (<&q6afedai SENARY_MI2S_RX>) defined in the device tree
- one q6asmdai frontend (MultiMedia1) connected to it in the mixer, i.e. cset name='QUIN_MI2S_RX Audio Mixer MultiMedia1' 1
- VoiceMMode1 (currently only via an out-of-tree hacky patchset but someone's reworking that) also connected to it like that during voice calls, but we can definitely "unplug" the MultiMedia when that happens
Quoted 1 line
[..]
Thanks,
~val
PATCH v2 6/6 ASoC: qcom: sm8250: apply codec_fmt to all codec DAIs
In reply to Val PackettWith MI2S and TDM interfaces, multiple codecs typically share one bus. All codecs on the bus should receive the same format configuration, so apply the codec_fmt to all of them.
--- sound/soc/qcom/sm8250.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
sound/soc/qcom/sm8250.c +22 -11
@@ -167,7 +167,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)struct snd_soc_card *card = rtd->card;struct sm8250_snd_data *data =snd_soc_card_get_drvdata (card);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); -struct snd_soc_dai *codec_dai =snd_soc_rtd_to_codec (rtd,0 ); +struct snd_soc_dai *codec_dai; +int j;switch (cpu_dai->id) {case PRIMARY_MI2S_RX :
@@ -177,7 +178,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;
@@ -186,7 +188,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;
@@ -195,7 +198,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;
@@ -204,7 +208,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SENARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;
@@ -213,7 +218,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case PRIMARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;
@@ -221,7 +227,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;
@@ -229,7 +236,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;
@@ -237,7 +245,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUATERNARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;
@@ -245,7 +254,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;
@@ -253,7 +263,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;default :break ;
Signature · 1 line
2.53.0
Re: [PATCH v2 6/6] ASoC: qcom: sm8250: apply codec_fmt to all codec DAIs
Quoted 24 lines · Val Packett
With MI2S and TDM interfaces, multiple codecs typically share one bus. All codecs on the bus should receive the same format configuration, so apply the
codec_fmtto all of them.Signed-off-by Val Packett <[email protected]>--- sound/soc/qcom/sm8250.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)sound/soc/qcom/sm8250.c +2
-1@@ -167,7 +167,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)struct snd_soc_card *card = rtd->card;struct sm8250_snd_data *data =snd_soc_card_get_drvdata (card);struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (rtd,0 ); -struct snd_soc_dai *codec_dai =snd_soc_rtd_to_codec (rtd,0 ); +struct snd_soc_dai *codec_dai; +int j;switch (cpu_dai->id) {case PRIMARY_MI2S_RX :
sound/soc/qcom/sm8250.c static int sm8250_snd_startup(struct snd_pcm_substream *substream) · line 182
Quoted 6 lines
sound/soc/qcom/sm8250.c +2
-1@@ -177,7 +178,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);
failures ignored,
Can we add a helper function would be nice here.
--srini
Quoted 93 lines
sound/soc/qcom/sm8250.c +18
-9break ;case SECONDARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;@@ -186,7 +188,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_SEC_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;@@ -195,7 +198,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_TER_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;@@ -204,7 +208,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SENARY_MI2S_RX : codec_dai_fmt |=SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_I2S ;@@ -213,7 +218,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)Q6AFE_LPASS_CLK_ID_SEN_MI2S_IBIT , MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);snd_soc_dai_set_fmt (cpu_dai, fmt); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case PRIMARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;@@ -221,7 +227,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_PRI_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case SECONDARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;@@ -229,7 +236,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_SEC_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case TERTIARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;@@ -237,7 +245,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_TER_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUATERNARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;@@ -245,7 +254,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_QUAD_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;case QUINARY_TDM_RX_0 : codec_dai_fmt |=SND_SOC_DAIFMT_IB_NF |SND_SOC_DAIFMT_DSP_B ;@@ -253,7 +263,8 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)snd_soc_dai_set_sysclk (cpu_dai,Q6AFE_LPASS_CLK_ID_QUIN_TDM_IBIT ,TDM_BCLK_RATE ,SNDRV_PCM_STREAM_PLAYBACK ); -snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt); +for_each_rtd_codec_dais (rtd, j, codec_dai) +snd_soc_dai_set_fmt (codec_dai, codec_dai_fmt);break ;default :break ;