From nobody Tue Nov 26 02:50:16 2024 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 698E240BF5; Wed, 23 Oct 2024 06:24:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729664680; cv=none; b=OfnoEDWspy4AVtRearhJL2OrZbsAEGx1faGcHyTKqyigV2QECpDBndk9TI79LJHQMYex5poHmvbAmC/LlhvuPmRMRGL+dc6Vrk41eygCCEyock1X6uh/sXajXDq7j0r3vVFrW9dCMEKJ7vBraPbF8T2ZiMGnE26+PKR5E8B/Fr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729664680; c=relaxed/simple; bh=sgYRZwKYhcHLSAXSrfPbG6BpZAxxWuSQNsVS9+umk/0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oPxpd/JpE7z35xRLoQe/UhMftNktdWDOOXP1Cy39PZ/CE7NP6zR1Auonn73TcTDv0TdA/sfddna7JlTAlGg+FLDY6v944TbslipbYI6xnaqFQz3Syo+IdAfZE1iuky2P4KnwqRiIhyQCux8Z5T3PNiiHO7RZoRh4sHwICaA2lYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=nLprfhBf; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="nLprfhBf" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49MLaDj9026346; Wed, 23 Oct 2024 06:24:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 6IPilQMix/W7+TrFKicljkP+P9pfOf28OQBkkdpqCsg=; b=nLprfhBfihKHuqK+ Bom7/XWdkYwEUTiz0eAUyVXzX4HdAUX/zVUuKBEJk1rygRDpgEIXiONLDsAYEcEz v+NRK4qWl9f/tjib0zifQvNP23IFADW2fT/jHzmfU2iCHRds3db99FbdlsIMhp7l JqqBcViQPZl5fNvDHuwJO/SBjBZ3hQM8c/u4mIAoGosQcycs9qnwhSbs8B3g5nFk kMdT1NlLmi11gCBMrZaDoqlxp4jbaaVjUnCvuuLFjkfc3WLcGYGj5/P6vly7FM05 EjpykgQLrqqPtsyVfl/IqneO2NaGNJ92BNEAk6Sw/qKKPzAn4/O+UqFSMFxnmT8f BSKQMw== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 42em3wh1tp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Oct 2024 06:24:24 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49N6ONTr031838 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Oct 2024 06:24:23 GMT Received: from hu-mohs-hyd.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 22 Oct 2024 23:24:15 -0700 From: Mohammad Rafi Shaik To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vinod Koul , Bard Liao , Jaroslav Kysela , "Takashi Iwai" CC: Pierre-Louis Bossart , Sanyog Kale , , , , , , , Mohammad Rafi Shaik Subject: [RESEND v2 2/4] ASoC: codecs: wcd937x: Add static channel mapping support in wcd937x-sdw Date: Wed, 23 Oct 2024 11:53:29 +0530 Message-ID: <20241023062331.3872883-3-quic_mohs@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241023062331.3872883-1-quic_mohs@quicinc.com> References: <20241023062331.3872883-1-quic_mohs@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 5STXPyTGlD6zJr_ov4k1oGiJavMtsedU X-Proofpoint-ORIG-GUID: 5STXPyTGlD6zJr_ov4k1oGiJavMtsedU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 phishscore=0 mlxlogscore=999 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410230037 Content-Type: text/plain; charset="utf-8" Add static channel mapping between master and slave ports in wcd937x-sdw dr= iver. Currently, the channel mask for each soundwire port is hardcoded in the wcd937x-sdw driver, and the same channel mask value is configured in the soundwire master. The Qualcomm boards like the QCM6490-IDP require different channel mask set= tings for the soundwire master and slave ports. Implemented logic to read TX/RX channel mappings from device tree properties (qcom,tx-channel-mapping and qcom,rx-channel-mapping). Modified the wcd937x_connect_port to handle master channel masks during port enable/disable operations. Added wcd937x_get_channel_map api to retrieve the current master channel map for TX and RX paths. Signed-off-by: Mohammad Rafi Shaik --- sound/soc/codecs/wcd937x-sdw.c | 38 +++++++++++++++++++++--- sound/soc/codecs/wcd937x.c | 53 ++++++++++++++++++++++++++++++++-- sound/soc/codecs/wcd937x.h | 6 +++- 3 files changed, 90 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c index 0c33f7f3dc25..3263bdf25d86 100644 --- a/sound/soc/codecs/wcd937x-sdw.c +++ b/sound/soc/codecs/wcd937x-sdw.c @@ -19,7 +19,7 @@ #include #include "wcd937x.h" =20 -static const struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] =3D { +static struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] =3D { WCD_SDW_CH(WCD937X_HPH_L, WCD937X_HPH_PORT, BIT(0)), WCD_SDW_CH(WCD937X_HPH_R, WCD937X_HPH_PORT, BIT(1)), WCD_SDW_CH(WCD937X_CLSH, WCD937X_CLSH_PORT, BIT(0)), @@ -30,7 +30,7 @@ static const struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch= _info[] =3D { WCD_SDW_CH(WCD937X_DSD_R, WCD937X_DSD_PORT, BIT(1)), }; =20 -static const struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] =3D { +static struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] =3D { WCD_SDW_CH(WCD937X_ADC1, WCD937X_ADC_1_PORT, BIT(0)), WCD_SDW_CH(WCD937X_ADC2, WCD937X_ADC_2_3_PORT, BIT(0)), WCD_SDW_CH(WCD937X_ADC3, WCD937X_ADC_2_3_PORT, BIT(0)), @@ -1019,7 +1019,9 @@ static int wcd9370_probe(struct sdw_slave *pdev, { struct device *dev =3D &pdev->dev; struct wcd937x_sdw_priv *wcd; - int ret; + u8 master_ch_mask[WCD937X_MAX_SWR_CH_IDS]; + int master_ch_mask_size =3D 0; + int ret, i; =20 wcd =3D devm_kzalloc(dev, sizeof(*wcd), GFP_KERNEL); if (!wcd) @@ -1048,10 +1050,36 @@ static int wcd9370_probe(struct sdw_slave *pdev, SDW_SCP_INT1_PARITY; pdev->prop.lane_control_support =3D true; pdev->prop.simple_clk_stop_capable =3D true; + + memset(master_ch_mask, 0, WCD937X_MAX_SWR_CH_IDS); + + if (wcd->is_tx) { + master_ch_mask_size =3D of_property_count_u8_elems(dev->of_node, + "qcom,tx-channel-mapping"); + + if (master_ch_mask_size) + ret =3D of_property_read_u8_array(dev->of_node, "qcom,tx-channel-mappin= g", + master_ch_mask, master_ch_mask_size); + } else { + master_ch_mask_size =3D of_property_count_u8_elems(dev->of_node, + "qcom,rx-channel-mapping"); + + if (master_ch_mask_size) + ret =3D of_property_read_u8_array(dev->of_node, "qcom,rx-channel-mappin= g", + master_ch_mask, master_ch_mask_size); + } + + if (ret < 0) + dev_info(dev, "Static channel mapping not specified using device channel= maps\n"); + if (wcd->is_tx) { - pdev->prop.source_ports =3D GENMASK(WCD937X_MAX_TX_SWR_PORTS - 1, 0); + pdev->prop.source_ports =3D GENMASK(WCD937X_MAX_TX_SWR_PORTS, 0); pdev->prop.src_dpn_prop =3D wcd937x_dpn_prop; wcd->ch_info =3D &wcd937x_sdw_tx_ch_info[0]; + + for (i =3D 0; i < master_ch_mask_size; i++) + wcd->ch_info[i].master_ch_mask =3D master_ch_mask[i]; + pdev->prop.wake_capable =3D true; =20 wcd->regmap =3D devm_regmap_init_sdw(pdev, &wcd937x_regmap_config); @@ -1065,6 +1093,8 @@ static int wcd9370_probe(struct sdw_slave *pdev, pdev->prop.sink_ports =3D GENMASK(WCD937X_MAX_SWR_PORTS - 1, 0); pdev->prop.sink_dpn_prop =3D wcd937x_dpn_prop; wcd->ch_info =3D &wcd937x_sdw_rx_ch_info[0]; + for (i =3D 0; i < master_ch_mask_size; i++) + wcd->ch_info[i].master_ch_mask =3D master_ch_mask[i]; } =20 =20 diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c index 45f32d281908..c0b18a3da701 100644 --- a/sound/soc/codecs/wcd937x.c +++ b/sound/soc/codecs/wcd937x.c @@ -1192,13 +1192,21 @@ static int wcd937x_connect_port(struct wcd937x_sdw_= priv *wcd, u8 port_idx, u8 ch const struct wcd937x_sdw_ch_info *ch_info =3D &wcd->ch_info[ch_id]; u8 port_num =3D ch_info->port_num; u8 ch_mask =3D ch_info->ch_mask; + u8 mstr_port_num, mstr_ch_mask; + struct sdw_slave *sdev =3D wcd->sdev; =20 port_config->num =3D port_num; =20 - if (enable) + mstr_port_num =3D sdev->m_port_map[port_num]; + mstr_ch_mask =3D ch_info->master_ch_mask; + + if (enable) { port_config->ch_mask |=3D ch_mask; - else + wcd->master_channel_map[mstr_port_num] |=3D mstr_ch_mask; + } else { port_config->ch_mask &=3D ~ch_mask; + wcd->master_channel_map[mstr_port_num] &=3D ~mstr_ch_mask; + } =20 return 0; } @@ -2682,10 +2690,51 @@ static int wcd937x_codec_set_sdw_stream(struct snd_= soc_dai *dai, return 0; } =20 +static int wcd937x_get_channel_map(const struct snd_soc_dai *dai, + unsigned int *tx_num, unsigned int *tx_slot, + unsigned int *rx_num, unsigned int *rx_slot) +{ + struct wcd937x_priv *wcd937x =3D dev_get_drvdata(dai->dev); + struct wcd937x_sdw_priv *wcd =3D wcd937x->sdw_priv[dai->id]; + int i; + + switch (dai->id) { + case AIF1_PB: + if (!rx_slot || !rx_num) { + dev_err(dai->dev, "Invalid rx_slot %p or rx_num %p\n", + rx_slot, rx_num); + return -EINVAL; + } + + for (i =3D 0; i < SDW_MAX_PORTS; i++) + rx_slot[i] =3D wcd->master_channel_map[i]; + + *rx_num =3D i; + break; + case AIF1_CAP: + if (!tx_slot || !tx_num) { + dev_err(dai->dev, "Invalid tx_slot %p or tx_num %p\n", + tx_slot, tx_num); + return -EINVAL; + } + + for (i =3D 0; i < SDW_MAX_PORTS; i++) + tx_slot[i] =3D wcd->master_channel_map[i]; + + *tx_num =3D i; + break; + default: + break; + } + + return 0; +} + static const struct snd_soc_dai_ops wcd937x_sdw_dai_ops =3D { .hw_params =3D wcd937x_codec_hw_params, .hw_free =3D wcd937x_codec_free, .set_stream =3D wcd937x_codec_set_sdw_stream, + .get_channel_map =3D wcd937x_get_channel_map, }; =20 static struct snd_soc_dai_driver wcd937x_dais[] =3D { diff --git a/sound/soc/codecs/wcd937x.h b/sound/soc/codecs/wcd937x.h index 35f3d48bd7dd..850aa943b7ab 100644 --- a/sound/soc/codecs/wcd937x.h +++ b/sound/soc/codecs/wcd937x.h @@ -506,12 +506,14 @@ enum wcd937x_rx_sdw_ports { struct wcd937x_sdw_ch_info { int port_num; unsigned int ch_mask; + unsigned int master_ch_mask; }; =20 #define WCD_SDW_CH(id, pn, cmask) \ [id] =3D { \ .port_num =3D pn, \ .ch_mask =3D cmask, \ + .master_ch_mask =3D cmask, \ } =20 struct wcd937x_priv; @@ -520,9 +522,11 @@ struct wcd937x_sdw_priv { struct sdw_stream_config sconfig; struct sdw_stream_runtime *sruntime; struct sdw_port_config port_config[WCD937X_MAX_SWR_PORTS]; - const struct wcd937x_sdw_ch_info *ch_info; + struct wcd937x_sdw_ch_info *ch_info; bool port_enable[WCD937X_MAX_SWR_CH_IDS]; + unsigned int master_channel_map[SDW_MAX_PORTS]; int active_ports; + int num_ports; bool is_tx; struct wcd937x_priv *wcd937x; struct irq_domain *slave_irq; --=20 2.25.1