From nobody Sun Apr 19 23:27:21 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 50453C43334 for ; Fri, 8 Jul 2022 06:13:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237248AbiGHGNd (ORCPT ); Fri, 8 Jul 2022 02:13:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237249AbiGHGNa (ORCPT ); Fri, 8 Jul 2022 02:13:30 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3DE28715 for ; Thu, 7 Jul 2022 23:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657260805; x=1688796805; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=CbaOVcWxuYtKb9VQz1JziVwNeJk78hde01+2gM0jJ4w=; b=Ew/bZGjb9YaJRvaDufGuN3Z3nPhcNpBky0IKdDhFZayUXRqqGu+/Iyzv wvShJ4aWzx/ATdiwTrau0Sw48jKxupwcNTOSZVXZKY9tjfPZh2J1O0Ah/ o3k5cLA6kX5bMGNMECzQ9i1t3sSoFg512zzq6bjpyKkTykkgw2hrOHVzd KatA87x+681GB6RghAn6tBDfq72MgCs47+xeCxjlqDMsl5qkv1fmb8oUJ xFfWGM0o8jhpy+l4Y1UIV2TAQ3mL1UjEldBwOza43p3OBagzK2j5e5JWp 78WVBrozKl8qX51qN4VBWvHfILRuoYSnmVArTYPb3WijY4a7DFxrnLJvU w==; X-IronPort-AV: E=McAfee;i="6400,9594,10401"; a="267232762" X-IronPort-AV: E=Sophos;i="5.92,254,1650956400"; d="scan'208";a="267232762" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 23:13:25 -0700 X-IronPort-AV: E=Sophos;i="5.92,254,1650956400"; d="scan'208";a="651440349" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 23:13:22 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, broonie@kernel.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, tiwai@suse.de, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [RESEND PATCH v3 1/2] soundwire: Intel: add trigger callback Date: Fri, 8 Jul 2022 14:13:11 +0800 Message-Id: <20220708061312.25878-2-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220708061312.25878-1-yung-chuan.liao@linux.intel.com> References: <20220708061312.25878-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 | 9 +++++++++ include/linux/soundwire/sdw_intel.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 0268fa527c0c..fed6418d6375 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1004,9 +1004,18 @@ 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 Sun Apr 19 23:27:21 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 9A88BC43334 for ; Fri, 8 Jul 2022 06:13:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237269AbiGHGNg (ORCPT ); Fri, 8 Jul 2022 02:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237258AbiGHGNb (ORCPT ); Fri, 8 Jul 2022 02:13:31 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E9692AE7 for ; Thu, 7 Jul 2022 23:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657260808; x=1688796808; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ENT73aWnAztm46LKNlhTKMt+fCuUob46bDVIkTPIOIg=; b=nJXZ4IDWGiUAja4X++OM7Ih/zEoEdP/ldgFsHJjgWaBtfKm4cVLviy/E 815jsdn5QVd4RbM1a81molCS4ajvWP2Ffli/LOun2x4gJr8GCIVmUVJm5 6YfjK78jqHDLtO3vU38Z9oJLBoilftLfmh+kJynlosocs3waDfKl/MGC7 UA/KrqrGUFsDLCnjH96FOcPxX3SZ3ZC8V0fupRwlnTRuec140S8i0Kl6n Tnt0Sch2qChIraD/L445E6nV/W4LIfwxJsIU4V8TGX2r+e1bOQcO4lVCl Mt+mk1qlf5K3zidhN5MX02+bc0H2a3LwP18Lw2m9ZNz+1PE6wDwQn0cgO Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10401"; a="267232766" X-IronPort-AV: E=Sophos;i="5.92,254,1650956400"; d="scan'208";a="267232766" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 23:13:27 -0700 X-IronPort-AV: E=Sophos;i="5.92,254,1650956400"; d="scan'208";a="651440361" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2022 23:13:25 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, broonie@kernel.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, tiwai@suse.de, gregkh@linuxfoundation.org, srinivas.kandagatla@linaro.org, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, bard.liao@intel.com Subject: [RESEND PATCH v3 2/2] ASoC: SOF: Intel: add trigger callback into sdw_callback Date: Fri, 8 Jul 2022 14:13:12 +0800 Message-Id: <20220708061312.25878-3-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220708061312.25878-1-yung-chuan.liao@linux.intel.com> References: <20220708061312.25878-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 ed74a1f264e8..ce5a39326dce 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 dc713c20ba1d..5439fcfe2b4d 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -778,5 +778,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