ASoC: rsnd: indicate warning once if it can't handle requested rule

Some SoC can't handle all requested hw rule. In such case, it will indicate
like below, but it is unclear why it didn't work to user.
This patch indicates warning in such case once, because player will try to
similar rule many times.

	# aplay sound.wav
	Playing WAVE 'sound.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo
	aplay: aplay.c: 1359: set_params: Assertion `err >= 0' failed.
	Aborted by signal Aborted...

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87357q6t7b.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index ca3a0f285092fe561d10a9f45e46a69d714471da..3de81af41ffce8962c7c7f6d9889aca179c9c694 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -869,7 +869,8 @@ static unsigned int rsnd_soc_hw_rate_list[] = {
 
 static int rsnd_soc_hw_rule(struct rsnd_dai *rdai,
                            unsigned int *list, int list_num,
-                           struct snd_interval *baseline, struct snd_interval *iv)
+                           struct snd_interval *baseline, struct snd_interval *iv,
+                           struct rsnd_dai_stream *io, char *unit)
 {
        struct snd_interval p;
        unsigned int rate;
@@ -899,6 +900,16 @@ static int rsnd_soc_hw_rule(struct rsnd_dai *rdai,
                }
        }
 
+       /* Indicate error once if it can't handle */
+       if (!rsnd_flags_has(io, RSND_HW_RULE_ERR) && (p.min > p.max)) {
+               struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
+               struct device *dev = rsnd_priv_to_dev(priv);
+
+               dev_warn(dev, "It can't handle %d %s <-> %d %s\n",
+                        baseline->min, unit, baseline->max, unit);
+               rsnd_flags_set(io, RSND_HW_RULE_ERR);
+       }
+
        return snd_interval_refine(iv, &p);
 }
 
@@ -922,7 +933,7 @@ static int rsnd_soc_hw_rule_rate(struct snd_pcm_hw_params *params,
 
        return rsnd_soc_hw_rule(rdai, rsnd_soc_hw_rate_list,
                                ARRAY_SIZE(rsnd_soc_hw_rate_list),
-                               &ic, ir);
+                               &ic, ir, io, "ch");
 }
 
 static int rsnd_soc_hw_rule_channels(struct snd_pcm_hw_params *params,
@@ -945,7 +956,7 @@ static int rsnd_soc_hw_rule_channels(struct snd_pcm_hw_params *params,
 
        return rsnd_soc_hw_rule(rdai, rsnd_soc_hw_channels_list,
                                ARRAY_SIZE(rsnd_soc_hw_channels_list),
-                               ir, &ic);
+                               ir, &ic, io, "Hz");
 }
 
 static const struct snd_pcm_hardware rsnd_pcm_hardware = {
@@ -970,6 +981,8 @@ static int rsnd_soc_dai_startup(struct snd_pcm_substream *substream,
        unsigned int max_channels = rsnd_rdai_channels_get(rdai);
        int i;
 
+       rsnd_flags_del(io, RSND_HW_RULE_ERR);
+
        rsnd_dai_stream_init(io, substream);
 
        /*

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index a09b3612b7f994e886f1771d7d3ccecedfea353d..3e1184f56ffd96eeaaa92b0ba7e99fd0aa939cbd 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -513,6 +513,7 @@ struct rsnd_dai_stream {
 #define RSND_STREAM_HDMI0      (1 << 0) /* for HDMI0 */
 #define RSND_STREAM_HDMI1      (1 << 1) /* for HDMI1 */
 #define RSND_STREAM_TDM_SPLIT  (1 << 2) /* for TDM split mode */
+#define RSND_HW_RULE_ERR       (1 << 3) /* hw_rule error */
 
 #define rsnd_io_to_mod(io, i)  ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL)
 #define rsnd_io_to_mod_ssi(io) rsnd_io_to_mod((io), RSND_MOD_SSI)