From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: "\"Amadeusz Sławiński\"" <amadeuszx.slawinski@linux.intel.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Alper Nebi Yasak" <alpernebiyasak@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Banajit Goswami" <bgoswami@quicinc.com>,
"Bard Liao" <yung-chuan.liao@linux.intel.com>,
"Brent Lu" <brent.lu@intel.com>,
"Cezary Rojewski" <cezary.rojewski@intel.com>,
"Charles Keepax" <ckeepax@opensource.cirrus.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
"Cristian Ciocaltea" <cristian.ciocaltea@collabora.com>,
"Daniel Baluta" <daniel.baluta@nxp.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Jerome Brunet" <jbrunet@baylibre.com>,
"Jiawei Wang" <me@jwang.link>, "Jonathan Corbet" <corbet@lwn.net>,
"Kai Vehmanen" <kai.vehmanen@linux.intel.com>,
"Kevin Hilman" <khilman@baylibre.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Maso Huang" <maso.huang@mediatek.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Peter Ujfalusi" <peter.ujfalusi@linux.intel.com>,
"Pierre-Louis Bossart" <pierre-louis.bossart@linux.intel.com>,
"Ranjani Sridharan" <ranjani.sridharan@linux.intel.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Shawn Guo" <shawnguo@kernel.org>,
"Shengjiu Wang" <shengjiu.wang@gmail.com>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
"Sylwester Nawrocki" <s.nawrocki@samsung.com>,
"Takashi Iwai" <tiwai@suse.com>, "Vinod Koul" <vkoul@kernel.org>,
"Xiubo Li" <Xiubo.Lee@gmail.com>,
alsa-devel@alsa-project.org, imx@lists.linux.dev,
linux-doc@vger.kernel.org, linux-sound@vger.kernel.org
Subject: [PATCH v2 2/3] ASoC: soc-pcm: Indicate warning if CPU / Codec availability mismatch
Date: Mon, 13 May 2024 00:31:52 +0000 [thread overview]
Message-ID: <87le4ezh53.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87o79azh65.wl-kuninori.morimoto.gx@renesas.com>
Current DCPM is checking CPU side availability only, but it should also
check Codec availability. But because of long DPCM operation history,
it is possible that the some Codec driver check have been bypassed.
It should be error, but let's add grace time to update driver.
This patch indicates warning in above case. Each applicable driver need
to update during this grace time.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index c4d80cad5982..5729912ceff9 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2795,6 +2795,7 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
{
struct snd_soc_dai_link *dai_link = rtd->dai_link;
struct snd_soc_dai *cpu_dai;
+ struct snd_soc_dai *codec_dai;
struct snd_soc_dai_link_ch_map *ch_maps;
int has_playback = 0;
int has_capture = 0;
@@ -2806,15 +2807,25 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
}
if (dai_link->dynamic || dai_link->no_pcm) {
+ int has_playback_both = 0;
+ int has_capture_both = 0;
for_each_rtd_ch_maps(rtd, i, ch_maps) {
cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu);
+ codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec);
if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK))
has_playback = 1;
if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE))
has_capture = 1;
+
+ if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
+ snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK))
+ has_playback_both = 1;
+ if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
+ snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE))
+ has_capture_both = 1;
}
/*
@@ -2850,9 +2861,39 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
has_playback = 0;
}
}
- } else {
- struct snd_soc_dai *codec_dai;
+ /*
+ * REMOVE ME
+ *
+ * Current DPCM is checking CPU side only, but both CPU and Codec should be
+ * checked. Indicate warning if there was CPU / Codec mismatch.
+ * To keep compatibility, warning only for now.
+ */
+ if ((dai_link->dpcm_playback || dai_link->playback_only) &&
+ !has_playback_both)
+ dev_warn(rtd->card->dev,
+ "System reuqsts playback, but not available (%s)."
+ " Please update Codec driver\n",
+ dai_link->stream_name);
+ if ((dai_link->dpcm_capture || dai_link->capture_only) &&
+ !has_capture_both)
+ dev_warn(rtd->card->dev,
+ "System reuqsts capture, but not available (%s)."
+ " Please update Codec driver\n",
+ dai_link->stream_name);
+
+ /*
+ * REMOVE ME
+ *
+ * In case of there was no dpcm_xxx flag, and CPU / Codec mismatch,
+ * follow new style
+ */
+ if (!dai_link->dpcm_playback && has_playback)
+ has_playback = has_playback_both;
+ if (!dai_link->dpcm_capture && has_capture)
+ has_capture = has_capture_both;
+
+ } else {
/* Adapt stream for codec2codec links */
int cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE);
int cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK);
--
2.25.1
next prev parent reply other threads:[~2024-05-13 0:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 0:31 [PATCH v2 0/3] ASoC: grace time for DPCM cleanup Kuninori Morimoto
2024-05-13 0:31 ` [PATCH v2 1/3] ASoC: soc-pcm: Indicate warning if dpcm_playback/capture were used for availability limition Kuninori Morimoto
2024-05-13 0:31 ` Kuninori Morimoto [this message]
2024-05-17 12:21 ` [PATCH v2 2/3] ASoC: soc-pcm: Indicate warning if CPU / Codec availability mismatch Amadeusz Sławiński
2024-05-19 23:11 ` Kuninori Morimoto
2024-05-13 0:31 ` [PATCH v2 3/3] ASoC: remove snd_soc_dai_link_set_capabilities() Kuninori Morimoto
2024-05-14 14:31 ` [PATCH v2 0/3] ASoC: grace time for DPCM cleanup Jerome Brunet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87le4ezh53.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alpernebiyasak@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bgoswami@quicinc.com \
--cc=brent.lu@intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=ckeepax@opensource.cirrus.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=corbet@lwn.net \
--cc=cristian.ciocaltea@collabora.com \
--cc=daniel.baluta@nxp.com \
--cc=hdegoede@redhat.com \
--cc=imx@lists.linux.dev \
--cc=jbrunet@baylibre.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=khilman@baylibre.com \
--cc=lgirdwood@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=maso.huang@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=me@jwang.link \
--cc=neil.armstrong@linaro.org \
--cc=nicolas.ferre@microchip.com \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=s.hauer@pengutronix.de \
--cc=s.nawrocki@samsung.com \
--cc=shawnguo@kernel.org \
--cc=shengjiu.wang@gmail.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).