From patchwork Thu Jan 19 16:34:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kai Vehmanen X-Patchwork-Id: 644118 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65224C00A5A for ; Thu, 19 Jan 2023 16:37:30 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5035B1813; Thu, 19 Jan 2023 17:36:38 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5035B1813 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674146248; bh=1W0mFFJRCg9c9e3yyZSdzWapZKBFwJaC/ffHGOrGN5I=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=E0t3GT/gAG1L+rwfiSDK+KwgkNJ1Zat3lkl82d3SyzH/QmsPwqLlYxQLCbDKNPrQy MT/1s2JYelj3WpdhaFM+I8Glnjz2diNfm8pWQSVTAJqG0seaLiL78b420yrE63LI1D Lnv+2/VQ6fpmcdLaOBMre4cAbkYo++Ju38u+WuGE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 40E5AF804F2; Thu, 19 Jan 2023 17:36:12 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2370FF8025D; Thu, 19 Jan 2023 17:36:10 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A65C0F8025D for ; Thu, 19 Jan 2023 17:36:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A65C0F8025D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=J4KW3BpR DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674146166; x=1705682166; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1W0mFFJRCg9c9e3yyZSdzWapZKBFwJaC/ffHGOrGN5I=; b=J4KW3BpRXfcfMrFDj8tVYicf/xRTO+uX0CQo9CsMk3IaL2ceSVbZboWb CKOdEm4volxPmrhR7dKt2Fybpdx41N8PjXyg95MNeJ5FAnH6OmoX6Zsy2 pH1VmAdDpWRF6yFje/7jE1bbltPyIWvPLLDolOQGtTsZvnOKYfLVcOPec fNLvtteJbSd996+sFHmr4doxiHqUk5mbQ4XHfRSYirj3QqEtg/t2ILBvx wALHlN0Ff8VzHZBJ5ysY63AUuqv99R7eg7pmfCdH5OfyjuLYAbwH5uSVX ZKj9PegRYHKJKdeD1BYYiGdLTByLbYAQ26Ka6Hm4FpdmdoHu5xVSMwFME A==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="323029606" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="323029606" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 08:36:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="662163018" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="662163018" Received: from eliteleevi.tm.intel.com ([10.237.54.20]) by fmsmga007.fm.intel.com with ESMTP; 19 Jan 2023 08:36:01 -0800 From: Kai Vehmanen To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH 2/4] ASoC: Intel: sof_cs42l42: always set dpcm_capture for amplifiers Date: Thu, 19 Jan 2023 18:34:57 +0200 Message-Id: <20230119163459.2235843-3-kai.vehmanen@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119163459.2235843-1-kai.vehmanen@linux.intel.com> References: <20230119163459.2235843-1-kai.vehmanen@linux.intel.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kai.vehmanen@linux.intel.com, yung-chuan.liao@linux.intel.com, lgirdwood@gmail.com, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, daniel.baluta@nxp.com Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Pierre-Louis Bossart The amplifier may provide hardware support for I/V feedback, or alternatively the firmware may generate an echo reference attached to the SSP and dailink used for the amplifier. To avoid any issues with invalid/NULL substreams in the latter case, always unconditionally set dpcm_capture. Link: https://github.com/thesofproject/linux/issues/4083 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao Signed-off-by: Kai Vehmanen --- sound/soc/intel/boards/sof_cs42l42.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c index e38bd2831e6a..e9d190cb13b0 100644 --- a/sound/soc/intel/boards/sof_cs42l42.c +++ b/sound/soc/intel/boards/sof_cs42l42.c @@ -336,6 +336,9 @@ static int create_spk_amp_dai_links(struct device *dev, links[*id].platforms = platform_component; links[*id].num_platforms = ARRAY_SIZE(platform_component); links[*id].dpcm_playback = 1; + /* firmware-generated echo reference */ + links[*id].dpcm_capture = 1; + links[*id].no_pcm = 1; links[*id].cpus = &cpus[*id]; links[*id].num_cpus = 1; From patchwork Thu Jan 19 16:34:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kai Vehmanen X-Patchwork-Id: 644117 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04DBDC00A5A for ; Thu, 19 Jan 2023 16:38:01 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2740517FD; Thu, 19 Jan 2023 17:37:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2740517FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674146279; bh=ufxQjaFhgiYGTLSZQhUcX03AnHxvDxPeFKEPNzK9tzA=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=rtW9c90R3q/ZEgelmdgJOsQEL288LsV/fRZUIlLuEFg4CVx6Pj4D52LunAQZfH0Am R1XlQ8RWDthXDvUX3VPr9UHjfzQiWcgAGNQvzJSon4JRb6g8bO+W3zNyDQxqilG8Wc /V61z+D+DCWxnmDGmzGGu/Xf9Zt6Valm8XIQM7fU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 15F47F80558; Thu, 19 Jan 2023 17:36:16 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 047D1F804FE; Thu, 19 Jan 2023 17:36:11 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D328AF8047B for ; Thu, 19 Jan 2023 17:36:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D328AF8047B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=H/9cgAtm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674146168; x=1705682168; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ufxQjaFhgiYGTLSZQhUcX03AnHxvDxPeFKEPNzK9tzA=; b=H/9cgAtmiKUC5VcBsA03Nth3lvuL/2aa4VUPqxNF3nMHFlFtxMH+3A2d rJKnVpXyf0wm2+bhtCoiirhLYhnCPIB+wrgK1brPNUN0sKTmJTBSAhdxN P/MHCEEKdkVtgAnY+3KLU0env4s1NQpU6ygACq9q7wnqEICE0oq7oWRcL RrT/OfnvS+9YYIFGJjmjJ324jLQrn66g5s+UXLx5QOAHuy7hjuiYg5Y7R fIrhPK13tfjoXkQbrUMVHhDF5kkXHcT4skh2r7vgtorWFI14LPN70kwID 9Rqrpz8DN36tKx8qWL7VLigG9JWnUbmG9xORiG/+7EnJXBAUaraqBFA3m g==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="323029619" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="323029619" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 08:36:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="662163056" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="662163056" Received: from eliteleevi.tm.intel.com ([10.237.54.20]) by fmsmga007.fm.intel.com with ESMTP; 19 Jan 2023 08:36:03 -0800 From: Kai Vehmanen To: alsa-devel@alsa-project.org, broonie@kernel.org Subject: [PATCH 3/4] ASoC: Intel: sof_nau8825: always set dpcm_capture for amplifiers Date: Thu, 19 Jan 2023 18:34:58 +0200 Message-Id: <20230119163459.2235843-4-kai.vehmanen@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119163459.2235843-1-kai.vehmanen@linux.intel.com> References: <20230119163459.2235843-1-kai.vehmanen@linux.intel.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kai.vehmanen@linux.intel.com, yung-chuan.liao@linux.intel.com, lgirdwood@gmail.com, peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, daniel.baluta@nxp.com Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Pierre-Louis Bossart The amplifier may provide hardware support for I/V feedback, or alternatively the firmware may generate an echo reference attached to the SSP and dailink used for the amplifier. To avoid any issues with invalid/NULL substreams in the latter case, always unconditionally set dpcm_capture. Link: https://github.com/thesofproject/linux/issues/4083 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao Signed-off-by: Kai Vehmanen --- sound/soc/intel/boards/sof_nau8825.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index a800854c2831..6794a0249a9a 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -487,8 +487,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = ARRAY_SIZE(max_98373_components); links[id].init = max_98373_spk_codec_init; links[id].ops = &max_98373_ops; - /* feedback stream */ - links[id].dpcm_capture = 1; } else if (sof_nau8825_quirk & SOF_MAX98360A_SPEAKER_AMP_PRESENT) { max_98360a_dai_link(&links[id]); @@ -506,6 +504,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].dpcm_playback = 1; + /* feedback stream or firmware-generated echo reference */ + links[id].dpcm_capture = 1; + links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1;