ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
Subsystems (3)
PATCH 1/3 ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
sst_send_slot_map() uses sst_fill_and_send_cmd_unlocked() because in some places it is called with the drv->lock mutex already held.
So it must always be called with the mutex locked. This commit adds missing locking in the sst_set_be_modules() code-path.
--- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/atom/sst-atom-controls.c +2 -0
@@ -966,7 +966,9 @@ static int sst_set_be_modules(struct snd_soc_dapm_widget *w,dev_dbg (c->dev,"Enter: widget=%s\n" , w->name);if (SND_SOC_DAPM_EVENT_ON (event)) { +mutex_lock (&drv->lock); ret =sst_send_slot_map (drv); +mutex_unlock (&drv->lock);if (ret)return ret; ret =sst_send_pipe_module_params (w, k);
Signature · 1 line
2.26.0
PATCH 2/3 ASoC: Intel: atom: Check drv->lock is locked in sst_fill_and_send_cmd_unlocked
sst_fill_and_send_cmd_unlocked must be called with the drv->lock mutex locked already. In the past there have been cases where this was not the case, add a WARN_ON to check for drv->lock being locked.
--- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/atom/sst-atom-controls.c +2 -0
@@ -50,6 +50,8 @@ static int sst_fill_and_send_cmd_unlocked(struct sst_data *drv, {int ret =0 ; +WARN_ON (!mutex_is_locked (&drv->lock)); + ret =sst_fill_byte_control (drv, ipc_msg, block, task_id, pipe_id, len, cmd_data);if (ret <0 )
Signature · 1 line
2.26.0
Mark Brown
maintainerApplied "ASoC: Intel: atom: Check drv->lock is locked in sst_fill_and_send_cmd_unlocked" to the asoc tree
The patch
ASoC: Intel: atom: Check drv->lock is locked in sst_fill_and_send_cmd_unlocked
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From 0bb2be2d1b78f18ae68633b89ad49d84e0cb9bf6 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Thu, 2 Apr 2020 20:53:58 +0200
Subject: [PATCH] ASoC: Intel: atom: Check drv->lock is locked in
sst_fill_and_send_cmd_unlocked
sst_fill_and_send_cmd_unlocked must be called with the drv->lock mutex locked already. In the past there have been cases where this was not the case, add a WARN_ON to check for drv->lock being locked.
--- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/atom/sst-atom-controls.c +2 -0
@@ -50,6 +50,8 @@ static int sst_fill_and_send_cmd_unlocked(struct sst_data *drv, {int ret =0 ; +WARN_ON (!mutex_is_locked (&drv->lock)); + ret =sst_fill_byte_control (drv, ipc_msg, block, task_id, pipe_id, len, cmd_data);if (ret <0 )
Signature · 1 line
2.20.1
PATCH 3/3 ASoC: Intel: atom: Fix uninitialized variable compiler warning
In reply to Hans de GoedeGCC 10 gives a "variable might be used uninitialized" warning for the block variable in sst_prepare_and_post_msg().
This is a false-positive warning, but lets fix it anyways.
--- sound/soc/intel/atom/sst/sst_pvt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/atom/sst/sst_pvt.c +1 -1
@@ -223,9 +223,9 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst, size_t mbox_data_len, const void *mbox_data, void **data, bool large, bool fill_dsp, bool sync, bool response) { + struct sst_block *block = NULL;struct ipc_post *msg =NULL ;struct ipc_dsp_hdr dsp_hdr; -struct sst_block *block;int ret =0 , pvt_id; pvt_id =sst_assign_pvt_id (sst);
Signature · 1 line
2.26.0
Mark Brown
maintainerApplied "ASoC: Intel: atom: Fix uninitialized variable compiler warning" to the asoc tree
The patch
ASoC: Intel: atom: Fix uninitialized variable compiler warning
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From c515291d312760ff0ad1d4431f0fb29be5d0ef45 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Thu, 2 Apr 2020 20:53:59 +0200
Subject: [PATCH] ASoC: Intel: atom: Fix uninitialized variable compiler
warning
GCC 10 gives a "variable might be used uninitialized" warning for the block variable in sst_prepare_and_post_msg().
This is a false-positive warning, but lets fix it anyways.
--- sound/soc/intel/atom/sst/sst_pvt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/atom/sst/sst_pvt.c +1 -1
@@ -223,9 +223,9 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst, size_t mbox_data_len, const void *mbox_data, void **data, bool large, bool fill_dsp, bool sync, bool response) { + struct sst_block *block = NULL;struct ipc_post *msg =NULL ;struct ipc_dsp_hdr dsp_hdr; -struct sst_block *block;int ret =0 , pvt_id; pvt_id =sst_assign_pvt_id (sst);
Signature · 1 line
2.20.1
Quoted 8 lines · Hans de Goede
sst_send_slot_map()usessst_fill_and_send_cmd_unlocked()because in some places it is called with thedrv->lockmutex already held.So it must always be called with the mutex locked. This commit adds missing locking in the
sst_set_be_modules()code-path.Fixes 24c8d14192cc ("ASoC: Intel: mrfld: add DSP core controls")Signed-off-by Hans de Goede <[email protected]>
2014 bug, nice!
for the series:
Quoted 19 lines
--- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+)sound/soc/intel/atom/sst-atom-controls.c +2
-0@@ -966,7 +966,9 @@ static int sst_set_be_modules(struct snd_soc_dapm_widget *w,dev_dbg (c->dev,"Enter: widget=%s\n" , w->name);if (SND_SOC_DAPM_EVENT_ON (event)) { +mutex_lock (&drv->lock); ret =sst_send_slot_map (drv); +mutex_unlock (&drv->lock);if (ret)return ret; ret =sst_send_pipe_module_params (w, k);
Mark Brown
maintainerApplied "ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()" to the asoc tree
In reply to Hans de GoedeThe patch
ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From 81630dc042af998b9f58cd8e2c29dab9777ea176 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Thu, 2 Apr 2020 20:53:57 +0200
Subject: [PATCH] ASoC: Intel: atom: Take the drv->lock mutex before calling
sst_send_slot_map()
sst_send_slot_map() uses sst_fill_and_send_cmd_unlocked() because in some places it is called with the drv->lock mutex already held.
So it must always be called with the mutex locked. This commit adds missing locking in the sst_set_be_modules() code-path.
--- sound/soc/intel/atom/sst-atom-controls.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/atom/sst-atom-controls.c +2 -0
@@ -966,7 +966,9 @@ static int sst_set_be_modules(struct snd_soc_dapm_widget *w,dev_dbg (c->dev,"Enter: widget=%s\n" , w->name);if (SND_SOC_DAPM_EVENT_ON (event)) { +mutex_lock (&drv->lock); ret =sst_send_slot_map (drv); +mutex_unlock (&drv->lock);if (ret)return ret; ret =sst_send_pipe_module_params (w, k);
Signature · 1 line
2.20.1