From patchwork Thu Feb 9 12:27:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp305680wrn; Thu, 9 Feb 2023 04:31:07 -0800 (PST) X-Google-Smtp-Source: AK7set94Idj7nAMzkYiumHAtuahDsx6Yu2oiqej3YLFYSmuTF0YPlXhPeFNvo54/wD3OadCXjXxJ X-Received: by 2002:a17:90b:1650:b0:230:cc5f:7f1b with SMTP id il16-20020a17090b165000b00230cc5f7f1bmr12949768pjb.0.1675945867445; Thu, 09 Feb 2023 04:31:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945867; cv=none; d=google.com; s=arc-20160816; b=I+X9aGUH6fZb5yrWK+CoO9zyJAa2hi6qu54CYoYdjhLup5jrS3LImE1IussAaRXbv5 15vqmVZb7di3A1bFXWMAwqJxppWyhEmkG5k9awzjIFzDzdMwG2mY1U+4R4tzgsUn7EBy Mw4YfYb4FJaXxTTZsi606anj6ZuXXKfwGQzoHmTkV8zi1Q/6IrDyKDYmeAoU+tgeMv+o Vm93gfsQX+lGnGucG7rbZ0dx5mzXZe3jTw5CK00irli+O52HsUFcMUurDrHGF1ObVDyO cKZhZ08AMaSvwJYDZWfJi+cvfZdkbtune973bHvKEfD6wa+CY9TPwcdwYmU0/QvxWPtc hjLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DEzXaR05SusPPC1DvCjjsQFeMd90WYnfj1cUKYhegZE=; b=nZtBu9oN+t9L9iBpV5hWetrXPg97/c3+agLQ7nvUG7fWUc4VTE+jwI3tB8u7w7u/rT oB4QhUNVTd/0H/ckrtknLA7OSaaY07HkSd7UYyf9HHaHT91YKW3/Eh+3l31HrbMzZz/i H/sLhoLFRPrOi6TIa2qiJkKpIGUfkBaZhtnVUx/8wZyWRONdA62b4jffXPVIOVml189x ucuI60qJEZ30wp5/GNndv+Lz35r7QWXtmfaauehU1Eczrm4pSeOq+SUnEqDw//KHCGHM MO1a/zoXjDV4jF/ScwctFyFt19eJZIdStfd7Hh7Y00gv+HNfERk+eaiZfn4hKr2Vnalm YEXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ro8BWxNH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id em24-20020a17090b015800b00230a7278c09si5439970pjb.79.2023.02.09.04.30.55; Thu, 09 Feb 2023 04:31:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ro8BWxNH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229804AbjBIM2s (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbjBIM2T (ORCPT ); Thu, 9 Feb 2023 07:28:19 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E108986AD for ; Thu, 9 Feb 2023 04:28:17 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id y1so1609704wru.2 for ; Thu, 09 Feb 2023 04:28:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=DEzXaR05SusPPC1DvCjjsQFeMd90WYnfj1cUKYhegZE=; b=Ro8BWxNHoJAvx5SGpTR7yXMmlpv09d9Nj0eJZjJSW3/ZEazepb0uXgN9ztasMc+Cll dVA3pJPtNyAV8yMVsPb1/TtSYV000KqkVbzrwx5tu0Q0nqTqgcGh2iHU07/c5xTFUmBy 0svc7agcaOFDVVa7bbpvCq9uugf0iFY7YMvlWhCk73OJx4Wm7GVU2U8hyKeNKg6qXqYk G+Zt+bZVSrnmatVQNw02P5i7Mhfk+BYH2ekpfHjDxoJ6U2csb921an3zMk1NGtAa9ImR Lbft66T1ISERPELJc1zb4cC/QzgDS9y9Do+HZCFR/bk4kWbwzvzjUw0DJQ2jq2DNQkOf MHjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DEzXaR05SusPPC1DvCjjsQFeMd90WYnfj1cUKYhegZE=; b=IurW85unG1M73SIoodih1+TSSgc1ZQ8kHO0nyxDh8dx4clHpd3MiQGj4M8oE9Wcn+V lX4Qed68SPLQnjBZK7N2sqG8kGQ61P0L9592F3z29q/s8LTn/QOA/rFfRB76Rs5vGKBS SXv1VMhDfHj+jVTcitN3tLimmpllEXlMDUqH3k3doHIoou5/IiSVQodUCSq5xgqxa0xX Us6pCrC16dUBxIMIi0Dx0ZF6iOvu4TDj5daAaxoBV08pfUcVh2Ahs1E1gZEhdz3kwGY4 Wa0sBDf+yN9UqcA8YyMDoRa+OwOdG+qHftEiC274OAd/FKCIZARqPmwa8Q4f4W4UXlZV 37UA== X-Gm-Message-State: AO0yUKWpsviGJD/rs0dD9XT3dpKUfddZG7Wb36c8/9U3SwECENN/Xn3A 2bBN/ce/r8H+ahLwE5HFGTBy1g== X-Received: by 2002:a5d:6dd2:0:b0:2c4:b152:9ae with SMTP id d18-20020a5d6dd2000000b002c4b15209aemr1704298wrz.31.1675945696476; Thu, 09 Feb 2023 04:28:16 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:15 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 1/8] ASoC: qcom: q6apm-lpass-dai: unprepare stream if its already prepared Date: Thu, 9 Feb 2023 12:27:59 +0000 Message-Id: <20230209122806.18923-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356614232295375?= X-GMAIL-MSGID: =?utf-8?q?1757356614232295375?= prepare callback can be called multiple times, so unprepare the stream if its already prepared. Without this DSP is not happy to setting the params on a already prepared graph. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c index ce9e5646d8f3..23d23bc6fbaa 100644 --- a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c +++ b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c @@ -127,6 +127,11 @@ static int q6apm_lpass_dai_prepare(struct snd_pcm_substream *substream, struct s int graph_id = dai->id; int rc; + if (dai_data->is_port_started[dai->id]) { + q6apm_graph_stop(dai_data->graph[dai->id]); + dai_data->is_port_started[dai->id] = false; + } + /** * It is recommend to load DSP with source graph first and then sink * graph, so sequence for playback and capture will be different From patchwork Thu Feb 9 12:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp305789wrn; Thu, 9 Feb 2023 04:31:19 -0800 (PST) X-Google-Smtp-Source: AK7set+ILPafM+bzgzuJJL/pO9KrZC/u/J52JnJbkH3lnnBO+CGqdU2bJmEGtxBoLzYJq+K/qLn5 X-Received: by 2002:a17:90b:3505:b0:22c:387a:6842 with SMTP id ls5-20020a17090b350500b0022c387a6842mr12010153pjb.26.1675945878935; Thu, 09 Feb 2023 04:31:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945878; cv=none; d=google.com; s=arc-20160816; b=qp6AsvM+i/sXacXYJ6PSBhjKHzhSh6q524w3HcGJI4QHqblGJo4wQqAAJ8oMHfE6rU ZfYhmqrC9T6AJXX/orF2bNqYt62V1h5Wk1az54c8CNZzxJXr8Lkkqr29GVbyS/iwqPf7 eLW0i+VjmTPP86kHYKms+0uIMixGL1owex6uVaIVALatUcm+fNThEyuvr5lPlnd8rGQU GzhPM2xSI/809q2NmPfsy7Fclhxu0G97xxH6binmZYya+QQA9AkOhjls/rjzTA71tIkS poEyNmRNxCMEUEsratHlBDHDD9/dTuDv4zrfuX3qoNHKC5IxgEuYrQFqunaKiQ45YB8L GRdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JongRsuVGtYNajpohdC5ZEm05+E/44o4yeTIeuBWqPg=; b=mJRzs2v3d3zQD1d8xwBR9/PhPDatlaXUfn5HkUXgHzspwS1RIBLn4VJ6AjMh5hVuav Ty2de8+lwWFSxSs0Bavlu6YrDjcYWbWTXEcvP644b+VsXGKLIfjsFq7akgCSdHi4CzPa cPc8oEoHoAlGBC7RAnLhF3GCUXQv7ksAnNknXBzQ9TEhWM9cuD6Gh+f0nEEQcpGE4hUJ x7qR2Hbja5bOq/VnGnR8dN+CWkskq/HB2wQ9tUTz51DXlXFKFn98+brh8qQTcikvcavy 0AR9OnjhflMXfmFJcbl787uQZ0h2PxOM0Y0ykBdXmKkbnm4dH9nQGueVDmz+RSv9HoS6 /osQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=alMmw7K9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x20-20020a17090a8a9400b00230cc557396si1776531pjn.73.2023.02.09.04.31.06; Thu, 09 Feb 2023 04:31:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=alMmw7K9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229827AbjBIM2t (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229854AbjBIM2U (ORCPT ); Thu, 9 Feb 2023 07:28:20 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B109274B9 for ; Thu, 9 Feb 2023 04:28:19 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id ba1so1594692wrb.5 for ; Thu, 09 Feb 2023 04:28:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=JongRsuVGtYNajpohdC5ZEm05+E/44o4yeTIeuBWqPg=; b=alMmw7K9GMnEn1dIokLBXd4VnAN2PqcPqLeYDOvmAEvT+atiV99OFPdGXozBSW1ssj ccORQTeZzjA8aLRxMsj+skj1xDRSXVIxjBTUzh/apuAPqn3ele+M/sugsW1C8k03X4tq YEdEGEkEY0o6n2vIisvGuacfKbPSLlHmbGSqDowpOOmRMEwfTxvAZlQocUX5x+u1kCzO FlguWkcJCItO/oGT/y3ZoY6MzZrV7rX4TJjuDtvzTQtG6M1zMIj58VTStQDka8oVsu6l vxSOHg31mXv1kY4gERgMIEM5NUEpTNpfzi4iQAkFWsF2FXAteACyABSGiHPdHEsbptBC nk1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JongRsuVGtYNajpohdC5ZEm05+E/44o4yeTIeuBWqPg=; b=dgM/jattlhtloyVGd/mxvv7IITqq6v3ufAiB08d03VQ+TZ0MS/fOviemV+qWOuC20s Uw5kfdcNnOkIRA0wteikFO9TwBb+aVlifh6MKnEcJLpT7LTmvym4bNTIBna0C03Sgo6X vE+hbMwmlf6EncVdzZIKzR2TpjFXkCpA3XkHtmRkoRROmprzpZXLjopi/0XQccq3ncDM BN+6/Nrj+o496GIs/4ulYuBQpIH982KMwHT7yaoAA3PN0Zwm9JodY9r1UXyvjmMtUtG9 wOmjhiYGzAK5KMncCqNqIfjpohbBKh+LNtutO9SFm5LvVJr3hH0/GVillVm1JjPYxxSH GkjQ== X-Gm-Message-State: AO0yUKWD0Ew14Pia1Z5Aqh/9lTO1wvzdSUd/BRTafaSebd9o1lWDSlZM E0IFjBKTbVZzEX3T60wYGwQKgQ== X-Received: by 2002:a05:6000:8:b0:2c2:ad22:40ba with SMTP id h8-20020a056000000800b002c2ad2240bamr10493326wrx.68.1675945697850; Thu, 09 Feb 2023 04:28:17 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:17 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 2/8] ASoC: qcom: q6apm-dai: fix race condition while updating the position pointer Date: Thu, 9 Feb 2023 12:28:00 +0000 Message-Id: <20230209122806.18923-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356625675697515?= X-GMAIL-MSGID: =?utf-8?q?1757356625675697515?= It is noticed that the position pointer value seems to get a get corrupted due to missing locking between updating and reading. Fix this by adding a spinlock around the position pointer. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index ee59ef36b85a..bd35067a4052 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +54,7 @@ struct q6apm_dai_rtd { uint16_t session_id; enum stream_state state; struct q6apm_graph *graph; + spinlock_t lock; }; struct q6apm_dai_data { @@ -99,20 +101,25 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo { struct q6apm_dai_rtd *prtd = priv; struct snd_pcm_substream *substream = prtd->substream; + unsigned long flags; switch (opcode) { case APM_CLIENT_EVENT_CMD_EOS_DONE: prtd->state = Q6APM_STREAM_STOPPED; break; case APM_CLIENT_EVENT_DATA_WRITE_DONE: + spin_lock_irqsave(&prtd->lock, flags); prtd->pos += prtd->pcm_count; + spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); if (prtd->state == Q6APM_STREAM_RUNNING) q6apm_write_async(prtd->graph, prtd->pcm_count, 0, 0, 0); break; case APM_CLIENT_EVENT_DATA_READ_DONE: + spin_lock_irqsave(&prtd->lock, flags); prtd->pos += prtd->pcm_count; + spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); if (prtd->state == Q6APM_STREAM_RUNNING) q6apm_read(prtd->graph); @@ -253,6 +260,7 @@ static int q6apm_dai_open(struct snd_soc_component *component, if (prtd == NULL) return -ENOMEM; + spin_lock_init(&prtd->lock); prtd->substream = substream; prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler, prtd, graph_id); if (IS_ERR(prtd->graph)) { @@ -332,11 +340,17 @@ static snd_pcm_uframes_t q6apm_dai_pointer(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; struct q6apm_dai_rtd *prtd = runtime->private_data; + snd_pcm_uframes_t ptr; + unsigned long flags; + spin_lock_irqsave(&prtd->lock, flags); if (prtd->pos == prtd->pcm_size) prtd->pos = 0; - return bytes_to_frames(runtime, prtd->pos); + ptr = bytes_to_frames(runtime, prtd->pos); + spin_unlock_irqrestore(&prtd->lock, flags); + + return ptr; } static int q6apm_dai_hw_params(struct snd_soc_component *component, From patchwork Thu Feb 9 12:28:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp306263wrn; Thu, 9 Feb 2023 04:32:13 -0800 (PST) X-Google-Smtp-Source: AK7set87NpOtLfkMa+WJYWjkmJ/9BCxTnM2E45gIBoBpSK5g5xcnqcINvXsIHF7GhiDroTjjEnLv X-Received: by 2002:a50:8ac2:0:b0:4aa:b216:3e23 with SMTP id k2-20020a508ac2000000b004aab2163e23mr11529921edk.30.1675945933582; Thu, 09 Feb 2023 04:32:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945933; cv=none; d=google.com; s=arc-20160816; b=GHE1qxWbuWzlPaO6NKzcMQP9sVBJcZ1vZNP5KgI45a94uzTACiRt8ursTZRyYHk3dR 3SfOdTZQjXiYqyOyuKpVcBRnfiL1F1o4NuYT5Tg4c1a14azKwGgpcBXfk2qc6iSaAuSC AqEHfeVHMzmmKBgqDI2yVNM16XXz0YIKbKKFPl+wL3k9PMXJPegnZeG+BBZ5JjA951mo 1wiFlSefnpKQok1XySiMl18SzbEYcDnUtUislZS8QcAc0JBauCHHc5D7OtQb53NSg/sV B4vXbWL7wxHmWr/w6CsQooAJBskr6Z8k2aXtLu/E/NnmzcZt3Rj6WVHtV60eJv7DgOVN DRow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=la+zSqZHnDH4NrBUp1B5sU6rN4yJdP2UMwQ4cL39N1A=; b=zV3f63A0sKnIG1WbAWpf05px9rb8QqjV3zlcDGeiPS0MdIP59uCvUkOM54pLRjIHr+ xCKY9AuXqfBnVDsBptD3VVbKJsszRPaGcblX6Na3Gungc4+gxuv3+GeiAw0g6Ys783c2 v5SuKjAQs8x15+FJG5K9ivsFQ5LayOUfCvPOL3JCfu36MziDPkSLGNf/RriACTNLIsJ6 lrSfmGcg93oLPAQSr2pTUxfMWJgNgbyqZdM7zp4zdc3HQtMtxaxvT6Mbuy0Do4NVbXQi hQG8sJ7DKWxj/uzuoZ33LV/Uvr0Ae4E716iH1NbgRyNEYeE7Agl/LHBJL1WaAeGkecJd 4OvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NjJeO8Gg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d12-20020a50ea8c000000b0045fca739593si2120509edo.188.2023.02.09.04.31.49; Thu, 09 Feb 2023 04:32:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NjJeO8Gg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229869AbjBIM2u (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbjBIM2W (ORCPT ); Thu, 9 Feb 2023 07:28:22 -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 9C0F923C62 for ; Thu, 9 Feb 2023 04:28:20 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id a2so1590099wrd.6 for ; Thu, 09 Feb 2023 04:28:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=la+zSqZHnDH4NrBUp1B5sU6rN4yJdP2UMwQ4cL39N1A=; b=NjJeO8GgEt5hDiYdbv5bupUhixSFr+wUIsKkd+sY5GLYBTq3Hm+wfWYDNRbQCj3qyY lOCho4plKkO9xSwt3s6vP5IOL3mcbj0Ex52Mfmy1ajY5I7d5jaohXOg55uyzw2cgg3KI zgy84M8Q2FOmONb5dw8Q94MiDi+jbATkcD7EUUIhhDRYnFxgGTlyP3aKIr+4McvVWIGu STr+HyKJGeHESpFdQIBMdibvzGHzG6bf02K5nMsod7TWj1YZmiLmmXL3cwAnjnQVSnB3 FMVlG4qroocbJHKg/bHiL9zWuyvnSsHQmeD/CtqPUwprP2y2DmVZaIuGXhyRuxevolhG 7wIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=la+zSqZHnDH4NrBUp1B5sU6rN4yJdP2UMwQ4cL39N1A=; b=UnvmK6DUkOKqRYH848vIuWqlFVYj66Qc3ixVxfzSDeRUnG0qNb9wh3ZhO4uMA1kzBH JrQOsPSonmCv27fbGyQx36iH2CgDx4X7Wp3kRHuSyskyA6TCQbZIGgkeguw5oVS50cT6 QTntz2MCnQeEqJbc09VRRj+kRW8XgftEJkR6RalmXgF+sneqxivdusCLvpCHEj9fO+lf XXzPwSFzU13Xla0zSnxep1vcqKzE2vmXxm5sV3zerf72eWXNqpaKMy33tSDmNl3IxYKR Ss0Y4kxN/u5iytQ3G4JghkXlicrOtrDVabWkJl/B+pGfjAuzW9JqCjkOZmU1VtHMgsBO 7HJQ== X-Gm-Message-State: AO0yUKXAehZMMmOQ66DJGgq3g9aMCGGKyPArn6RftIva4NGay2423Mva jv/sh+k+MBevWWrHhdRJaeK62A== X-Received: by 2002:adf:f9cc:0:b0:2c3:e7d8:245c with SMTP id w12-20020adff9cc000000b002c3e7d8245cmr10617613wrr.13.1675945699206; Thu, 09 Feb 2023 04:28:19 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:18 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 3/8] ASoC: qcom: q6apm-dai: Add SNDRV_PCM_INFO_BATCH flag Date: Thu, 9 Feb 2023 12:28:01 +0000 Message-Id: <20230209122806.18923-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356683226735438?= X-GMAIL-MSGID: =?utf-8?q?1757356683226735438?= At the moment, playing audio with PulseAudio with the qdsp6 driver results in distorted sound. It seems like its timer-based scheduling does not work properly with qdsp6 since setting tsched=0 in the PulseAudio configuration avoids the issue. Apparently this happens when the pointer() callback is not accurate enough. There is a SNDRV_PCM_INFO_BATCH flag that can be used to stop PulseAudio from using timer-based scheduling by default. According to https://www.alsa-project.org/pipermail/alsa-devel/2014-March/073816.html: The flag is being used in the sense explained in the previous audio meeting -- the data transfer granularity isn't fine enough but aligned to the period size (or less). q6apm-dai reports the position as multiple of prtd->pcm_count = snd_pcm_lib_period_bytes(substream) so it indeed just a multiple of the period size. Therefore adding the flag here seems appropriate and makes audio work out of the box. Comment log inspired by Stephan Gerhold sent for q6asm-dai.c few years back. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index bd35067a4052..7f02f5b2c33f 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -64,7 +64,8 @@ struct q6apm_dai_data { static struct snd_pcm_hardware q6apm_dai_hardware_capture = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), + SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_BATCH), .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE), .rates = SNDRV_PCM_RATE_8000_48000, .rate_min = 8000, @@ -82,7 +83,8 @@ static struct snd_pcm_hardware q6apm_dai_hardware_capture = { static struct snd_pcm_hardware q6apm_dai_hardware_playback = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), + SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_BATCH), .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE), .rates = SNDRV_PCM_RATE_8000_192000, .rate_min = 8000, From patchwork Thu Feb 9 12:28:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp305898wrn; Thu, 9 Feb 2023 04:31:32 -0800 (PST) X-Google-Smtp-Source: AK7set9XYfBlo1uEVvjPLWT+MeQwUR09eB3Of/t1OQBFbcj2bIeLVXeAfVH4HNl1Ar971B8jaYm9 X-Received: by 2002:a17:90a:4f:b0:22c:5703:3d9f with SMTP id 15-20020a17090a004f00b0022c57033d9fmr12353998pjb.38.1675945892124; Thu, 09 Feb 2023 04:31:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945892; cv=none; d=google.com; s=arc-20160816; b=jltBIo6ABxSQVYqOYJ8z39m2jZZDpRw+mAvLEiLD+aFKLEYH+YRkWQ/n81MSpBhLqC vXO0Ty+zH+6+o2gmDPblgDyq3dM7hFK9xTrkWyon3ZyQFZ7Kgc8Q7RJYiNmKPng1+CHP pjHOjCi06AkzQBbZ+7OU/f/F6+D1lw9d8u0FCS/FQOiypuKuHOivnAzfc6nkMwPaveis iUAFq1PH7ypXqlaXmeJhUaZr66qimJVXK2m1rajty0oIESV3jn0PbXI/RjdrOY3y04pC NSYQX4xmWUmas9fyNmYmo+8cpgOFyZxdRVBD6vFh+KZBKjq9xN/yGB78XTOwDz2+6lJG oVDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=J3ujPUkgM6w68JhuQ2OFyntLPvFx3aPpntFnJGR14xI=; b=S2VhMgM3SkjiTMdMrO3GhW5Nyu3++MrFAisfedFddmcIElWv+PiBO7iyX/sfBAuwKT 5aP5TJMzrXMbMlGpgjP57VDpF/Pv2oEDWPgnL8+1ij0pTbOpHQPxppWvdGxLK64Lg9Ap fRNRgDiXY4Jc1EyXbr1hCQhzFTfgbOZ6d8gulkowpUKpL4eYwUvOB9+AiFURNJVxYMQR sHcVvizwn61oJNsezgnGUbIXRFe5+M+HamIR7Eyr8TtrXbZkYxLnYze0GFqY57NRII9/ wNwPqniTTJ1OX5VfNGq2Msx7gIdVfCUd/RfH4IlxEnXRUm/B4cXZCrb/gybVc6u152RQ UlAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ijtf7zQN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a17090a4a9000b0023234b27893si2121754pjh.26.2023.02.09.04.31.18; Thu, 09 Feb 2023 04:31:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ijtf7zQN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229897AbjBIM2w (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbjBIM2W (ORCPT ); Thu, 9 Feb 2023 07:28:22 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6D1A126D8 for ; Thu, 9 Feb 2023 04:28:21 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id f47-20020a05600c492f00b003dc584a7b7eso3738032wmp.3 for ; Thu, 09 Feb 2023 04:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=J3ujPUkgM6w68JhuQ2OFyntLPvFx3aPpntFnJGR14xI=; b=Ijtf7zQNxQutfacxe7HkX1oZwBtdY0P9UgLSO8dhkP1U65kpJZJY7R1MMUyp6Ct4cD GLrKvMf4G8iPDCfLMR3KxkIlon3eS1Xk3zCwH/xrQT4V7rasfXSqO1W9FkT8JEwYG5nd vP7HU4m5aPIf3u7g0VK2aJyRsrCAVSO4I+7yaTvQlY0tkYTo78Ug18ERnMuYx1t6mXeu oZSmmi80y0kP5uJ/f6Ek8Y6oJvaacva8e/X8jBsI6J64GMqPq05H2DDCLPvWcgtqAy3k aFstUecHk+zX1c8eISshFvZUTetRV1WcNNIufuMsAsWp1bBovtK8eJZpyD4YQlqFQtJO IJQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J3ujPUkgM6w68JhuQ2OFyntLPvFx3aPpntFnJGR14xI=; b=iixzwsf0x1hnqIjn8/8Seeznw9/USez6cA8Oy8KQH1iHUaNNKRxx+lXGI0smuFU2Yf cwyI6kdCteVI/IixaZVvfdX6pcKlKHeSWfpufOOKKQeAD+nzQZuW2wV3aRAoXwpUoC6F CCqUNNpfbDvzLptK90yS5hQp+ysF+L+N0id21xKh+ENvQC+9li9Tgc+CtmcRsqkWYgWM SZMSdEQYJwRHLgiWr2R31YcTIT5sSQC8L5vRlZQB4RuXZWyNP2maYT0JFiYO0FPIKRZh Ivf2b6qcO2G+kb4ooGfXpg+fo/mHIoMRX73ybdYrpZbCgmFmBoXKSUfqces3YoaLnNOr VYZQ== X-Gm-Message-State: AO0yUKW0Pc8zOuF8D/eZj/za3585lGajokK59YB59tzfLKHDONnodtvF zJ6pn2wb6NuPYkpX9Z3LZITswg== X-Received: by 2002:a05:600c:511e:b0:3df:9858:c038 with SMTP id o30-20020a05600c511e00b003df9858c038mr5876254wms.13.1675945700377; Thu, 09 Feb 2023 04:28:20 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:19 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 4/8] ASoC: qcom: audioreach: fix ADSP ready check Date: Thu, 9 Feb 2023 12:28:02 +0000 Message-Id: <20230209122806.18923-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356639828222061?= X-GMAIL-MSGID: =?utf-8?q?1757356639828222061?= currently q6apm_is_adsp_ready() will only return the cached value of previous result. If we are unlucky and previous result is not-ready then the caller will always get not-ready flag. This is not correct, we should query the dsp of its current state in irrespective of previous reported state. Fixes: 47bc8cf60e92 ("ASoC: qdsp6: audioreach: Add ADSP ready check") Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm.c b/sound/soc/qcom/qdsp6/q6apm.c index 8a7dfd27d3c5..994c9e823a88 100644 --- a/sound/soc/qcom/qdsp6/q6apm.c +++ b/sound/soc/qcom/qdsp6/q6apm.c @@ -145,14 +145,6 @@ static void q6apm_put_audioreach_graph(struct kref *ref) kfree(graph); } -bool q6apm_is_adsp_ready(void) -{ - if (g_apm && g_apm->state) - return true; - - return false; -} -EXPORT_SYMBOL_GPL(q6apm_is_adsp_ready); static int q6apm_get_apm_state(struct q6apm *apm) { @@ -169,6 +161,15 @@ static int q6apm_get_apm_state(struct q6apm *apm) return apm->state; } +bool q6apm_is_adsp_ready(void) +{ + if (g_apm) + return q6apm_get_apm_state(g_apm); + + return false; +} +EXPORT_SYMBOL_GPL(q6apm_is_adsp_ready); + static struct audioreach_module *__q6apm_find_module_by_mid(struct q6apm *apm, struct audioreach_graph_info *info, uint32_t mid) From patchwork Thu Feb 9 12:28:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54929 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp306814wrn; Thu, 9 Feb 2023 04:33:24 -0800 (PST) X-Google-Smtp-Source: AK7set/Fq5qyOnhWiPIL1Xv/r8PvnEUMhzbVx4tXToUS6GLV+/pOBK4sF/o6WBLEj5rcIYX0AMPz X-Received: by 2002:a50:d48e:0:b0:499:4130:fae with SMTP id s14-20020a50d48e000000b0049941300faemr12318747edi.10.1675946004214; Thu, 09 Feb 2023 04:33:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675946004; cv=none; d=google.com; s=arc-20160816; b=qjddvwFH9tDLJGf72g7mf19018griFAbWWBH8AantdJb+d2MIYP1AHURgu/JdfGxUH VWUhqT8YzJ/DeNHul1MRoePsCGqjogH/yB7qaa7nnYC8dlwOGJ0FmsfoAVJTITZ5Brwu jz1t4Gno23Yqmx/NNIi0FAmluCOl9fb8M0oz3cs9E4TTHCA/pFozy46dj4O/ExfYvZE6 SdQobhONzk+oc73GHMNA6ZoUtzpbrcurorH8Tfp+Dauq+z9KMglSskLPWevS0HCiGi5D AKuY+jwO8jRnvZT1ZTbEIflY5FpWUwJerMixBned5nMxttkbtwAgW6e0NN11SAEe5G7b M7Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RdgbNuhnuI8HvGFss/JHz5QrLG7sfZSeSJMIaBHo/bk=; b=syeSSMuz0qXIC1weZH92wwzsQv0XZtKF2VLRtguE7mRUal6wOh1HbuePP6QGj9X6EV qDrFl+rYRL7uFTjx62ORjatPcdQrcw3kS9Q8z0urZG74XgQdf0Ux6wnAWt+jpVO1Do09 jSZSXdTQ15KqXUq1kkIMYRZ9ZCEbxztKiQ0aqftBHs6Lm/lzOgz8nRQrNQHZknZfgO9Z 543P/pVZw3rfChBh1qw59PLhUZ+f0oNTR64tN30/Qet+Xpt1zPZfqwu0uiyi056ubIkI aAVQkdbD/WYQyBIXG7oN1y73c/PYXGNBB9ic+Yf+IfG50BSYITEvc7CnnBJhiHJmkrKy /TRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QJVTqSRd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020aa7d3c3000000b004a21737558bsi2148430edr.291.2023.02.09.04.32.57; Thu, 09 Feb 2023 04:33:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QJVTqSRd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229940AbjBIM2y (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbjBIM2Y (ORCPT ); Thu, 9 Feb 2023 07:28:24 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 112A3126D8 for ; Thu, 9 Feb 2023 04:28:23 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id d14so1574439wrr.9 for ; Thu, 09 Feb 2023 04:28:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=RdgbNuhnuI8HvGFss/JHz5QrLG7sfZSeSJMIaBHo/bk=; b=QJVTqSRdqqHcybqhGKd2Rfv9F2xEWixeuwVkVGwpshvwk/g848tUi0Tnis3ZZPWjWV 6Uy+gztl/cYhIirToJICkm5iwqJYu/Uk85Q15oUO6TjGoexpBWWIy1trXUCg7Ynh46Ku t/Qkd/tQhXlzuF43Oqd24cCfB/nMbl3CCCqJFaU/U1CWygEnXA+1F2esIadvmGjC2o1e MBGndlLA5y0/4A6mQ9+piQKENLzl3YM0lVIF3lZdPskfaTS8IuqVw2espMWsccbBEfc2 oiGb/P7q7J9IzWau5/7x0jw+TWoH2Nvpo0RxUUMKnuArv9rj1EMfl2khyTzwD+VxJHLj R0pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RdgbNuhnuI8HvGFss/JHz5QrLG7sfZSeSJMIaBHo/bk=; b=kPenOZ1ZfOMVzC8Yy0ysLbEsmwoNXWFgxJ7FKSMmXFvSVr+fSGP1mOm06CvVvXwfuS 8zvmrT1qBHDdD52N/Lc1uvv65vmWkJYpJulAl9t6xFtSqN9U8LwLOhcsIXDcMLkHHTpg q+NvLoL42s3EBlyYmnawPDcXU+n7m5rCbly94qEAw8z4umRAOVt5o6OCGCdCKnehRRQ4 xH6QlpEaRPRMS9WMmtM7iTXhmN3yKPucAG9bvHvufGyRziNtXdvzbXYBvX2YIHMU3iuc 3j+d21YDyUFfdELYupQWCJCoB66MVOZxh09R8eGaJIG0rm2xdnzOde6r9BXP17ugJtZ1 3UFw== X-Gm-Message-State: AO0yUKVNdIxdCj6GJVEYd3GLbYruCdO0gp/n0rYhQ3JihtvzNJcdC1IF AJ4PQ28LOjZUCumeljwcH91DaA== X-Received: by 2002:a5d:4806:0:b0:2c3:ea6b:ef83 with SMTP id l6-20020a5d4806000000b002c3ea6bef83mr11677540wrq.12.1675945701608; Thu, 09 Feb 2023 04:28:21 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:20 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 5/8] ASoC: codecs: lpass: register mclk after runtime pm Date: Thu, 9 Feb 2023 12:28:03 +0000 Message-Id: <20230209122806.18923-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356757426513606?= X-GMAIL-MSGID: =?utf-8?q?1757356757426513606?= move mclk out registration after runtime pm is enabled so that the clk framework can resume the codec if it requires to enable the mclk out. Fixes: c96baa2949b2 ("ASoC: codecs: wsa-macro: add runtime pm support") Fixes: 72ad25eabda0 ("ASoC: codecs: va-macro: add runtime pm support") Fixes: 366ff79ed539 ("ASoC: codecs: rx-macro: add runtime pm support") Fixes: 1fb83bc5cf64 ("ASoC: codecs: tx-macro: add runtime pm support") Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- sound/soc/codecs/lpass-tx-macro.c | 8 ++++---- sound/soc/codecs/lpass-va-macro.c | 20 ++++++++++---------- sound/soc/codecs/lpass-wsa-macro.c | 9 ++++----- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index a9ef9d5ffcc5..dd6970d5eb8d 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3601,10 +3601,6 @@ static int rx_macro_probe(struct platform_device *pdev) if (ret) goto err_fsgen; - ret = rx_macro_register_mclk_output(rx); - if (ret) - goto err_clkout; - ret = devm_snd_soc_register_component(dev, &rx_macro_component_drv, rx_macro_dai, ARRAY_SIZE(rx_macro_dai)); @@ -3618,6 +3614,10 @@ static int rx_macro_probe(struct platform_device *pdev) pm_runtime_set_active(dev); pm_runtime_enable(dev); + ret = rx_macro_register_mclk_output(rx); + if (ret) + goto err_clkout; + return 0; err_clkout: diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 2ef62d6edc30..b9475ba55e20 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -2036,10 +2036,6 @@ static int tx_macro_probe(struct platform_device *pdev) if (ret) goto err_fsgen; - ret = tx_macro_register_mclk_output(tx); - if (ret) - goto err_clkout; - ret = devm_snd_soc_register_component(dev, &tx_macro_component_drv, tx_macro_dai, ARRAY_SIZE(tx_macro_dai)); @@ -2052,6 +2048,10 @@ static int tx_macro_probe(struct platform_device *pdev) pm_runtime_set_active(dev); pm_runtime_enable(dev); + ret = tx_macro_register_mclk_output(tx); + if (ret) + goto err_clkout; + return 0; err_clkout: diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index b0b6cf29cba3..1623ba78ddb3 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1524,16 +1524,6 @@ static int va_macro_probe(struct platform_device *pdev) if (ret) goto err_mclk; - ret = va_macro_register_fsgen_output(va); - if (ret) - goto err_clkout; - - va->fsgen = clk_hw_get_clk(&va->hw, "fsgen"); - if (IS_ERR(va->fsgen)) { - ret = PTR_ERR(va->fsgen); - goto err_clkout; - } - if (va->has_swr_master) { /* Set default CLK div to 1 */ regmap_update_bits(va->regmap, CDC_VA_TOP_CSR_SWR_MIC_CTL0, @@ -1560,6 +1550,16 @@ static int va_macro_probe(struct platform_device *pdev) pm_runtime_set_active(dev); pm_runtime_enable(dev); + ret = va_macro_register_fsgen_output(va); + if (ret) + goto err_clkout; + + va->fsgen = clk_hw_get_clk(&va->hw, "fsgen"); + if (IS_ERR(va->fsgen)) { + ret = PTR_ERR(va->fsgen); + goto err_clkout; + } + return 0; err_clkout: diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 5cfe96f6e430..c0b86d69c72e 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2451,11 +2451,6 @@ static int wsa_macro_probe(struct platform_device *pdev) if (ret) goto err_fsgen; - ret = wsa_macro_register_mclk_output(wsa); - if (ret) - goto err_clkout; - - ret = devm_snd_soc_register_component(dev, &wsa_macro_component_drv, wsa_macro_dai, ARRAY_SIZE(wsa_macro_dai)); @@ -2468,6 +2463,10 @@ static int wsa_macro_probe(struct platform_device *pdev) pm_runtime_set_active(dev); pm_runtime_enable(dev); + ret = wsa_macro_register_mclk_output(wsa); + if (ret) + goto err_clkout; + return 0; err_clkout: From patchwork Thu Feb 9 12:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp306499wrn; Thu, 9 Feb 2023 04:32:44 -0800 (PST) X-Google-Smtp-Source: AK7set/AFXp8zCUYZO574w1lcnbRzHLg+VNL7HOgltj+YVgDBosDT8lBI1mgC+1Ab6Qbw7LNiRXe X-Received: by 2002:a17:90a:ae0e:b0:232:cdb6:c4ad with SMTP id t14-20020a17090aae0e00b00232cdb6c4admr2261008pjq.0.1675945963820; Thu, 09 Feb 2023 04:32:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675945963; cv=none; d=google.com; s=arc-20160816; b=MXovlONmVuQm2qdTHai9MC0zQkLHzJ3nK8ElwQ6LlY3nzNyG0eOgTK28eDFMGByR9Q NyXIFUQaUUs1e+/JH92s/bmPAvumuzMixEJSbqdepCOku4eyfFwrJySIgfcqrIiUKtSr wR90pnGeApWbwNDBAkPWuVzK8QGe1pA5W+jEdXx3agexKGvU6Um8DtAtmYX8ieFtyWrv LJd1J2SG5Bt8HTLravtC9Xz0sSP2qaEd7AEgeIRYSadHYGIWBJ+vmJKzIDTEAG1ZKxOA b7BdIm2ZrjCN3QEUzy8eIZbHnyXFp0v1rK+NLb6Yh/vzyW/oDuiRd4nn2w5ov/moZ5w2 g4EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6wrxQA0MT8PveUUiIj83RXA4CfwfsCaWsptgakRSOp4=; b=ubtd5XCpqaOjtynzAAJ/e8Xa7upvAQBxJXn/Mqyp4OW2zySqHTBXoOIfTgl6CRSdyo 5khhtWJu3Zm+m6CdHQZgdjJ6jX+fKmKEdsD5+Nv9r5FaMu/XzEVCvjM05c9u2KKdxrfE HGSnXBPe3z+h8hFIzK5DVNgBYhVxcvCwVos1dWY1F/rvxipOCAQyCC63+nPsRxmYsiWq a6D23TA3FNc8Btj7wHQ7si3xci1mu+vLWjamIp653QHSlKnMfu5s0c/yxcs0aa44o/K/ nYpzYIAnSNKnxJCslYzQWIxwPnxUZWdgHZZjQBp6+OZXoRDWmFW92V/UIi/5W6ZRHGzr EAug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G7A7Y63P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a17090a4a9000b0023234b27893si2121754pjh.26.2023.02.09.04.32.00; Thu, 09 Feb 2023 04:32:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G7A7Y63P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229925AbjBIM2x (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229910AbjBIM2Z (ORCPT ); Thu, 9 Feb 2023 07:28:25 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58059241F9 for ; Thu, 9 Feb 2023 04:28:24 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id d14so1574487wrr.9 for ; Thu, 09 Feb 2023 04:28:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=6wrxQA0MT8PveUUiIj83RXA4CfwfsCaWsptgakRSOp4=; b=G7A7Y63Pa/o5zi3dcrirqZ5NuH8B040ZdYN9DhUJByd+Hhiiv8ctVZ3MC1y7llq/uO HMY9oArgm8x8oOqcHx2GQPd8noLxbflJEaj3MJrM7NLA3y5m7EgstDKSP7bdKdLssyER 6XHp6wlCExu+KLTi4vkq9oX39jkWwjxzm45TZt0wwaU8SgrwgGS7VrQgiZSph9S/ZQs+ tfHlpu+Gihil+1DOh+6ZgKcBuP1LvfhbFMl1nFK8jpqXDSKPTMRzj+vwRrJiBz2ICSgW dO0uRF6n+MgnWHjM8hsgujWZhMy378XvbLg5cWAn0suEpWhxHNoBShzR9W+59oHcfr59 V3Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6wrxQA0MT8PveUUiIj83RXA4CfwfsCaWsptgakRSOp4=; b=GUbfm2Cb9V6+BbWBOfg4dkYznFTWugCqro214aJt9ziKC/WgBFUL/1k2IYlx/WZI0P CNdSwvlOXnEQR+OW3iDYhdf2VZKf+xmOM5B7p0yF4l7/5Edq/2rTfbJ1JinDDtlmaVwT P2OVT4TTipKpwEkMT1okz4ucME3TeGKYEG1oRhgxrsxjxScmy/VHemmufitEEtj7ARqT Yuo7RN3qvJXCWtp8B+xeZ9WvIJ+ePaSu8EOU7XRcqqjQuLn/NqfzXMIEsfguC/AxX7Bm DqPOi0U53qp7bYEognRg5RpU78rWNoBeXB2su/Nl0PcvgaA4zq7gnbcWJay6bcA+9eU9 1+Ug== X-Gm-Message-State: AO0yUKVbs5q8wB46YYErecq/CsF+VxqW8kjuP2OGgsrRJRj56cvQ52aw odg/K+IwspjWvotYhe1B5xVOCQ== X-Received: by 2002:adf:fb05:0:b0:2bf:b199:c7ef with SMTP id c5-20020adffb05000000b002bfb199c7efmr9814157wrr.12.1675945702809; Thu, 09 Feb 2023 04:28:22 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:22 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 6/8] ASoC: codecs: lpass: fix incorrect mclk rate Date: Thu, 9 Feb 2023 12:28:04 +0000 Message-Id: <20230209122806.18923-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356715019596286?= X-GMAIL-MSGID: =?utf-8?q?1757356715019596286?= For some reason we ended up with incorrect mclk rate which should be 1920000 instead of 96000, So far we were getting lucky as the same clk is set to 192000 by wsa and va macro. This issue is discovered when there is no wsa macro active and only rx or tx path is tested. Fix this by setting correct rate. Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/lpass-rx-macro.c | 4 ++-- sound/soc/codecs/lpass-tx-macro.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index dd6970d5eb8d..8621cfabcf5b 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -366,7 +366,7 @@ #define CDC_RX_DSD1_CFG2 (0x0F8C) #define RX_MAX_OFFSET (0x0F8C) -#define MCLK_FREQ 9600000 +#define MCLK_FREQ 19200000 #define RX_MACRO_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\ @@ -3579,7 +3579,7 @@ static int rx_macro_probe(struct platform_device *pdev) /* set MCLK and NPL rates */ clk_set_rate(rx->mclk, MCLK_FREQ); - clk_set_rate(rx->npl, 2 * MCLK_FREQ); + clk_set_rate(rx->npl, MCLK_FREQ); ret = clk_prepare_enable(rx->macro); if (ret) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index b9475ba55e20..2449a2df66df 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -203,7 +203,7 @@ #define TX_MACRO_AMIC_UNMUTE_DELAY_MS 100 #define TX_MACRO_DMIC_HPF_DELAY_MS 300 #define TX_MACRO_AMIC_HPF_DELAY_MS 300 -#define MCLK_FREQ 9600000 +#define MCLK_FREQ 19200000 enum { TX_MACRO_AIF_INVALID = 0, @@ -2014,7 +2014,7 @@ static int tx_macro_probe(struct platform_device *pdev) /* set MCLK and NPL rates */ clk_set_rate(tx->mclk, MCLK_FREQ); - clk_set_rate(tx->npl, 2 * MCLK_FREQ); + clk_set_rate(tx->npl, MCLK_FREQ); ret = clk_prepare_enable(tx->macro); if (ret) From patchwork Thu Feb 9 12:28:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp306815wrn; Thu, 9 Feb 2023 04:33:24 -0800 (PST) X-Google-Smtp-Source: AK7set9LQe84qpV5H3HNkTmrxCR3tBzNiKALIaTNSTld37q6ulUzaTiqTpN6xWES0WilHMGQGUsS X-Received: by 2002:a50:951c:0:b0:4ab:16fb:bca2 with SMTP id u28-20020a50951c000000b004ab16fbbca2mr4476206eda.38.1675946004210; Thu, 09 Feb 2023 04:33:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675946004; cv=none; d=google.com; s=arc-20160816; b=DWS1FPsr9DxQCiJibkltWnz25CCM2qxrw7Sc5BBwcbcwubrqyK7wDHvaamfv/6TMgw P8AEDyfEpmpQvVkJu3pCzpUXu5DLdxaIYzCrGj2PrQHef5Azl03eBqCIL5V/fWgDkIAx xHyvLUA5nSc23O4B2xUpcmsZLCfXn9/F12h4s3wfo5ohLhDx2c7DNX1koS3U5WZDX91A DoO8nJano3OGIViy1UfnRT8X4mbgG0uRKn1SZ+zZKktUZM2+M+JTKXiOvCTj1cZMgY+h HzkhZQE10Fsmg+FMApSB4X5ZTR48Gq759HJN+aWNAvsP8htiK2xxVgOa1J9fcTWEZ+cL b+mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7J51vgEiaGDFuktVhqlKRRMFvlVjeM/+eUZ5W699kLE=; b=eda5YQ1zw81wz58X+0f7iHy+bh7j/KY9AGDXtO0XgtT9A3JeoLzN83OataSYeoyTaF VQ2V2fB7VINKUNQfPr80+LSymXBSKnS4TJvgOzzKYPU8BWtSwg/Q30y4A5MjgCVxMVid 0n/BABiI2z/aFe/g3tu4Qqb9gfIkcKz28O5YRHMSZEtw8vSSXt3BtNBCk6OfRWyu3Dl5 HNoIaOJ005PetE0GuY7V4w89fFU6mUpYbOjitqLkyI4DXASH0sWGgByrNrN+BtVo1w78 RfxC0OGcO4vVVUfO6aWbH6LdUyeHwA+1i9sVzyCVj/oTows16ScOXfYnKTnf3fEFXqUD hgeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PCfXqvb3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y7-20020a50eb07000000b004a2424d1c19si2369599edp.8.2023.02.09.04.32.57; Thu, 09 Feb 2023 04:33:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PCfXqvb3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229955AbjBIM24 (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbjBIM20 (ORCPT ); Thu, 9 Feb 2023 07:28:26 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B2D126D8 for ; Thu, 9 Feb 2023 04:28:25 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id bu23so1580402wrb.8 for ; Thu, 09 Feb 2023 04:28:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=7J51vgEiaGDFuktVhqlKRRMFvlVjeM/+eUZ5W699kLE=; b=PCfXqvb3MXz9ybFoUWSj+AwWp6shrqNt6lrisz1CJ06Pu1nc06PNM6j7c1p3el6waP DRep5qrA1ntjZjOdNZQnprm6kQxDwh0y94km9LhmJM1RO0ZogRWTiV804fSD2xG0RClk KzrORVI0GK1tr4aT0hCXze+8h+VB8TDSB7XPJNXHw5GYU2NCFB4yhznTupkujEafaMfU f8GzjGIdgr1aidZBrvgEUA+5dlFtRTcEodCRa9H7KBGTQFESbeyCoyWdNsDxqqUu0zDr s740OJiPuhnvOgv/ezTuYpdKiq3vlgfjhEdoTf8j5h3IGUF1S/Je0XqnHmM9opsTmq1c llag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7J51vgEiaGDFuktVhqlKRRMFvlVjeM/+eUZ5W699kLE=; b=Q4o5G3LVXzuAkcIddaWE1UdgPBBQKHEdNaqyHpMNHHBRzFGPfq94/5D0OP4LpbB1dl en831egVMfuRqPHfwc/7MI1SJQPziLyB6j2LLEVHjUD4NRgFvJ2n15ae5Z3icxrI7XEv 7/ZMrGsAOp2jHLhmXbT5duXXr0IFo9hp//5zyzzSajmKl9iQu0GdjM+84XHQL4BgGsET vMb7BZQgUwtTR6NjqUCIz/0bfZIkGE5Km9ETVsliGbXcrGnt+ApLzJO9w00kUHz+4Ml5 XDrs2lpp+PVYVdxnxGayNytbxpsIzGZYvq/mGqTPkkCEZu/vguQPhX0WTXBJDHC+fpp9 vEhw== X-Gm-Message-State: AO0yUKVSqCVn51nsev4Z+yLpD4kC7seeehzWOTgr6XY9a10XfdBERHd4 AdKAJmL+P3ZV9W+lpAliYQSZCg== X-Received: by 2002:adf:f18a:0:b0:2c3:24f3:8b47 with SMTP id h10-20020adff18a000000b002c324f38b47mr11669836wro.31.1675945704133; Thu, 09 Feb 2023 04:28:24 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:23 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 7/8] ASoC: codecs: lpass: do not reset soundwire block on clk enable Date: Thu, 9 Feb 2023 12:28:05 +0000 Message-Id: <20230209122806.18923-8-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356757483257556?= X-GMAIL-MSGID: =?utf-8?q?1757356757483257556?= resetting soundwire block will put the slaves out of sync and result in re-enumeration during fsgen disable/enable path this is totally unnecessary and resulting fifo overflows. Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/lpass-rx-macro.c | 17 +++++++++++------ sound/soc/codecs/lpass-tx-macro.c | 15 ++++++++++----- sound/soc/codecs/lpass-va-macro.c | 23 ++++++++++++----------- sound/soc/codecs/lpass-wsa-macro.c | 18 +++++++++++------- 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 8621cfabcf5b..e0d891a67a12 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3441,16 +3441,10 @@ static int swclk_gate_enable(struct clk_hw *hw) } rx_macro_mclk_enable(rx, true); - regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, - CDC_RX_SWR_RESET_MASK, - CDC_RX_SWR_RESET); regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, CDC_RX_SWR_CLK_EN_MASK, 1); - regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, - CDC_RX_SWR_RESET_MASK, 0); - return 0; } @@ -3601,6 +3595,17 @@ static int rx_macro_probe(struct platform_device *pdev) if (ret) goto err_fsgen; + /* reset swr block */ + regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, + CDC_RX_SWR_RESET_MASK, + CDC_RX_SWR_RESET); + + regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, + CDC_RX_SWR_CLK_EN_MASK, 1); + + regmap_update_bits(rx->regmap, CDC_RX_CLK_RST_CTRL_SWR_CONTROL, + CDC_RX_SWR_RESET_MASK, 0); + ret = devm_snd_soc_register_component(dev, &rx_macro_component_drv, rx_macro_dai, ARRAY_SIZE(rx_macro_dai)); diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 2449a2df66df..bf27bdd5be20 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1861,15 +1861,10 @@ static int swclk_gate_enable(struct clk_hw *hw) } tx_macro_mclk_enable(tx, true); - regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, - CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE); regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, CDC_TX_SWR_CLK_EN_MASK, CDC_TX_SWR_CLK_ENABLE); - regmap_update_bits(regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, - CDC_TX_SWR_RESET_MASK, 0x0); - return 0; } @@ -2036,6 +2031,16 @@ static int tx_macro_probe(struct platform_device *pdev) if (ret) goto err_fsgen; + /* reset soundwire block */ + regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, + CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE); + + regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, + CDC_TX_SWR_CLK_EN_MASK, + CDC_TX_SWR_CLK_ENABLE); + regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, + CDC_TX_SWR_RESET_MASK, 0x0); + ret = devm_snd_soc_register_component(dev, &tx_macro_component_drv, tx_macro_dai, ARRAY_SIZE(tx_macro_dai)); diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index 1623ba78ddb3..fd62817d29a0 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1333,17 +1333,9 @@ static int fsgen_gate_enable(struct clk_hw *hw) int ret; ret = va_macro_mclk_enable(va, true); - if (!va->has_swr_master) - return ret; - - regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, - CDC_VA_SWR_RESET_MASK, CDC_VA_SWR_RESET_ENABLE); - - regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, - CDC_VA_SWR_CLK_EN_MASK, - CDC_VA_SWR_CLK_ENABLE); - regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, - CDC_VA_SWR_RESET_MASK, 0x0); + if (va->has_swr_master) + regmap_update_bits(regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, + CDC_VA_SWR_CLK_EN_MASK, CDC_VA_SWR_CLK_ENABLE); return ret; } @@ -1538,6 +1530,15 @@ static int va_macro_probe(struct platform_device *pdev) } + if (va->has_swr_master) { + regmap_update_bits(va->regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, + CDC_VA_SWR_RESET_MASK, CDC_VA_SWR_RESET_ENABLE); + regmap_update_bits(va->regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, + CDC_VA_SWR_CLK_EN_MASK, CDC_VA_SWR_CLK_ENABLE); + regmap_update_bits(va->regmap, CDC_VA_CLK_RST_CTRL_SWR_CONTROL, + CDC_VA_SWR_RESET_MASK, 0x0); + } + ret = devm_snd_soc_register_component(dev, &va_macro_component_drv, va_macro_dais, ARRAY_SIZE(va_macro_dais)); diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index c0b86d69c72e..e6b85f3692ac 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2270,17 +2270,10 @@ static int wsa_swrm_clock(struct wsa_macro *wsa, bool enable) } wsa_macro_mclk_enable(wsa, true); - /* reset swr ip */ - regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, - CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_ENABLE); - regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, CDC_WSA_SWR_CLK_EN_MASK, CDC_WSA_SWR_CLK_ENABLE); - /* Bring out of reset */ - regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, - CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_DISABLE); } else { regmap_update_bits(regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, CDC_WSA_SWR_CLK_EN_MASK, 0); @@ -2451,6 +2444,17 @@ static int wsa_macro_probe(struct platform_device *pdev) if (ret) goto err_fsgen; + /* reset swr ip */ + regmap_update_bits(wsa->regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, + CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_ENABLE); + + regmap_update_bits(wsa->regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, + CDC_WSA_SWR_CLK_EN_MASK, CDC_WSA_SWR_CLK_ENABLE); + + /* Bring out of reset */ + regmap_update_bits(wsa->regmap, CDC_WSA_CLK_RST_CTRL_SWR_CONTROL, + CDC_WSA_SWR_RST_EN_MASK, CDC_WSA_SWR_RST_DISABLE); + ret = devm_snd_soc_register_component(dev, &wsa_macro_component_drv, wsa_macro_dai, ARRAY_SIZE(wsa_macro_dai)); From patchwork Thu Feb 9 12:28:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 54930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp306816wrn; Thu, 9 Feb 2023 04:33:24 -0800 (PST) X-Google-Smtp-Source: AK7set+cKEjzp4s2KQ+qqWlevtRZfFxpI6Jr+nUd6lBgRf51jv6WO4KzGy+3cA79lflpfqm3+Rhd X-Received: by 2002:a50:f606:0:b0:4ab:15e2:7df6 with SMTP id c6-20020a50f606000000b004ab15e27df6mr5200493edn.30.1675946004239; Thu, 09 Feb 2023 04:33:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675946004; cv=none; d=google.com; s=arc-20160816; b=z1Ba+ffUUGAgR+qR38nyHlSpsYrWoVFJ+9uJHcAjSGGGdFAGFt7aZm1X9YGn4/I3M1 dkAvPiDTB5yjLzCEOx8CwWozuPQzKUSdbI262/tVKys/cMYdAj8e7K/MxqLBCjEeadMl NtLJGZ9kXMOaigfti2n1JN8NQ19yNnKu0N4I/ia7LRgTxpIYvBgJ1UiHw+c/yUYiwVMS v+hv8SYgnMVMNds+BphJD3Mpu2JCCM3hQRyya5aMS1z4aYMyh0/zBVN8UaFSBkEXiNCS GgX+N6dP339nkGFmhEGV99U1JzsGfVkBRK9RPPArxDY1MfsfzJU1HJ1F+JLmIRpVaYq6 AwbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UO9KJ117wKTOcC1OUg42YLZeFHf8xivZIBaKC4T0Ad8=; b=jdDUc/8O1M1FR6i0Ry2ns9rptBSItjRqSSKFP9Xs/+A0U7IM5cPqnngA5FbHdqBHzA AyF2lY0Q9VDGStdMWqCZDUvO3rdqiEytWSDUkysd2RV8ZNHRyrZb8qkmPq4KpFGDTlWj Y6Ce6brn68ErIXWQkcPO21S46YW9fFUMNjVPQ88AllSdM+ENBaDvKaiTe4b3IhHgUqG2 pNQRkoZGywI47ct2PYsW10c9f/0pU3D7AIZtWbQssi4zYiJOscBt3F/gZsyT024rdVPq vcfjnjqx+B/bh4RxLw6YIJ19PUnKJ4um6yPbf2ZFH4VS917g+/rGP62onN8q14tJokER vnNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b9oygx40; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m20-20020aa7c2d4000000b0049f1ef400eesi2298956edp.120.2023.02.09.04.32.57; Thu, 09 Feb 2023 04:33:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b9oygx40; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229969AbjBIM26 (ORCPT + 99 others); Thu, 9 Feb 2023 07:28:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229918AbjBIM21 (ORCPT ); Thu, 9 Feb 2023 07:28:27 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBBBC30C1 for ; Thu, 9 Feb 2023 04:28:26 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id j23so1644832wra.0 for ; Thu, 09 Feb 2023 04:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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; bh=UO9KJ117wKTOcC1OUg42YLZeFHf8xivZIBaKC4T0Ad8=; b=b9oygx40ldJo9LFfDxM4Te1QkbTRduIx2zVwXgfZZlw016ZqVoksT+wtVCQGunMT/J YjodNFj2pecm6xkX981QtGhSTVyPtLanuH3r+sXdTB0TcDZQXKNnaADCcOvzTHa1zj3j V7qtW6UTFA/Mvp2VPbdzlI+7RerZUVvD7KCQVI1+oGwJXR7PbS8vQHPluqqNvJFDTzfa 6IOKqlub03jLkeKyoriFs6RIlaiTw8DuJAXG7RTu1jPbqEiLgZJ5OsCvS4MpoqI5HtFD qUh650ZARW0ePEJKErVcUo5+dpXXAoMX4YWQumZOAGbsUKlt7Qg1PYPPPYu5I001/x28 RhDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UO9KJ117wKTOcC1OUg42YLZeFHf8xivZIBaKC4T0Ad8=; b=xK5EwQhm/VGy2zbm+kK2vDFn8ODwF4gYA7K7pls6ye+tqkeIrRpY5DZxpGwQNwyqKb OrdkfCOZdLr3VB2bjxDFrMIFRWhROz+cdXcurEH78uXvCBPA4wk2Y+C6ywz/+GkDDKJX AQqdt7W4ouphGkGLHiNbWqhvxhQng0YCa8IZsd/r/L94LXUxOwz9KItrJKQ+S0raSxdb +HPLUV/2P+V+exNhy/Vr3LZuw6ihxsUWBxcvWkbKKK+3RKnX56xsACSIGv1n+N8yfUAj rUzq1JVMEyt9+aJGupbczRlzbDa88oQoWiq84lVMPwHnllIWFaCQC+6PW2exn9kiQvLC kxZA== X-Gm-Message-State: AO0yUKXOwY1iZehIDI2dZOhucuD5S6jrQ2aV6M4+ke+bdI3tdn515kYO x0oXaviYV8Ec/maZ6UzB79VXCw== X-Received: by 2002:a5d:4350:0:b0:2bf:d137:9945 with SMTP id u16-20020a5d4350000000b002bfd1379945mr9561299wrr.51.1675945705398; Thu, 09 Feb 2023 04:28:25 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id o8-20020a5d58c8000000b002c3f0a4ce98sm1134763wrf.98.2023.02.09.04.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 04:28:24 -0800 (PST) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, steev@kali.org, johan+linaro@kernel.org, quic_bjorande@quicinc.com, Srinivas Kandagatla Subject: [PATCH 8/8] ASoC: codecs: lpass: remove not so useful verbose log Date: Thu, 9 Feb 2023 12:28:06 +0000 Message-Id: <20230209122806.18923-9-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> References: <20230209122806.18923-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757356757295949286?= X-GMAIL-MSGID: =?utf-8?q?1757356757295949286?= Signed-off-by: Srinivas Kandagatla --- sound/soc/codecs/lpass-rx-macro.c | 4 +--- sound/soc/codecs/lpass-wsa-macro.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index e0d891a67a12..a73a7d7a1c0a 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -2296,10 +2296,8 @@ static int rx_macro_mux_put(struct snd_kcontrol *kcontrol, aif_rst = rx->rx_port_value[widget->shift]; if (!rx_port_value) { - if (aif_rst == 0) { - dev_err(component->dev, "%s:AIF reset already\n", __func__); + if (aif_rst == 0) return 0; - } if (aif_rst > RX_MACRO_AIF4_PB) { dev_err(component->dev, "%s: Invalid AIF reset\n", __func__); return 0; diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index e6b85f3692ac..ba7480f3831e 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1856,10 +1856,8 @@ static int wsa_macro_rx_mux_put(struct snd_kcontrol *kcontrol, aif_rst = wsa->rx_port_value[widget->shift]; if (!rx_port_value) { - if (aif_rst == 0) { - dev_err(component->dev, "%s: AIF reset already\n", __func__); + if (aif_rst == 0) return 0; - } if (aif_rst >= WSA_MACRO_RX_MAX) { dev_err(component->dev, "%s: Invalid AIF reset\n", __func__); return 0;