| Message ID | 20240325113127.112783-1-rf@opensource.cirrus.com |
|---|---|
| Headers | show |
| Series | ALSA: cirrus: Tidy up of firmware control read/write | expand |
On Mon, 25 Mar 2024 12:31:22 +0100, Richard Fitzgerald wrote: > > This set of patches factors out some repeated code to clean up > firmware control read/write functions, and removes some redundant > control notification code. > > Simon Trimmer (5): > firmware: cs_dsp: Add locked wrappers for coeff read and write > ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() > ALSA: hda: hda_cs_dsp_ctl: Use > cs_dsp_coeff_lock_and_[read|write]_ctrl() > ASoC: wm_adsp: Remove notification of driver write > ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write The patch 4 doesn't look cleanly applicable to my tree. Should it be applied via Mark's tree? thanks, Takashi
On 30/03/2024 08:40, Takashi Iwai wrote: > On Mon, 25 Mar 2024 12:31:22 +0100, > Richard Fitzgerald wrote: >> >> This set of patches factors out some repeated code to clean up >> firmware control read/write functions, and removes some redundant >> control notification code. >> >> Simon Trimmer (5): >> firmware: cs_dsp: Add locked wrappers for coeff read and write >> ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() >> ALSA: hda: hda_cs_dsp_ctl: Use >> cs_dsp_coeff_lock_and_[read|write]_ctrl() >> ASoC: wm_adsp: Remove notification of driver write >> ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write > > The patch 4 doesn't look cleanly applicable to my tree. > Should it be applied via Mark's tree? > Yes, it will need to go through Mark's tree. Mark's for-next has one extra patch to wm_adsp.c that changes the same function: f193957b0fbb ("ASoC: wm_adsp: Fix missing mutex_lock in wm_adsp_write_ctl()")
On Mon, 01 Apr 2024 11:32:49 +0200, Richard Fitzgerald wrote: > > On 30/03/2024 08:40, Takashi Iwai wrote: > > On Mon, 25 Mar 2024 12:31:22 +0100, > > Richard Fitzgerald wrote: > >> > >> This set of patches factors out some repeated code to clean up > >> firmware control read/write functions, and removes some redundant > >> control notification code. > >> > >> Simon Trimmer (5): > >> firmware: cs_dsp: Add locked wrappers for coeff read and write > >> ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() > >> ALSA: hda: hda_cs_dsp_ctl: Use > >> cs_dsp_coeff_lock_and_[read|write]_ctrl() > >> ASoC: wm_adsp: Remove notification of driver write > >> ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write > > > > The patch 4 doesn't look cleanly applicable to my tree. > > Should it be applied via Mark's tree? > > > > Yes, it will need to go through Mark's tree. > Mark's for-next has one extra patch to wm_adsp.c that changes > the same function: > > f193957b0fbb ("ASoC: wm_adsp: Fix missing mutex_lock in > wm_adsp_write_ctl()") OK, then it should go via Mark's tree. Feel free to take my ack: Reviewed-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi
On Mon, 25 Mar 2024 11:31:22 +0000, Richard Fitzgerald wrote: > This set of patches factors out some repeated code to clean up > firmware control read/write functions, and removes some redundant > control notification code. > > Simon Trimmer (5): > firmware: cs_dsp: Add locked wrappers for coeff read and write > ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() > ALSA: hda: hda_cs_dsp_ctl: Use > cs_dsp_coeff_lock_and_[read|write]_ctrl() > ASoC: wm_adsp: Remove notification of driver write > ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/5] firmware: cs_dsp: Add locked wrappers for coeff read and write commit: 4d0333798ebbfa1683cc3bc056d1b25b8c24344c [2/5] ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() commit: 3802a9969bd365749f5e34928082cff96ed7769b [3/5] ALSA: hda: hda_cs_dsp_ctl: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() commit: 62daf3df8a6b1920f7613e478935443a8f449708 [4/5] ASoC: wm_adsp: Remove notification of driver write commit: e81f5c9f7d06a69dc505fa6ad351df6cc86a6c2d [5/5] ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write commit: d641def12ec929af6c4f9b1b28efcd3e5dff21b4 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
This set of patches factors out some repeated code to clean up firmware control read/write functions, and removes some redundant control notification code. Simon Trimmer (5): firmware: cs_dsp: Add locked wrappers for coeff read and write ASoC: wm_adsp: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() ALSA: hda: hda_cs_dsp_ctl: Use cs_dsp_coeff_lock_and_[read|write]_ctrl() ASoC: wm_adsp: Remove notification of driver write ALSA: hda: hda_cs_dsp_ctl: Remove notification of driver write drivers/firmware/cirrus/cs_dsp.c | 54 ++++++++++++++++++++++++++ include/linux/firmware/cirrus/cs_dsp.h | 4 ++ sound/pci/hda/hda_cs_dsp_ctl.c | 22 +---------- sound/soc/codecs/wm_adsp.c | 32 ++++----------- 4 files changed, 67 insertions(+), 45 deletions(-)