From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sasha Levin <sashal@kernel.org>,
alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>,
Mikhail Durnev <mikhail_durnev@mentor.com>
Subject: [PATCH AUTOSEL 5.4 05/46] ASoC: rsnd: core: Check convert rate in rsnd_hw_params
Date: Wed, 5 May 2021 12:38:15 -0400 [thread overview]
Message-ID: <20210505163856.3463279-5-sashal@kernel.org> (raw)
In-Reply-To: <20210505163856.3463279-1-sashal@kernel.org>
From: Mikhail Durnev <mikhail_durnev@mentor.com>
[ Upstream commit 19c6a63ced5e07e40f3a5255cb1f0fe0d3be7b14 ]
snd_pcm_hw_params_set_rate_near can return incorrect sample rate in
some cases, e.g. when the backend output rate is set to some value higher
than 48000 Hz and the input rate is 8000 Hz. So passing the value returned
by snd_pcm_hw_params_set_rate_near to snd_pcm_hw_params will result in
"FSO/FSI ratio error" and playing no audio at all while the userland
is not properly notified about the issue.
If SRC is unable to convert the requested sample rate to the sample rate
the backend is using, then the requested sample rate should be adjusted in
rsnd_hw_params. The userland will be notified about that change in the
returned hw_params structure.
Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
Link: https://lore.kernel.org/r/1615870055-13954-1-git-send-email-mikhail_durnev@mentor.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/sh/rcar/core.c | 69 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 68 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index a6c1cf987e6e..df8d7b53b760 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1426,8 +1426,75 @@ static int rsnd_hw_params(struct snd_pcm_substream *substream,
}
if (io->converted_chan)
dev_dbg(dev, "convert channels = %d\n", io->converted_chan);
- if (io->converted_rate)
+ if (io->converted_rate) {
+ /*
+ * SRC supports convert rates from params_rate(hw_params)/k_down
+ * to params_rate(hw_params)*k_up, where k_up is always 6, and
+ * k_down depends on number of channels and SRC unit.
+ * So all SRC units can upsample audio up to 6 times regardless
+ * its number of channels. And all SRC units can downsample
+ * 2 channel audio up to 6 times too.
+ */
+ int k_up = 6;
+ int k_down = 6;
+ int channel;
+ struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
+
dev_dbg(dev, "convert rate = %d\n", io->converted_rate);
+
+ channel = io->converted_chan ? io->converted_chan :
+ params_channels(hw_params);
+
+ switch (rsnd_mod_id(src_mod)) {
+ /*
+ * SRC0 can downsample 4, 6 and 8 channel audio up to 4 times.
+ * SRC1, SRC3 and SRC4 can downsample 4 channel audio
+ * up to 4 times.
+ * SRC1, SRC3 and SRC4 can downsample 6 and 8 channel audio
+ * no more than twice.
+ */
+ case 1:
+ case 3:
+ case 4:
+ if (channel > 4) {
+ k_down = 2;
+ break;
+ }
+ fallthrough;
+ case 0:
+ if (channel > 2)
+ k_down = 4;
+ break;
+
+ /* Other SRC units do not support more than 2 channels */
+ default:
+ if (channel > 2)
+ return -EINVAL;
+ }
+
+ if (params_rate(hw_params) > io->converted_rate * k_down) {
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->min =
+ io->converted_rate * k_down;
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->max =
+ io->converted_rate * k_down;
+ hw_params->cmask |= SNDRV_PCM_HW_PARAM_RATE;
+ } else if (params_rate(hw_params) * k_up < io->converted_rate) {
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->min =
+ (io->converted_rate + k_up - 1) / k_up;
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->max =
+ (io->converted_rate + k_up - 1) / k_up;
+ hw_params->cmask |= SNDRV_PCM_HW_PARAM_RATE;
+ }
+
+ /*
+ * TBD: Max SRC input and output rates also depend on number
+ * of channels and SRC unit:
+ * SRC1, SRC3 and SRC4 do not support more than 128kHz
+ * for 6 channel and 96kHz for 8 channel audio.
+ * Perhaps this function should return EINVAL if the input or
+ * the output rate exceeds the limitation.
+ */
+ }
}
ret = rsnd_dai_call(hw_params, io, substream, hw_params);
--
2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Mikhail Durnev <mikhail_durnev@mentor.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
alsa-devel@alsa-project.org
Subject: [PATCH AUTOSEL 5.4 05/46] ASoC: rsnd: core: Check convert rate in rsnd_hw_params
Date: Wed, 5 May 2021 12:38:15 -0400 [thread overview]
Message-ID: <20210505163856.3463279-5-sashal@kernel.org> (raw)
In-Reply-To: <20210505163856.3463279-1-sashal@kernel.org>
From: Mikhail Durnev <mikhail_durnev@mentor.com>
[ Upstream commit 19c6a63ced5e07e40f3a5255cb1f0fe0d3be7b14 ]
snd_pcm_hw_params_set_rate_near can return incorrect sample rate in
some cases, e.g. when the backend output rate is set to some value higher
than 48000 Hz and the input rate is 8000 Hz. So passing the value returned
by snd_pcm_hw_params_set_rate_near to snd_pcm_hw_params will result in
"FSO/FSI ratio error" and playing no audio at all while the userland
is not properly notified about the issue.
If SRC is unable to convert the requested sample rate to the sample rate
the backend is using, then the requested sample rate should be adjusted in
rsnd_hw_params. The userland will be notified about that change in the
returned hw_params structure.
Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
Link: https://lore.kernel.org/r/1615870055-13954-1-git-send-email-mikhail_durnev@mentor.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/sh/rcar/core.c | 69 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 68 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index a6c1cf987e6e..df8d7b53b760 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1426,8 +1426,75 @@ static int rsnd_hw_params(struct snd_pcm_substream *substream,
}
if (io->converted_chan)
dev_dbg(dev, "convert channels = %d\n", io->converted_chan);
- if (io->converted_rate)
+ if (io->converted_rate) {
+ /*
+ * SRC supports convert rates from params_rate(hw_params)/k_down
+ * to params_rate(hw_params)*k_up, where k_up is always 6, and
+ * k_down depends on number of channels and SRC unit.
+ * So all SRC units can upsample audio up to 6 times regardless
+ * its number of channels. And all SRC units can downsample
+ * 2 channel audio up to 6 times too.
+ */
+ int k_up = 6;
+ int k_down = 6;
+ int channel;
+ struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
+
dev_dbg(dev, "convert rate = %d\n", io->converted_rate);
+
+ channel = io->converted_chan ? io->converted_chan :
+ params_channels(hw_params);
+
+ switch (rsnd_mod_id(src_mod)) {
+ /*
+ * SRC0 can downsample 4, 6 and 8 channel audio up to 4 times.
+ * SRC1, SRC3 and SRC4 can downsample 4 channel audio
+ * up to 4 times.
+ * SRC1, SRC3 and SRC4 can downsample 6 and 8 channel audio
+ * no more than twice.
+ */
+ case 1:
+ case 3:
+ case 4:
+ if (channel > 4) {
+ k_down = 2;
+ break;
+ }
+ fallthrough;
+ case 0:
+ if (channel > 2)
+ k_down = 4;
+ break;
+
+ /* Other SRC units do not support more than 2 channels */
+ default:
+ if (channel > 2)
+ return -EINVAL;
+ }
+
+ if (params_rate(hw_params) > io->converted_rate * k_down) {
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->min =
+ io->converted_rate * k_down;
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->max =
+ io->converted_rate * k_down;
+ hw_params->cmask |= SNDRV_PCM_HW_PARAM_RATE;
+ } else if (params_rate(hw_params) * k_up < io->converted_rate) {
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->min =
+ (io->converted_rate + k_up - 1) / k_up;
+ hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->max =
+ (io->converted_rate + k_up - 1) / k_up;
+ hw_params->cmask |= SNDRV_PCM_HW_PARAM_RATE;
+ }
+
+ /*
+ * TBD: Max SRC input and output rates also depend on number
+ * of channels and SRC unit:
+ * SRC1, SRC3 and SRC4 do not support more than 128kHz
+ * for 6 channel and 96kHz for 8 channel audio.
+ * Perhaps this function should return EINVAL if the input or
+ * the output rate exceeds the limitation.
+ */
+ }
}
ret = rsnd_dai_call(hw_params, io, substream, hw_params);
--
2.30.2
next prev parent reply other threads:[~2021-05-05 16:55 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 16:38 [Cluster-devel] [PATCH AUTOSEL 5.4 01/46] fs: dlm: fix debugfs dump Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 02/46] tipc: convert dest node's address to network order Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 03/46] ASoC: Intel: bytcr_rt5640: Enable jack-detect support on Asus T100TAF Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 04/46] net: stmmac: Set FIFO sizes for ipq806x Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` Sasha Levin [this message]
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 05/46] ASoC: rsnd: core: Check convert rate in rsnd_hw_params Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 06/46] i2c: bail out early when RDWR parameters are wrong Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 07/46] ALSA: hdsp: don't disable if not enabled Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 08/46] ALSA: hdspm: " Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 09/46] ALSA: rme9652: " Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 10/46] ALSA: bebob: enable to deliver MIDI messages for multiple ports Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 11/46] Bluetooth: Set CONF_NOT_COMPLETE as l2cap_chan default Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 12/46] Bluetooth: verify AMP hci_chan before amp_destroy Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 13/46] Bluetooth: initialize skb_queue_head at l2cap_chan_create() Sasha Levin
2021-05-05 16:38 ` [Bridge] [PATCH AUTOSEL 5.4 14/46] net: bridge: when suppression is enabled exclude RARP packets Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 15/46] Bluetooth: check for zapped sk before connecting Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 16/46] ip6_vti: proper dev_{hold|put} in ndo_[un]init methods Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 17/46] ASoC: Intel: bytcr_rt5640: Add quirk for the Chuwi Hi8 tablet Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 18/46] i2c: Add I2C_AQ_NO_REP_START adapter quirk Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 19/46] mac80211: clear the beacon's CRC after channel switch Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 20/46] pinctrl: samsung: use 'int' for register masks in Exynos Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 21/46] mt76: mt76x0: disable GTK offloading Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 22/46] cuse: prevent clone Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 23/46] ASoC: rsnd: call rsnd_ssi_master_clk_start() from rsnd_ssi_init() Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 24/46] Revert "iommu/amd: Fix performance counter initialization" Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 25/46] iommu/amd: Remove performance counter pre-initialization test Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 26/46] drm/amd/display: Force vsync flip when reconfiguring MPCC Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 27/46] selftests: Set CC to clang in lib.mk if LLVM is set Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 28/46] kconfig: nconf: stop endless search loops Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 29/46] ALSA: hda/hdmi: fix race in handling acomp ELD notification at resume Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 30/46] sctp: Fix out-of-bounds warning in sctp_process_asconf_param() Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 31/46] flow_dissector: Fix out-of-bounds warning in __skb_flow_bpf_to_target() Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 32/46] powerpc/smp: Set numa node before updating mask Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 33/46] ASoC: rt286: Generalize support for ALC3263 codec Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 34/46] ethtool: ioctl: Fix out-of-bounds warning in store_link_ksettings_for_user() Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 35/46] net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 36/46] samples/bpf: Fix broken tracex1 due to kprobe argument change Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 37/46] powerpc/pseries: Stop calling printk in rtas_stop_self() Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 38/46] drm/amd/display: fixed divide by zero kernel crash during dsc enablement Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 39/46] wl3501_cs: Fix out-of-bounds warnings in wl3501_send_pkt Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 40/46] wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 41/46] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 42/46] powerpc/iommu: Annotate nested lock for lockdep Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [Intel-wired-lan] [PATCH AUTOSEL 5.4 43/46] iavf: remove duplicate free resources calls Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 44/46] net: ethernet: mtk_eth_soc: fix RX VLAN offload Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 45/46] bnxt_en: Add PCI IDs for Hyper-V VF devices Sasha Levin
2021-05-05 16:38 ` [PATCH AUTOSEL 5.4 46/46] ia64: module: fix symbolizer crash on fdescr Sasha Levin
2021-05-05 16:38 ` Sasha Levin
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=20210505163856.3463279-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikhail_durnev@mentor.com \
--cc=stable@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.