From nobody Tue Jun 30 03:38:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71F65C5DF62 for ; Wed, 26 Jan 2022 11:36:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240789AbiAZLgD (ORCPT ); Wed, 26 Jan 2022 06:36:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240774AbiAZLgB (ORCPT ); Wed, 26 Jan 2022 06:36:01 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45B8CC06161C for ; Wed, 26 Jan 2022 03:36:01 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id n12-20020a05600c3b8c00b0034eb13edb8eso1774866wms.0 for ; Wed, 26 Jan 2022 03:36:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aniun3FP07/lm5WG5tDXe1tN8Nb0Xcv5gX8sytXFnHQ=; b=OVAIp1Nvla6MOTka4KhoRHptBE1bSiVkdUmm34BZZCZs9pCMjk7WFqRd2PcNoYz5i2 qz++CHRUqs0Hc1Jjy2ZwyZdyvBL/5M7hK8K96SRgIBRA0mDOOX2R/eFf/Nd17+rmoIaL ZOUU7k9Z1bboObbL8LMgK7mFs+G2m2O3hf/7sddakD/OS0etWyU/MMRWgJH2AuJNqIYy KpNSTxkq1cluZHgj9g2ig05xAVNj+ooydvh2bXGk3mcJP/GjjRc9dsjlqVIy2QWjRlLp akowBvkd7Rfvnq56SwnmJvGZpPTIeWQClm0hHPSGKzjSp0fVunF7P0Fq8Ra/8R+xj96s InTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aniun3FP07/lm5WG5tDXe1tN8Nb0Xcv5gX8sytXFnHQ=; b=jS77kXyXlc9hpMrY9sWpX8BZEgEH5JPpHaH67HsQGsuTfPfoBjHvIxmE/3xy2tpetF zYlh9svn7hfpLmqJyRwqMy630MGR88FhsGfezx6xDPQd58SphqU9oEK+o+apRsnQ3RDu qe3XYJamRdFDfMxibgF5yIqDHLhDeziiqfgy0MFZCFXC6Ck2pf9kJxC0+jXIgv0andJp VWbs729nwTf7bgl3d5xHg7lBWNjMtCiwpHK2oGerb4oktukO/cdCT/SkU+JidHXzqUGP 8dy5K7tbwCpnAPdX4qhvh4jQpFrUbNBEM0lNSXgfsa6IcRZuYYZxmoUl6OUO47XptGM2 pdYw== X-Gm-Message-State: AOAM531nSdVN6VN5GSoi1VDCvP+3bp5syVp7hRTQbERlRbEldA8NfDGx q40qe94va7cuAKcfDJlKdbrmsA== X-Google-Smtp-Source: ABdhPJxVyM8l27hJP0QIDKsw9OQz0F2CEok4J4VqFVcvD191PyElZ8pHn1FtNv1K7u/ZM7SeuzaRng== X-Received: by 2002:a05:600c:19c8:: with SMTP id u8mr6955120wmq.92.1643196959897; Wed, 26 Jan 2022 03:35:59 -0800 (PST) Received: from srini-hackbox.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id n14sm11999188wri.75.2022.01.26.03.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 03:35:59 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, quic_srivasam@quicinc.com, Srinivas Kandagatla Subject: [PATCH 1/4] ASoC: codecs: wcd938x: fix incorrect used of portid Date: Wed, 26 Jan 2022 11:35:46 +0000 Message-Id: <20220126113549.8853-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> References: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Mixer controls have the channel id in mixer->reg, which is not same as port id. port id should be derived from chan_info array. So fix this. Without this, its possible that we could corrupt struct wcd938x_sdw_priv by accessing port_map array out of range with channel id instead of port id. Fixes: e8ba1e05bdc0 ("ASoC: codecs: wcd938x: add basic controls") Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/wcd938x.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index eff200a07d9f..5994644c8702 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1432,14 +1432,10 @@ static int wcd938x_sdw_connect_port(struct wcd938x_= sdw_ch_info *ch_info, return 0; } =20 -static int wcd938x_connect_port(struct wcd938x_sdw_priv *wcd, u8 ch_id, u8= enable) +static int wcd938x_connect_port(struct wcd938x_sdw_priv *wcd, u8 port_num,= u8 ch_id, u8 enable) { - u8 port_num; - - port_num =3D wcd->ch_info[ch_id].port_num; - return wcd938x_sdw_connect_port(&wcd->ch_info[ch_id], - &wcd->port_config[port_num], + &wcd->port_config[port_num - 1], enable); } =20 @@ -2593,6 +2589,7 @@ static int wcd938x_set_compander(struct snd_kcontrol = *kcontrol, struct wcd938x_priv *wcd938x =3D snd_soc_component_get_drvdata(component); struct wcd938x_sdw_priv *wcd; int value =3D ucontrol->value.integer.value[0]; + int portidx; struct soc_mixer_control *mc; bool hphr; =20 @@ -2606,10 +2603,12 @@ static int wcd938x_set_compander(struct snd_kcontro= l *kcontrol, else wcd938x->comp1_enable =3D value; =20 + portidx =3D wcd->ch_info[mc->reg].port_num; + if (value) - wcd938x_connect_port(wcd, mc->reg, true); + wcd938x_connect_port(wcd, portidx, mc->reg, true); else - wcd938x_connect_port(wcd, mc->reg, false); + wcd938x_connect_port(wcd, portidx, mc->reg, false); =20 return 0; } @@ -2882,9 +2881,11 @@ static int wcd938x_get_swr_port(struct snd_kcontrol = *kcontrol, struct wcd938x_sdw_priv *wcd; struct soc_mixer_control *mixer =3D (struct soc_mixer_control *)kcontrol-= >private_value; int dai_id =3D mixer->shift; - int portidx =3D mixer->reg; + int portidx, ch_idx =3D mixer->reg; + =20 wcd =3D wcd938x->sdw_priv[dai_id]; + portidx =3D wcd->ch_info[ch_idx].port_num; =20 ucontrol->value.integer.value[0] =3D wcd->port_enable[portidx]; =20 @@ -2899,12 +2900,14 @@ static int wcd938x_set_swr_port(struct snd_kcontrol= *kcontrol, struct wcd938x_sdw_priv *wcd; struct soc_mixer_control *mixer =3D (struct soc_mixer_control *)kcontrol->private_value; - int portidx =3D mixer->reg; + int ch_idx =3D mixer->reg; + int portidx; int dai_id =3D mixer->shift; bool enable; =20 wcd =3D wcd938x->sdw_priv[dai_id]; =20 + portidx =3D wcd->ch_info[ch_idx].port_num; if (ucontrol->value.integer.value[0]) enable =3D true; else @@ -2912,7 +2915,7 @@ static int wcd938x_set_swr_port(struct snd_kcontrol *= kcontrol, =20 wcd->port_enable[portidx] =3D enable; =20 - wcd938x_connect_port(wcd, portidx, enable); + wcd938x_connect_port(wcd, portidx, ch_idx, enable); =20 return 0; =20 --=20 2.21.0 From nobody Tue Jun 30 03:38:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C583CC2BA4C for ; Wed, 26 Jan 2022 11:36:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240809AbiAZLgH (ORCPT ); Wed, 26 Jan 2022 06:36:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240783AbiAZLgC (ORCPT ); Wed, 26 Jan 2022 06:36:02 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35485C06161C for ; Wed, 26 Jan 2022 03:36:02 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id k18so25237785wrg.11 for ; Wed, 26 Jan 2022 03:36:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bXVjE+WHy8056yU6PQ186TKgk9YFsJSf/z9MoSICAgo=; b=bOPFKWeSDz/5+SWrCSqxTxArgqoAVTVn9JPw/LwQVWw/KF8qXvJXOqSe+p0LykVAMl FVHAvDWl4uq+Twi3eh6lCLiaMXN2PjAqVCezLLxc2VTlKJL4V9FMusPREkrzc18XNK60 P2GhDxWYXChfe2PmIXOrCdKEjLmpQi7RantbrgMCzXL7uphq0emDusi5DtgizxaxvnBn q8nIoIuTRT21j9n3EZpMW9+5fyqF+9pxctLuV2LVwTZVkByAvGfM639trJdAOOvWMbpo E/bS5WOiEOIE0kXb/hi4CE/hRZcYL78/7AvmLPJk91Rr2hxlGTm7pG93zIoUcJpbLfhJ 7Ugw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bXVjE+WHy8056yU6PQ186TKgk9YFsJSf/z9MoSICAgo=; b=feG9BPrCqiMVnDrcU5K2y0Hp6oVk9SQmFP6yMc+CNf0XSXdSpRcG2/kjRBsrM2fidK cR3pAZ6HzLY64sIsmkfmxF+xWA+BIhmiH+No86QnJwKHQCnNb+9rMqdSuBygLZfPoTo4 tfqhs4TAOKTg+kszD+nrUR8x/KOFYFQg6jvIMY0BKASKKLkKa4yPYMXUxRl5J3PGgLsU P5onmB3l3fTrRWyKqqw9mwbH0teTas6Ls/5KynGbs5W8MRaR3HCi6OZGdRSCRPfU2p+v W22CqVS6INNUBRVLHeOgErVA+drwEVqTaWe4/eTiRir9EoyHgMACaoGw8rpiWsgs8ya+ /ADA== X-Gm-Message-State: AOAM532a64gjoMGfAtJoYF70UIHc4PAIPHyY3D6ts6UNCNQFuMx5SrRc DYwm9mr1YVLPVziqvDMEEyytWw== X-Google-Smtp-Source: ABdhPJzXvbDq09qiBfc5o13vwHQzmqhkxGwNvWS1trLsF9xfkIUo9E3GK79OPSvS6pT/ByTWosOOxA== X-Received: by 2002:adf:e48c:: with SMTP id i12mr21498933wrm.43.1643196960863; Wed, 26 Jan 2022 03:36:00 -0800 (PST) Received: from srini-hackbox.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id n14sm11999188wri.75.2022.01.26.03.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 03:36:00 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, quic_srivasam@quicinc.com, Srinivas Kandagatla Subject: [PATCH 2/4] ASoC: codecs: lpass-rx-macro: fix sidetone register offsets Date: Wed, 26 Jan 2022 11:35:47 +0000 Message-Id: <20220126113549.8853-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> References: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For some reason we ended up with incorrect register offfset calcuations for sidetone. regmap clearly throw errors when accessing these incorrect registers as these do not belong to any read/write ranges. so fix them to point to correct register offsets. Fixes: f3ce6f3c9a99 ("ASoC: codecs: lpass-rx-macro: add iir widgets") Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-= macro.c index aec5127260fd..6ffe88345de5 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -2688,8 +2688,8 @@ static uint32_t get_iir_band_coeff(struct snd_soc_com= ponent *component, int reg, b2_reg; =20 /* Address does not automatically update if reading */ - reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx; - b2_reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 16 * iir_idx; + reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 0x80 * iir_idx; + b2_reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 0x80 * iir_idx; =20 snd_soc_component_write(component, reg, ((band_idx * BAND_MAX + coeff_idx) * @@ -2718,7 +2718,7 @@ static uint32_t get_iir_band_coeff(struct snd_soc_com= ponent *component, static void set_iir_band_coeff(struct snd_soc_component *component, int iir_idx, int band_idx, uint32_t value) { - int reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 16 * iir_idx; + int reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 0x80 * iir_idx; =20 snd_soc_component_write(component, reg, (value & 0xFF)); snd_soc_component_write(component, reg, (value >> 8) & 0xFF); @@ -2739,7 +2739,7 @@ static int rx_macro_put_iir_band_audio_mixer( int iir_idx =3D ctl->iir_idx; int band_idx =3D ctl->band_idx; u32 coeff[BAND_MAX]; - int reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx; + int reg =3D CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 0x80 * iir_idx; =20 memcpy(&coeff[0], ucontrol->value.bytes.data, params->max); =20 --=20 2.21.0 From nobody Tue Jun 30 03:38:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D8A8C28CF5 for ; Wed, 26 Jan 2022 11:36:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240819AbiAZLgI (ORCPT ); Wed, 26 Jan 2022 06:36:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240792AbiAZLgD (ORCPT ); Wed, 26 Jan 2022 06:36:03 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D91AC061744 for ; Wed, 26 Jan 2022 03:36:03 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id h21so7692217wrb.8 for ; Wed, 26 Jan 2022 03:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7uYgTZ5BWUKo6IE+sW0nmQRKJ/VMJrPvYdN9IXE2AoE=; b=tjF30mrNbfIzk9FPTeX9J+dohxsUXSuKLTpvowq4NkQs7XXPyy0M+fLUJ6zaj1aXI2 YwZuiaDdIgkZfqcLqE4+8nDkxG5NtFFrLI9pmcnH7i5UREo86cBacs+Zlnurdhdb0Yak zuslFv6w1StuZdOS+QPFhjNlfs0LVJFwRYAm6k3ywUa6nwUP1Vs7qHTu6F32ZWKuO57u 3zECYns5cwwfv6XfWpvfDK55sprfdwbdNJeubp42tWGUrAr/QjzfwwKN+mA/uJWeMTqI 5TpedkJzs/NJjndJNKluqYxXc0n2PDWpYCydQXVC+4ebSi8P4xgunld09FeMN7c9M2t6 //5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7uYgTZ5BWUKo6IE+sW0nmQRKJ/VMJrPvYdN9IXE2AoE=; b=YQ0xOn/urdfprlqh15nubbq10DqIZJt/qMo6+4VfR+zxaLzOAKnDCACIY4hVoC8/It KNxAz1ASHJuv3/96f2DGUTZmDOZM1bgANsy8sOYhfNtO5o/96HLEUpE4J9SWV34d6NSi xQRVZ9EmilYNmLWyDL4it7bbo0Bre7RvqdfGoDzmsVz7WIG7rmzgasdKDd9XihTwoLQv dq/1kR6BVSI1kKmlDpZajw0PtS0YJW287V0kJdBVkFBvvRcRijIgdQrzcsFry3lwkli6 CsNj/bRccxqRFE0dIcGlznVn1BxjAOlMEXbCpzufpy8GV09UaAv/K6ifGb5DF5IJ/bXA Hmng== X-Gm-Message-State: AOAM532gKiCSbOHvwqInwbD5HLTpprUjdcpfouArUwTWdNO3+ihk7P7r 3jOm2VDQ5+1jzxzHMkoOSDX9Cw== X-Google-Smtp-Source: ABdhPJz6AtCx7kIVacdAi8UodwIfH2dJGXhPMfuTNLL92yJFCgM1jmsiUIBBy9uhJx15WnbhGriiBg== X-Received: by 2002:a05:6000:1a89:: with SMTP id f9mr13793463wry.481.1643196961852; Wed, 26 Jan 2022 03:36:01 -0800 (PST) Received: from srini-hackbox.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id n14sm11999188wri.75.2022.01.26.03.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 03:36:01 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, quic_srivasam@quicinc.com, Srinivas Kandagatla Subject: [PATCH 3/4] ASoC: codecs: wcd938x: fix return value of mixer put function Date: Wed, 26 Jan 2022 11:35:48 +0000 Message-Id: <20220126113549.8853-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> References: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" wcd938x_ear_pa_put_gain, wcd938x_set_swr_port and wcd938x_set_compander currently returns zero eventhough it changes the value. Fix this, so that change notifications are sent correctly. Fixes: e8ba1e05bdc01 ("ASoC: codecs: wcd938x: add basic controls") Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/wcd938x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 5994644c8702..36cbc66914f9 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -2559,7 +2559,7 @@ static int wcd938x_ear_pa_put_gain(struct snd_kcontro= l *kcontrol, WCD938X_EAR_GAIN_MASK, ucontrol->value.integer.value[0]); =20 - return 0; + return 1; } =20 static int wcd938x_get_compander(struct snd_kcontrol *kcontrol, @@ -2610,7 +2610,7 @@ static int wcd938x_set_compander(struct snd_kcontrol = *kcontrol, else wcd938x_connect_port(wcd, portidx, mc->reg, false); =20 - return 0; + return 1; } =20 static int wcd938x_ldoh_get(struct snd_kcontrol *kcontrol, @@ -2917,7 +2917,7 @@ static int wcd938x_set_swr_port(struct snd_kcontrol *= kcontrol, =20 wcd938x_connect_port(wcd, portidx, ch_idx, enable); =20 - return 0; + return 1; =20 } =20 --=20 2.21.0 From nobody Tue Jun 30 03:38:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C0C2C28CF5 for ; Wed, 26 Jan 2022 11:36:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240802AbiAZLgK (ORCPT ); Wed, 26 Jan 2022 06:36:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240790AbiAZLgE (ORCPT ); Wed, 26 Jan 2022 06:36:04 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F040C06161C for ; Wed, 26 Jan 2022 03:36:04 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id n8so27440237wmk.3 for ; Wed, 26 Jan 2022 03:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wTvnkKEb+4UL86WLI4y9ZHDzYIRRSQJF903Pn2y7+HU=; b=jte/6bj9Lu4Bn2k+uHE6Nlb3BHk5VedwUaNZG2hSiwCE7TR4bBfsTigqHAcN3aXB1Q 3dgOb9H4cRMzlz9RYKQWB9+xtrcxyz/kWLe/9yrdAD3gEcPnR8eKaF4UbzvipPkBdCfW pCoYATosVlFVnGSArIihhOrsDJFkYvI7ZxCgMs5m899RVlIJM++jFILUgkLX82FYA0O+ 6xZqTmsmGEV6PMGTX5lziQUM/jYrg6g7+3U72oFv8wtKruHpslTaroqVL6847EWsBxP8 XblL5KZKFVBkJb8SvhZgxL8hYjK9WMrd7ugCzgR0swA+c+zg6TBvc35nE6BA+FF6SGZM vt0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wTvnkKEb+4UL86WLI4y9ZHDzYIRRSQJF903Pn2y7+HU=; b=LaK+H8N/FM7gffbWnWl0hHSj5LlB+bfYEIgOrcmA3LAeRHw/pl9o2C2zEDhVtM8WOO 03yO4w1e4qykaRtQKgKJMcUkAdcWtwB3T5Uod1eGgQra7spk+KWqa5zitloOUL30DK3T XdglmNSe7zpfzWDVl98bdCJ/P7iRJU0kZR1JkjdETl9xQSmjp3DgD2VJr+tcWMgBBEPM riVpbmgR0bC9RTgQ/RjkzfgQOBJNOBHA2av/xDB2MiGv3WGfBc+BYNeTwq/uRfL6RN8e 7H2x3l7VOruFXkkc0+AfIQjpsWCjySD1xEz49frYG0YLnMByJvLQnKh50GWzruoVyRAM mrjA== X-Gm-Message-State: AOAM533vep9kTdWofw6MZvn2u49F6ekVU2DqGD2gM/XoP7Er5+A1P7LA YrglUJBNWQQ+aOTvIROQo88k0Q== X-Google-Smtp-Source: ABdhPJxNol80N6KgPVyzOBjJcP+P3qPnV0rBGrzx5NQUKiryTqB/K9m2g9NoTimj/hv+KNyRbSBHhw== X-Received: by 2002:a7b:cd14:: with SMTP id f20mr7156768wmj.110.1643196962831; Wed, 26 Jan 2022 03:36:02 -0800 (PST) Received: from srini-hackbox.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id n14sm11999188wri.75.2022.01.26.03.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 03:36:02 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, quic_srivasam@quicinc.com, Srinivas Kandagatla Subject: [PATCH 4/4] ASoC: qdsp6: q6apm-dai: only stop graphs that are started Date: Wed, 26 Jan 2022 11:35:49 +0000 Message-Id: <20220126113549.8853-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> References: <20220126113549.8853-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Its possible that the sound card is just opened and closed without actually playing stream, ex: if the audio file itself is missing. Even in such cases we do call stop on graphs that are not yet started. DSP can throw errors in such cases, so add a check to see if the graph was started before stopping it. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-= dai.c index eb1c3aec479b..19c4a90ec1ea 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -308,8 +308,11 @@ static int q6apm_dai_close(struct snd_soc_component *c= omponent, struct snd_pcm_runtime *runtime =3D substream->runtime; struct q6apm_dai_rtd *prtd =3D runtime->private_data; =20 - q6apm_graph_stop(prtd->graph); - q6apm_unmap_memory_regions(prtd->graph, substream->stream); + if (prtd->state) { /* only stop graph that is started */ + q6apm_graph_stop(prtd->graph); + q6apm_unmap_memory_regions(prtd->graph, substream->stream); + } + q6apm_graph_close(prtd->graph); prtd->graph =3D NULL; kfree(prtd); --=20 2.21.0