From nobody Wed May 13 18:21:11 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 812E4C43334 for ; Thu, 16 Jun 2022 01:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350703AbiFPBSa (ORCPT ); Wed, 15 Jun 2022 21:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350444AbiFPBSO (ORCPT ); Wed, 15 Jun 2022 21:18:14 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B6A1EC75 for ; Wed, 15 Jun 2022 18:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655342292; x=1686878292; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=mHnKBRNcSwTkjbN8gxud9J1YwFKM2VUFALT+r+byS0k=; b=n+ZewY5nZaUzX0xcna0uh16l2OSWuW1ufteQMDu4+EEwwZYzUqeqhv/r xSNOhPCc56T9m+2B1jOFyUL3eesZgVdo2766cFVdgSHvoWoG+CMEj1F+m g4Kfp1VI1Yz1Jp+dVVSecRxG+948AdPNTB5vIF+QpQLVVxJcYVTkgRNRQ ewT5GIrNEXRWz0E1y9MjELukG1jUMRCl/Hn2dupOXgWhryBCyb0xN6ovO Ri0InWtc7xyRxQWL8mXNFVq70I+6msOrcfg7EGyyHJn1YZkNyIkGKN7vL 170UOTWwhNwvJkHMASTt1LRZ9CneXO3Jl06xibBs5Fqnw4W37+hqKaOkK g==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="279195956" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="279195956" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 18:18:12 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911939304" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 18:18:09 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com, peter.ujfalusi@linux.intel.com, ranjani.sridharan@linux.intel.com Subject: [PATCH v2 1/2] soundwire: Intel: add trigger callback Date: Thu, 16 Jun 2022 09:17:57 +0800 Message-Id: <20220616011758.21155-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220616011758.21155-1-yung-chuan.liao@linux.intel.com> References: <20220616011758.21155-1-yung-chuan.liao@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When a pipeline is split into FE and BE parts, the BE pipeline may need to be triggered separately in the BE trigger op. So add the trigger callback in the link_res ops that will be invoked during BE DAI trigger. Signed-off-by: Bard Liao Reviewed-by: Rander Wang Reviewed-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Acked-By: Vinod Koul --- drivers/soundwire/intel.c | 8 ++++++++ include/linux/soundwire/sdw_intel.h | 1 + 2 files changed, 9 insertions(+) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 505c5ef061e3..2e7c27d303b4 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1004,9 +1004,17 @@ static int intel_trigger(struct snd_pcm_substream *s= ubstream, int cmd, struct sn { struct sdw_cdns *cdns =3D snd_soc_dai_get_drvdata(dai); struct sdw_intel *sdw =3D cdns_to_intel(cdns); + struct sdw_intel_link_res *res =3D sdw->link_res; struct sdw_cdns_dma_data *dma; int ret =3D 0; =20 + /* The .trigger callback is used to send required IPC to audio + * firmware. The .free_stream callback will still be called + * by intel_free_stream() in the TRIGGER_SUSPEND case. + */ + if (res->ops && res->ops->trigger) + res->ops->trigger(dai, cmd, substream->stream); + dma =3D snd_soc_dai_get_dma_data(dai, substream); if (!dma) { dev_err(dai->dev, "failed to get dma data in %s\n", diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/= sdw_intel.h index b5b489ea1aef..ec16ae49e6a4 100644 --- a/include/linux/soundwire/sdw_intel.h +++ b/include/linux/soundwire/sdw_intel.h @@ -121,6 +121,7 @@ struct sdw_intel_ops { struct sdw_intel_stream_params_data *params_data); int (*free_stream)(struct device *dev, struct sdw_intel_stream_free_data *free_data); + int (*trigger)(struct snd_soc_dai *dai, int cmd, int stream); }; =20 /** --=20 2.17.1 From nobody Wed May 13 18:21:11 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 10BD2C43334 for ; Thu, 16 Jun 2022 01:18:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351657AbiFPBSi (ORCPT ); Wed, 15 Jun 2022 21:18:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350505AbiFPBSQ (ORCPT ); Wed, 15 Jun 2022 21:18:16 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA6331F2F8 for ; Wed, 15 Jun 2022 18:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655342295; x=1686878295; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WlF6IGDNKcYwGntMGB2JVx7A5/2QpCifsZSxNNBMeqc=; b=CPYt97bgjScKx8wU6+WrGaZvLsphYxr7VWamY00PvPYtUQMYCs/S5x6x gOQLvBvT8MN5DFkIAXemlk66BuXzhA3Zlkk6W8CDN9Lfhr9PsAPcZv49K vvD7dVE0G+y2pbdvvNI2qIOvEAqMnMxZSYQUCYXb1/SXVHIsJQHwykFji K6xfwPS1s3HPqg1pKSTn7N9a/c4G/gEMAIWQyK4a1Tkmuw703Unidi20e yGsfOrXCSnli5TmZGliSA3cBewoGUkr3CiV4oxL02D/CwavpMDsCHEPO2 w9M0lB+46hAcn1wLnoeaach6rDOGPD40p9BHA1L+uU9+NohNOi9gNsFNO Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="279195965" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="279195965" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 18:18:15 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911939339" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 18:18:12 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com, peter.ujfalusi@linux.intel.com, ranjani.sridharan@linux.intel.com Subject: [PATCH v2 2/2] ASoC: SOF: Intel: add trigger callback into sdw_callback Date: Thu, 16 Jun 2022 09:17:58 +0800 Message-Id: <20220616011758.21155-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220616011758.21155-1-yung-chuan.liao@linux.intel.com> References: <20220616011758.21155-1-yung-chuan.liao@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For IPC4, we need to set pipeline state in BE DAI trigger. Signed-off-by: Bard Liao Reviewed-by: Rander Wang Reviewed-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan --- sound/soc/sof/intel/hda-dai.c | 14 +++++++++++--- sound/soc/sof/intel/hda.c | 2 +- sound/soc/sof/intel/hda.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 70721defca46..97632ca4b7a7 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -714,8 +714,7 @@ static const struct snd_soc_dai_ops ipc3_ssp_dai_ops = =3D { .shutdown =3D ssp_dai_shutdown, }; =20 -static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream, - int cmd, struct snd_soc_dai *dai) +static int ipc4_be_dai_common_trigger(struct snd_soc_dai *dai, int cmd, in= t stream) { struct snd_sof_widget *pipe_widget; struct sof_ipc4_pipeline *pipeline; @@ -724,7 +723,7 @@ static int ipc4_be_dai_trigger(struct snd_pcm_substream= *substream, struct snd_sof_dev *sdev; int ret; =20 - w =3D snd_soc_dai_get_widget(dai, substream->stream); + w =3D snd_soc_dai_get_widget(dai, stream); swidget =3D w->dobj.private; pipe_widget =3D swidget->pipe_widget; pipeline =3D pipe_widget->private; @@ -759,6 +758,12 @@ static int ipc4_be_dai_trigger(struct snd_pcm_substrea= m *substream, return 0; } =20 +static int ipc4_be_dai_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + return ipc4_be_dai_common_trigger(dai, cmd, substream->stream); +} + static const struct snd_soc_dai_ops ipc4_dmic_dai_ops =3D { .trigger =3D ipc4_be_dai_trigger, }; @@ -810,6 +815,9 @@ void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, stru= ct snd_sof_dsp_ops *ops) if (!hda_use_tplg_nhlt) ipc4_data->nhlt =3D intel_nhlt_init(sdev->dev); =20 + if (IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)) + sdw_callback.trigger =3D ipc4_be_dai_common_trigger; + break; } default: diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index bc07df1fc39f..cdd3601e84f5 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -147,7 +147,7 @@ static int sdw_free_stream(struct device *dev, return hda_ctrl_dai_widget_free(w, SOF_DAI_CONFIG_FLAGS_NONE, &data); } =20 -static const struct sdw_intel_ops sdw_callback =3D { +struct sdw_intel_ops sdw_callback =3D { .params_stream =3D sdw_params_stream, .free_stream =3D sdw_free_stream, }; diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index a3118499e34f..99545ab492d7 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -775,5 +775,6 @@ irqreturn_t cnl_ipc4_irq_thread(int irq, void *context); int cnl_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *ms= g); irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context); int hda_dsp_ipc4_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg= *msg); +extern struct sdw_intel_ops sdw_callback; =20 #endif --=20 2.17.1