From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81CFB41167F for ; Mon, 29 Jun 2026 14:29:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782743386; cv=none; b=Q+qK9csCI/7KDNwIbovcxp30fSeJO4PdNWQWjb/QCMPdawhYnJiO8ZaIeBU+g9jKF1NlyrWPytQ5Xk/krBe8FhwOmfPhKXTZfzreJb+PjMfMH+FrGIS5zy3ayESJ5gbpa29ywkvdC5QjDQSgGXqWyOAJTwCGHzy7vD9QmLE09+Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782743386; c=relaxed/simple; bh=YHdENS5QrybigwPmSYcvEIYxrBr1qKFyawa1kVuvA3U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Ckp5xKlTWkX43W2Db3SnJUTD9PjtPfU56bT4QkjbOMPw4Hbw1ZKz/htxBfdMJNHGp45ALg6BXpKvmxg82jdYXdXQ3liKltTQiJ5tO/IqgtS/Zg6u956cDrP75ERxRR56N6xMZp9uwSAorX8SuaqgMJTYCKNeWHID2VbT/ZCV8y8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=UTA96tLA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=GHGMIMmp; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="UTA96tLA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="GHGMIMmp" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65TATFSw2579199 for ; Mon, 29 Jun 2026 14:29:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= yrPfCVtzcYTluJGDibIbTcC2lDYpcbpvsZXAB5YYg58=; b=UTA96tLAEifRgAa5 FZDNJruqGHR9j/0I6myP22H0XA/Yhn8cgWybUCiV5oLasjuQaJnr9/RWwsfahbQw oi4u1y4/qe37tVUFej2wuElYm4Bi1UALqPQKhLBv9dGm7PPiy7l3mCcACoJRmuQ/ NqEHlfEk53VtzoROux0RvTeYWy7LPzrlyvIA0O2IIJa9ALko9laOCvJshbjl774T zta6rsgGXQtbTmu/0SoDv8UQaTrV0FR6ozrzaoEjJkpmE+Emj5s0+13ptkWqwsP7 MCoL3+3Uu/h+U3RTBjj16fwLzjctOs4fIG+kNmSjggzWedmVnEP3GdqfgYtEy4+z D3sGFg== Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f3kp7ht63-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 29 Jun 2026 14:29:43 +0000 (GMT) Received: by mail-vk1-f197.google.com with SMTP id 71dfb90a1353d-5bbd4255f46so839150e0c.0 for ; Mon, 29 Jun 2026 07:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782743383; x=1783348183; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=yrPfCVtzcYTluJGDibIbTcC2lDYpcbpvsZXAB5YYg58=; b=GHGMIMmpIj9HNiC9A68mRajxU9OmAtTw0A4dYs3rAlMPqOkxgj7r384tXkmwiNt9yf oGLG0IUr767HNmoVT1NmEGlDykloNv7+mOcr0Kux3et+aeHAksEZ4fLcJMbvh+0TTLkJ 1nRk7UXdPg2DlONZIBTYce6RFPA/9rELSRgCRZklchntEMNQt67t4POnmhQaDyIueobA SoUM91qYmDVxyQvDz01PUIJZW3gjds4hNB3k9GiM93ALrmgWmoFDb6ct+eVTGiy/r8uz 336GHfWEJtvLDZY7Q3MUzrkZMH3TBQrDZVA4OrlUEGocJsRwX9HmMwmUINjzH5O/uRNc 73oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782743383; x=1783348183; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yrPfCVtzcYTluJGDibIbTcC2lDYpcbpvsZXAB5YYg58=; b=q9D43z/XB23Ya7Y8UXLvyE6N4L0pUWg/EG2hhdnni8e/ZVEtFaA3XfQOLmdzglmPci KsUSDqDUF9trlk3eC7d+MRG5wWBoZMZ+k6WA8Qx62vmQ9BgoR/3MRervrhJPRzETlQrb h29tHCaZS8R9d0JCpOG+0TqTCK08RanGEZhPeuCiNayW3sqIJ7c1x2G5f+PtrHU0Ud4C bLWjTxXGnGAz3O5Cjx/2sETnCPNW7ewPocrio1B7YQASIw9DSNRyTDaxn33esBhfKrbK wRFwcqrbiTotj087C2xDvsPrQtUQ9rPS1LJ0pxV1tkZF8ZW3o/T9Y+W+6LkGJh+fhr8q yFQw== X-Forwarded-Encrypted: i=1; AHgh+RpWB6tjARpqljB2MAJ9IdeDcjHJbWA1n9l4fFqqiKOyBfgq55RzIScm4+yqevxRsz16vj6AiTN8/I/5vVo=@vger.kernel.org X-Gm-Message-State: AOJu0YyeoDQ7xqQYooWkeNUlpMNV01xEZ/JRYDQp5081Xpi0U/px37Np oCWD4SpIXTeLC51ljpw8C6MDi092yaHnNlv5PZ/VMMnO2qQVTpKsCMyOTXYNdYtze1OJ7AQo66v dQwaE6n89o+iF45N3JOZRnnPdruMSM9KCKQzh0ggv6hNnSllDr+cvw0KfJI8wJc8rkb0= X-Gm-Gg: AfdE7clY1cpdGVmDu68q9Yqnk+26WW+j47m+X0JbhCmkBOZTh8PnOJllkZw2tb2vM4l bN7t3UpGERpFJJnxsoF4ZYRJj5+a6xx3uA0jwNOiQGjAMbQuI3LYi20/LV7UWyfDvAI51hiuQGl Yj9c7htXqTnQZBevV81h8/b7fDXFL3MNSGnx4wUcLToOan6adbE4I0mRft/UqABWbdaBas5n25R H+vfGRuSZsCsTV+hbCV9h/NlwAsqZzUFTd5S2SyQw86IoQfA5XCPAx5Gaz3pnlyAjnCKabBDoB7 QNbQyzSwxvzC6BFmftnaBvxXU8oH5ehvMEq3U723DCGQB6l1GpdGDLen43rz2Pk4mZvQspKDWQX yUxP/VvlKRaMv7KUF4HdmG3hbtjZi94IePVSx+g== X-Received: by 2002:a05:6122:1785:b0:5bd:aba5:3830 with SMTP id 71dfb90a1353d-5bdba587a99mr533868e0c.0.1782743382667; Mon, 29 Jun 2026 07:29:42 -0700 (PDT) X-Received: by 2002:a05:6122:1785:b0:5bd:aba5:3830 with SMTP id 71dfb90a1353d-5bdba587a99mr533845e0c.0.1782743382102; Mon, 29 Jun 2026 07:29:42 -0700 (PDT) Received: from [192.168.68.120] ([5.133.47.210]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-6983a7f3989sm4367253a12.16.2026.06.29.07.29.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Jun 2026 07:29:41 -0700 (PDT) Message-ID: <6cc41123-6d6e-4a93-91c2-5a2035dfccba@oss.qualcomm.com> Date: Mon, 29 Jun 2026 15:29:40 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 1/2] ASoC: qcom: sdm845: skip set_channel_map for SDW stream DAIs To: Mohammad Rafi Shaik , Srinivas Kandagatla , Vinod Koul , Bard Liao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Mohammad Rafi Shaik Cc: Pierre-Louis Bossart , linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260629141633.86657-1-mohammad.rafi.shaik@oss.qualcomm.com> <20260629141633.86657-2-mohammad.rafi.shaik@oss.qualcomm.com> Content-Language: en-US From: Srinivas Kandagatla In-Reply-To: <20260629141633.86657-2-mohammad.rafi.shaik@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI5MDEyMCBTYWx0ZWRfXxYmTXvgQH7uE Hq7+4h3sAnHQIHFE04PMd3utNgVAVw0MXvitLNOu2pWipA+Zs0/MkgBoncRI45keiJfAR0Ea953 aczmnZ9q94RdMRj/MEWL/oszFGUxX5M= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI5MDEyMCBTYWx0ZWRfX1sPcQlyyO/3j 4g9owKAW6+wwLcxsYRoRiEVZEn2tpudbZzFIt0iRf8J0kiwT0QEDmnd5uh5DVysV+RkP8uA22ot Te851Szn84HbYVZcvtxJ67lt+aB3P7qp5dg7+5xkWUFtma+ywH4UHIae4rAY+5qJTaqPITmJH1+ vdA73FIXHfvfbnDYGNlj6vV5KzH8xTpq0WE+MJaXqdjIfyk7nZb7YvaTYwuOr/dSLPrxRjaK7YY vEbBVhCeWeeR8avFdNxwspL8GnzlvARvq1ijNDlVat0ULF+IDVHe1GC4/rUpUUVznBJT5pWETlj tq/C3B7f2qkjf1Sqryni6xOMSeIgNKqm/gG5Nhhp6sabzXvQbM9RA2fcrNj4Z2KXWRZ+79iK5tx YQR6JlDHi8aXPfzpg7ze6fuN313O97wJJpt/1f7RQoILdpJz6yUBgBG5y52sP3sVRmuOU/tsz7K intjMfmRUHvREpG4ZWg== X-Proofpoint-ORIG-GUID: q1NftUvXI8F7XSKL6tVIBPruvjLKATKU X-Authority-Analysis: v=2.4 cv=MZJcfZ/f c=1 sm=1 tr=0 ts=6a428157 cx=c_pps a=JIY1xp/sjQ9K5JH4t62bdg==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=UGUCIWXfjIFFGtpqo3QA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=tNoRWFLymzeba-QzToBc:22 X-Proofpoint-GUID: q1NftUvXI8F7XSKL6tVIBPruvjLKATKU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-29_03,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 clxscore=1015 phishscore=0 bulkscore=0 impostorscore=0 spamscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606290120 On 6/29/26 3:16 PM, Mohammad Rafi Shaik wrote: > On sdm845 the SLIM Playback backend lists wcd934x alongside the qcom > SoundWire master and its SWR slave speaker codecs as codec DAIs on the > same link. sdm845_dai_init() was calling set_channel_map with hardcoded > wcd934x SLIM channel numbers for every codec DAI on that link, including > the SoundWire ones, corrupting their channel configuration. > > Skip set_channel_map for any DAI that implements .set_stream, as that op > is the distinguishing marker of DAIs that own an SDW stream path — both > the qcom SWR master and SWR slave codecs register it, while wcd934x does > not. This confines the SLIM channel map to wcd934x where it belongs. > > Signed-off-by: Mohammad Rafi Shaik > --- > sound/soc/qcom/sdm845.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c > index 0ce9dff4dc52..509d7a551397 100644 > --- a/sound/soc/qcom/sdm845.c > +++ b/sound/soc/qcom/sdm845.c > @@ -294,13 +294,26 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd) > return 0; > > for_each_rtd_codec_dais(rtd, i, codec_dai) { > - rval = snd_soc_dai_set_channel_map(codec_dai, > - ARRAY_SIZE(tx_ch), > - tx_ch, > - ARRAY_SIZE(rx_ch), > - rx_ch); > - if (rval != 0 && rval != -ENOTSUPP) > - return rval; > + component = codec_dai->component; > + > + if (!component || !component->dev) > + continue; > + > + /* > + * Only wcd934x (SLIM codec) needs these static channel maps. > + * DAIs that own an SDW stream — the qcom SWR master and SWR > + * slave speaker codecs — implement .set_stream; skip them. > + */ > + if (!codec_dai->driver || !codec_dai->driver->ops || > + !codec_dai->driver->ops->set_stream) { This is totally a hack. --srini > + rval = snd_soc_dai_set_channel_map(codec_dai, > + ARRAY_SIZE(tx_ch), > + tx_ch, > + ARRAY_SIZE(rx_ch), > + rx_ch); > + if (rval != 0 && rval != -ENOTSUPP) > + return rval; > + } > > snd_soc_dai_set_sysclk(codec_dai, 0, > WCD934X_DEFAULT_MCLK_RATE,