Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp3990648rdh; Tue, 28 Nov 2023 08:57:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFnaa4G4uer4qSyERLd8tYuN8DJ/IkISp8T8gKNdoAxiNcAUTaHAQp81zgedWaZHLzXEaWk X-Received: by 2002:a05:6a00:c81:b0:6b2:baa0:6d4c with SMTP id a1-20020a056a000c8100b006b2baa06d4cmr16032637pfv.33.1701190630642; Tue, 28 Nov 2023 08:57:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701190630; cv=none; d=google.com; s=arc-20160816; b=tmgbjqoZdmjGbJfXGoDphutVKoCvgbuXsQEssQ3wwah5HEOu0ltIqsebz8rgg+autF sR5pT3d1YbHO5Kf2DXvfIEVT5bMrGPiGxTkJ9k9oBlRZ5L0NkUe94IYmNetXSeFqwyqC 4EYDzJkMxmg5NV9cTI4Zz/pecZqbAwQJZaU0D2FVoyq2z8LBGrNHlUA7ubqMFTtmS9cW BFvnOmjZB5zW4iIzODS8ZIkVxBaaHpaBKULmQL9scw1khp3FlPUb91PnaTkQYbEmnvJb HfoXsrXF5lyQX3Uy9irGOhBcjWTQV4K2cLk34ZdSN2WfUrx5yFL9CX+rHp6kNkJw6acv YWkw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=KlvtVgcoH+Cr5quxDgXdgueDoRBrewPBnFO4wuUANns=; fh=IqnL5DzMSNmqiauLiDoSpi6m1wiRC/TEhzdMHR9QMP8=; b=bIPkrAdAh0d4OcI7FX/1C2OV5n0Y2fFKZeJIiquwQaPRHUPQTHmkemOKWOiPw+KcM8 pNIgUvYLbtL024bheuVVAwo50bLfnfLGdpJLtxDJp6KaGx4BsKlMx+EXZgPYx8raErW7 DszJAl5yiteM0NjyWU7F5Q9ycOhN+pr3aKfjAqbqEGWPOxc/vvvd+3uU9nWwazJsEFgo +2L8+DJt+EgfkibQvs/5kzFWcXVm9e23Ur39Xul6SyXvGE5wNWj2cxLa780sWGt9cJ9o G5VHqXZHV8OLewReUhqcxgpnKbk8qqc8m9uzKeyoAxV9ah3UTuG6vm1bfZYPi/YbV84/ i4jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="k1/7oWDO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id s6-20020a656446000000b005b960674526si11901410pgv.779.2023.11.28.08.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 08:57:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="k1/7oWDO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8FC7D8056C4B; Tue, 28 Nov 2023 08:57:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345055AbjK1Q4p (ORCPT + 99 others); Tue, 28 Nov 2023 11:56:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234886AbjK1Q4n (ORCPT ); Tue, 28 Nov 2023 11:56:43 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A85CD53 for ; Tue, 28 Nov 2023 08:56:48 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-50943ccbbaeso7989376e87.2 for ; Tue, 28 Nov 2023 08:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701190606; x=1701795406; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KlvtVgcoH+Cr5quxDgXdgueDoRBrewPBnFO4wuUANns=; b=k1/7oWDO8Upg20YhSnrFid6v51+cWhjhqEWchgKnlaAZMZZwiBjGPsIiyh87yseYB8 7aBkj8UwvhoxixH4lCmZbCpD670cakYgtM0zqYzmg7oDPadfojbCyt863PHGizN33nQ6 JP9Of5rOgZjAQ1MYnIPaSP1jcnF6ArfKRu8XGDSDy0uxAaOlj8GOcSOMlkFZlDtraC5Q 8syP7pL+2JMZawfz4aAhLLvJelgDqoIyEKSlQXwEuAmjQlzLbJ//TP3lQ3R2KK/KOhLt A7KEWhunRnZCzj9xxiNPjmSUGD3BD8emRkL1SSQqBYrnH9EkXpkfIAUSWBvi3CQf9+HI tNWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701190606; x=1701795406; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KlvtVgcoH+Cr5quxDgXdgueDoRBrewPBnFO4wuUANns=; b=PvG8neI+RpiBARWXXwAwFKsbeL3WMv3tMI3hPwA5eSPSEdU+B3s7mRHGl6R0lR//6D 7Rks/jbLUvSu9Gavcs/7LwoCsBfYXp96YdRCVHmSyRZ9SB6qCNEIGgxT/gebZetIjXFq ESXPql5wM9r00uuyqhUpOdNNVuifFzQqBVUP//C4GvRDUUeZRBzUCvQRJc/Dx+salEXE Rct93Jx3FHXzQAuJxBaUSPV3zzZVYklxjpXJAXQFyTjYeYrCKo6J+lby8JT8v+SuYziX y3knabvLmH3oGITe3p5WqGJzGK3zn3KTaB8BoTiDAjxEoj2imruShhGANUiMhYdRnMHX v2nA== X-Gm-Message-State: AOJu0YxeQD8PXxq0s0XE0dcU80I8COQth451ErX/RD41TdZs1uE8pV72 3+aj4aCKYItr6/h7g6R9NwcNRA== X-Received: by 2002:a05:6512:ea1:b0:50b:c102:a65d with SMTP id bi33-20020a0565120ea100b0050bc102a65dmr1112291lfb.9.1701190605996; Tue, 28 Nov 2023 08:56:45 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id cw18-20020a170906c79200b009bf7a4d591csm7126252ejb.11.2023.11.28.08.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 08:56:45 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] ASoC: qcom: Add helper for allocating Soundwire stream runtime Date: Tue, 28 Nov 2023 17:56:37 +0100 Message-Id: <20231128165638.757665-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 28 Nov 2023 08:57:07 -0800 (PST) Newer Qualcomm SoC soundcards will need to allocate Soundwire stream runtime in their startup op. The code will be exactly the same for all soundcards, so add a helper for that. Signed-off-by: Krzysztof Kozlowski --- sound/soc/qcom/sdw.c | 45 +++++++++++++++++++++++++++++++++++++++++++- sound/soc/qcom/sdw.h | 1 + 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/sdw.c b/sound/soc/qcom/sdw.c index dd275123d31d..77dbe0c28b29 100644 --- a/sound/soc/qcom/sdw.c +++ b/sound/soc/qcom/sdw.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2018, Linaro Limited. +// Copyright (c) 2018-2023, Linaro Limited. // Copyright (c) 2018, The Linux Foundation. All rights reserved. #include @@ -7,6 +7,49 @@ #include #include "sdw.h" +/** + * qcom_snd_sdw_startup() - Helper to start Soundwire stream for SoC audio card + * @substream: The PCM substream from audio, as passed to snd_soc_ops->startup() + * + * Helper for the SoC audio card (snd_soc_ops->startup()) to allocate and set + * Soundwire stream runtime to each codec DAI. + * + * The shutdown() callback should call sdw_release_stream() on the same + * sdw_stream_runtime. + * + * Return: 0 or errno + */ +int qcom_snd_sdw_startup(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct sdw_stream_runtime *sruntime; + struct snd_soc_dai *codec_dai; + int ret, i; + + sruntime = sdw_alloc_stream(cpu_dai->name); + if (!sruntime) + return -ENOMEM; + + for_each_rtd_codec_dais(rtd, i, codec_dai) { + ret = snd_soc_dai_set_stream(codec_dai, sruntime, + substream->stream); + if (ret < 0 && ret != -ENOTSUPP) { + dev_err(rtd->dev, "Failed to set sdw stream on %s\n", + codec_dai->name); + goto err_set_stream; + } + } + + return 0; + +err_set_stream: + sdw_release_stream(sruntime); + + return ret; +} +EXPORT_SYMBOL_GPL(qcom_snd_sdw_startup); + int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, struct sdw_stream_runtime *sruntime, bool *stream_prepared) diff --git a/sound/soc/qcom/sdw.h b/sound/soc/qcom/sdw.h index d74cbb84da13..392e3455f1b1 100644 --- a/sound/soc/qcom/sdw.h +++ b/sound/soc/qcom/sdw.h @@ -6,6 +6,7 @@ #include +int qcom_snd_sdw_startup(struct snd_pcm_substream *substream); int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, struct sdw_stream_runtime *runtime, bool *stream_prepared); -- 2.34.1