ASoC: wm_adsp: Correct region base typo in wm_halo_setup_algs
Subsystems (3)
PATCH 1/2 ASoC: wm_adsp: Correct region base typo in wm_halo_setup_algs
Due to a typo the wrong base is being supplied for the primary algorithm on Halo firmwares, which will cause the controls to not function.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -2445,7 +2445,7 @@ static int wm_halo_setup_algs(struct wm_adsp *dsp)wmfw_v3_parse_id_header (dsp, &halo_id.fw, n_algs); ret =wm_halo_create_regions (dsp, halo_id.fw.id, - halo_id.ym_base, halo_id.ym_base); + halo_id.xm_base, halo_id.ym_base);if (ret)return ret;
Signature · 1 line
2.11.0
PATCH 2/2 ASoC: wm_adsp: Use DSP ops pointers to stop watchdog in error handlers
Whilst this isn't strictly necessary as the code is already DSP specific better to use the pointers to avoid potential issues in the future if one core ends up having multiple methods of stopping the watchdog.
--- sound/soc/codecs/wm_adsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm_adsp.c +2 -2
@@ -4285,7 +4285,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)if (val &ADSP2_WDT_TIMEOUT_STS_MASK ) {adsp_err (dsp,"watchdog timeout error\n" ); -wm_adsp_stop_watchdog (dsp); + dsp->ops->stop_watchdog (dsp);wm_adsp_fatal_error (dsp); }
@@ -4396,7 +4396,7 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data)mutex_lock (&dsp->pwr_lock);adsp_warn (dsp,"WDT Expiry Fault\n" ); -wm_halo_stop_watchdog (dsp); + dsp->ops->stop_watchdog (dsp);wm_adsp_fatal_error (dsp);mutex_unlock (&dsp->pwr_lock);
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: wm_adsp: Use DSP ops pointers to stop watchdog in error handlers" to the asoc tree
The patch
ASoC: wm_adsp: Use DSP ops pointers to stop watchdog in error handlers
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2
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
Quoted 1 line
From
81ed884501a59a49c71cd810578f793f3890c131Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 1 May 2019 11:13:32 +0100
Subject: [PATCH] ASoC: wm_adsp: Use DSP ops pointers to stop watchdog in error
handlers
Whilst this isn't strictly necessary as the code is already DSP specific better to use the pointers to avoid potential issues in the future if one core ends up having multiple methods of stopping the watchdog.
--- sound/soc/codecs/wm_adsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm_adsp.c +2 -2
@@ -4285,7 +4285,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp)if (val &ADSP2_WDT_TIMEOUT_STS_MASK ) {adsp_err (dsp,"watchdog timeout error\n" ); -wm_adsp_stop_watchdog (dsp); + dsp->ops->stop_watchdog (dsp);wm_adsp_fatal_error (dsp); }
@@ -4396,7 +4396,7 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data)mutex_lock (&dsp->pwr_lock);adsp_warn (dsp,"WDT Expiry Fault\n" ); -wm_halo_stop_watchdog (dsp); + dsp->ops->stop_watchdog (dsp);wm_adsp_fatal_error (dsp);mutex_unlock (&dsp->pwr_lock);
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: wm_adsp: Correct region base typo in wm_halo_setup_algs" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Correct region base typo in wm_halo_setup_algs
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2
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
Quoted 1 line
From
b75a9799dc371ce5f51a73536f248f60a1be74ecMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 1 May 2019 11:13:31 +0100
Subject: [PATCH] ASoC: wm_adsp: Correct region base typo in wm_halo_setup_algs
Due to a typo the wrong base is being supplied for the primary algorithm on Halo firmwares, which will cause the controls to not function.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -2445,7 +2445,7 @@ static int wm_halo_setup_algs(struct wm_adsp *dsp)wmfw_v3_parse_id_header (dsp, &halo_id.fw, n_algs); ret =wm_halo_create_regions (dsp, halo_id.fw.id, - halo_id.ym_base, halo_id.ym_base); + halo_id.xm_base, halo_id.ym_base);if (ret)return ret;
Signature · 1 line
2.20.1