From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=205.220.168.131 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792775871; b=DKrIQSlGP5purks0RGT9MBhVVfv7pbJ3QS/A0zUIYlVdB+J4xo6/tTmvsDoEPuhCXkFM ZVnYPah+px77r7miFLQVEDV2aouoyKUKoad4lNihqq5XTet2+yuzM3aytIaFzKK+viOox 05V8LBeupZ2igbF6+x95h1Ov/+TsEg+uIOzViMVoVn5KWRyAZB/6URiJ1srqmaPWVyaYD lNg6kH+dFZXi5WP0TMiiSLqhfOul/xclSqBLgffA386HcIJWGGstxA/w3a6bDmDwSAUSL Ziy7whut4IzLCSVIWl/KIOVxn3jlFxhfCmKzxiKzgmq8WIj3mbkdF+rt5maELoqop/Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792775871; h=DMARC-Filter:Received:DKIM-Signature:Received:Received: DKIM-Signature:X-Google-DKIM-Signature:X-Forwarded-Encrypted: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:From:To:Cc: Subject:Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Proofpoint-GUID:X-Proofpoint-Spam-Info: X-Authority-Analysis:X-Proofpoint-Spam-Details-Enc: X-Proofpoint-ORIG-GUID:X-Proofpoint-Virus-Version: X-Proofpoint-Spam-Details; bh=IGVXgr+T+Glk6nDfzgB5R9PCbZJKBGpxiPj52O3aCZQ=; b=yqgZ8JhNxdTeZBP4xO5mGT+7d2mTyFfdctSAL3SJlxgHzI0lt9cezovW3sVHO+P13xSi +3hTjxhJdu3beXIinmUxlv+OS0aWx2tImPGxu/z7dLn73jOkUfhgkm+ynk6ZoNqWw4Mh1 7c2018Gp0fEkYiC3exIbSplBAFU+vjhFh/wIMi1SBp2kIfoQqy6RLnytVHFz6nkT+etSc vzJv0fyozyqDqgvSONJTcSnO5L0wN9iYY9Bz3KjQN+s4GPK0M/ZqGuaXz/Ymed8MrYuJU zdQOOtiguwJPTwJWW+vuinzGBxo573jPKDync6kGhG8Rpblwm+zjyXs1Cx8VBLlHAhQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=f9RSEIGb; dkim=pass header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=Tx5sbuqM; arc=none smtp.remote-ip=205.220.168.131 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 711C6606A335 for ; Fri, 23 Oct 2026 17:17:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 711C6606A335 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, unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256 header.s=qcppdkim1 header.b=f9RSEIGb; dkim=pass (2048-bit key, unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.a=rsa-sha256 header.s=google header.b=Tx5sbuqM Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69NE5vLW4063351 for ; Fri, 23 Oct 2026 17:17:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=IGVXgr+T+Gl k6nDfzgB5R9PCbZJKBGpxiPj52O3aCZQ=; b=f9RSEIGb3l6efg3ct1YubW/+Mbp E4BJtd+OgUBOIXCtz/BnPxff0NVNBXmlnMTQOSi+NFUpecTXNBJqz0qRRPrfBEcf 6qvItVFESSaFmo0q86z35v2C0ByhPkrEuVYfXDouhkix91Ez65G2z3XshrVUef91 WmBnb4Z8YEC9swgBq5FzGOAKVY5L+09/DmiadMe0ujltIXo9UyySieh/zrmkxfWU lAP1RJb+MFI6F5ArtWBCOUz5bG8iFysKfargUVPtnkgInNdLhin9ZVGNBMuJjNLp r9u7myBruqgM3xVjSW5MKdnOKApTIm7i4G+LsI6L1z0PCzjubOscoSM6iKw== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4hfqmrcra9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 23 Oct 2026 17:17:50 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-93caa0ce0cdso141239685a.2 for ; Fri, 23 Oct 2026 10:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1792775870; x=1793380670; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IGVXgr+T+Glk6nDfzgB5R9PCbZJKBGpxiPj52O3aCZQ=; b=Tx5sbuqMNpXn+GOVdB6JfnicWv3IWZMrsuyfNSih9up6eqqqp8alYKI/HiJbZ/zzDF v8YEWLTDhj7+sd/YEMDhnP1Ew+Uw7S2ycbAbTMvGQApXyKKO2L2411pqrdGWk1jZ5TBj 32gJz3EtlYyNNrqirj4RZ6gPz9CgwmOEK6xcKWV90dIVL+HcuR1O9HbLsS8cuIDmv1Qd 1uamnmxuUxh0fuotR8Ub6CPZ3NXkwe7jCUtrPTDK44mKXOaxJ50X1qIHsoftrnXjbSRk 10Txxr8x2BtOHrUCjl2+LPsTW99vQulfP8utTWBTS7I6BYHUpkyASN+0P4U0YwHO4I7C 5suw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792775870; x=1793380670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=IGVXgr+T+Glk6nDfzgB5R9PCbZJKBGpxiPj52O3aCZQ=; b=i502LpQyXSMSBOCds9z8415lZ1F8NPA0kdjdPbtKeDyiLT/yaEJQqUZCClH87MYCAU 7GLNz6bDlw2+5Na5cDJbaq0vM07XfXu71WlBiBD5337FXpBfcR9HsNETTkpsbZOLHnxB AgXhS3izTLT+UNxIKiTHW1W3g2bAtAZOa9U3eoyHwezKDyRzGn0fz+6BccNDawbh0GwM yVvi/vZHMnx51FzKXUdDrDrEfn8I6bLkkBTJTIUZHUbAqtfPXTgJlrYza0yWLWsBExOS lRSH0/hylFcG9Oc68lathEQaMvQfBpWjPHgG5Q/qeZby7i9AWo/pkizkTvyRneS3XPkz PMMA== X-Forwarded-Encrypted: i=1; AKwUvBzh9sHJmQTk+K32vd8nzOmR20arA6LhjBX65BeBQzu6zf2FJPkHQwIpT4UA8bgyJNnZolp8ZIZI8QPly0Q=@vger.kernel.org X-Gm-Message-State: AFq9FYLEtpwAvRPjcMFO96SPo33leS8OkUFBAsK8CcvvVVbHgHp/SR32 jsXilPmkmhxqUVldcF4RE/3KpicOY/o/gZ6ldJBvtbZR7ubbFRwNSYqiRyiQWuULg4ohNp3yISA Z0Abh/4q2g1/ETg1s6rFArzeViHVcsXgDVkYFaMnDDbziOPFPqGdt8+3MIjTAQRCauXQ= X-Gm-Gg: AYBFou29N2Wv01ZM0Nkbp6UFZu+WyCn0BsD6Bnx3GBlErEmJvgG6JJzzMguiS0siqUS A7KYhPR1KhwZc4E1OcLKpk0wpdCOrl6zAU8RLlmAWu9jmNSVQQg/oPyAwMHL6u6jSZE5/7OWdqs 0LDgFzX7qjjy7Xkg95dT0hI/JNAAAL3/T0TIAulrT/vGRymETHxYJQje6IiWEab2BwhvUJhFOvg 6QrtlPuDEwwBbNhG6MKSu01M26Qkg2Z82SSx9UzV8jZMf7zhxVyhdse6Dnx9gkBZY6Dpsmblemk jxh1N14g+tZkMX7PbpRHrJIBguzAu6IFIZVzDcIeAxhXFqDYrADoBUU0VO9RCmsd1HwY1lb+xw1 n4HAWrFhhpWW/ X-Received: by 2002:a05:620a:390c:b0:93e:48fc:aa88 with SMTP id af79cd13be357-93f6f954a00mr525152985a.44.1792775869547; Fri, 23 Oct 2026 10:17:49 -0700 (PDT) X-Received: by 2002:a05:620a:390c:b0:93e:48fc:aa88 with SMTP id af79cd13be357-93f6f954a00mr525147085a.44.1792775868977; Fri, 23 Oct 2026 10:17:48 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e3d41e0fesm937475f8f.46.2026.10.23.10.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2026 10:17:48 -0700 (PDT) From: Srinivas Kandagatla To: Mark Brown , Liam Girdwood Cc: Jaroslav Kysela , Takashi Iwai , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Jonathan Corbet , Alexey Klimov , Ravi Hothi , linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [RFC PATCH 01/23] ASoC: soc-core: allow default ch_maps on links with more than 8 DAIs Date: Fri, 23 Oct 2026 18:14:11 +0100 Message-ID: <20261023171433.820092-2-srinivas.kandagatla@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261023171433.820092-1-srinivas.kandagatla@oss.qualcomm.com> References: <20261023171433.820092-1-srinivas.kandagatla@oss.qualcomm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: L01BPEUU6jBmLtqfL_q1NZc_tJMi1WOD X-Proofpoint-Spam-Info: AW1haW4tMjYxMDIzMDA2NyBTYWx0ZWRfX/jPh623f33wa 3QqHR4aj73rb7RO54qRr5X8yPw/WYfHq3aoACqwD0xtUd/KAsXdx5yW6uVxqdG/IZWz3Bq5d1NU sq7URIQuvPjqetM1VaWigAY1rr2HoAM= X-Authority-Analysis: v=2.4 cv=VNZIDNPX c=1 sm=1 tr=0 ts=6adb96be cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=ZoKOZlNiuk5k9p05MsAA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDIzMDA2NyBTYWx0ZWRfXyA97BRxIyEpY ssuWlViA4lwp/QurVqGK4vUq0E0ZSq1ByOl7Xj7AfgfqExF8nBr1y5XOOxAV53QejPigF6yV3hr 7QySAR2MJ+AbgWG2SjQEAmnevCE7yRybGZ1kck1maKwhnimjAlO5qExOeULnWVglTu0nFTaz6JM iHNxOrhv0efDuUlMH0Sg1nJAfhqX+oEIunRcjCSHO8XsqGhTCHbmOSRJSR4/iWkgHyWTmkhaVN6 qkCpgOUNxo4seAzf6ADbgzLJ98WYjD81ljhJZ/v6GmuSpL2ozKinW+aUlT78dc/pbRpD+nFoLK5 ocmY00exbxQSEqO1lYjLMQ+M1wpMUOAkGP/VpUmnurmd9Pd49/02TnIlgTbjbzoQH3pjQ78l2Fn 1khVg2P8rDclRVC5WTZg9jDuSTcPKOFzy6sFXFyaFqlwo/O+1wbYoo2HP45AEbYlfP3aW35ehSy 9lcMyuvsfJG+uY1zEDg== X-Proofpoint-ORIG-GUID: L01BPEUU6jBmLtqfL_q1NZc_tJMi1WOD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-10-23_04,2026-10-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610190000 definitions=main-2610230067 snd_soc_compensate_channel_connection_map() builds the default channel map from static 8-entry arrays and fails the card for links with more DAIs. A speaker protection link carrying both the amplifier and the V/I sense codec DAIs of four speakers has about sixteen. Keep the static arrays for links that fit, and allocate a per-link map with the same 1:1, 1:N or N:1 layout for those that do not. Signed-off-by: Srinivas Kandagatla --- sound/soc/soc-core.c | 46 +++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 97269b4ee4ca..34d02a39de90 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -915,20 +915,40 @@ static int snd_soc_compensate_channel_connection_map(struct snd_soc_card *card, if (dai_link->ch_maps) goto sanity_check; - /* check default map size */ - if (dai_link->num_cpus > MAX_DEFAULT_CH_MAP_SIZE || - dai_link->num_codecs > MAX_DEFAULT_CH_MAP_SIZE) { - dev_err(card->dev, "soc-core.c needs update default_connection_maps"); - return -EINVAL; - } + /* + * Links wider than the static defaults get their own map. The N:M + * check above leaves a single DAI on the shorter side, at index 0. + */ + if (dai_link->num_cpus <= MAX_DEFAULT_CH_MAP_SIZE && + dai_link->num_codecs <= MAX_DEFAULT_CH_MAP_SIZE) { + if (dai_link->num_cpus == dai_link->num_codecs) + dai_link->ch_maps = default_ch_map_sync; /* for 1:1 or N:N */ + else if (dai_link->num_cpus < dai_link->num_codecs) + dai_link->ch_maps = default_ch_map_1cpu; /* for 1:N */ + else + dai_link->ch_maps = default_ch_map_1codec; /* for N:1 */ + } else { + int num_maps = max(dai_link->num_cpus, dai_link->num_codecs); - /* Compensate missing map for ... */ - if (dai_link->num_cpus == dai_link->num_codecs) - dai_link->ch_maps = default_ch_map_sync; /* for 1:1 or N:N */ - else if (dai_link->num_cpus < dai_link->num_codecs) - dai_link->ch_maps = default_ch_map_1cpu; /* for 1:N */ - else - dai_link->ch_maps = default_ch_map_1codec; /* for N:1 */ + ch_maps = devm_kcalloc(card->dev, num_maps, sizeof(*ch_maps), + GFP_KERNEL); + if (!ch_maps) + return -ENOMEM; + + if (dai_link->num_cpus == dai_link->num_codecs) { + for (i = 0; i < num_maps; i++) { + ch_maps[i].cpu = i; + ch_maps[i].codec = i; + } + } else if (dai_link->num_cpus < dai_link->num_codecs) { + for (i = 0; i < num_maps; i++) + ch_maps[i].codec = i; /* cpu stays 0 */ + } else { + for (i = 0; i < num_maps; i++) + ch_maps[i].cpu = i; /* codec stays 0 */ + } + dai_link->ch_maps = ch_maps; + } sanity_check: dev_dbg(card->dev, "dai_link %s\n", dai_link->stream_name); -- 2.47.3