mirror of
https://github.com/torvalds/linux
synced 2024-09-06 01:40:28 +00:00
![]() snd_soc_card_get_kcontrol() must be holding a read lock on
card->controls_rwsem while walking the controls list.
Compare with snd_ctl_find_numid().
The existing function is renamed snd_soc_card_get_kcontrol_locked()
so that it can be called from contexts that are already holding
card->controls_rwsem (for example, control get/put functions).
There are few direct or indirect callers of
snd_soc_card_get_kcontrol(), and most are safe. Three require
changes, which have been included in this patch:
codecs/cs35l45.c:
cs35l45_activate_ctl() is called from a control put() function so
is changed to call snd_soc_card_get_kcontrol_locked().
codecs/cs35l56.c:
cs35l56_sync_asp1_mixer_widgets_with_firmware() is called from
control get()/put() functions so is changed to call
snd_soc_card_get_kcontrol_locked().
fsl/fsl_xcvr.c:
fsl_xcvr_activate_ctl() is called from three places, one of which
already holds card->controls_rwsem:
1. fsl_xcvr_mode_put(), a control put function, which will
already be holding card->controls_rwsem.
2. fsl_xcvr_startup(), a DAI startup function.
3. fsl_xcvr_shutdown(), a DAI shutdown function.
To fix this, fsl_xcvr_activate_ctl() has been changed to call
snd_soc_card_get_kcontrol_locked() so that it is safe to call
directly from fsl_xcvr_mode_put().
The fsl_xcvr_startup() and fsl_xcvr_shutdown() functions have been
changed to take a read lock on card->controls_rsem() around calls
to fsl_xcvr_activate_ctl(). While this is not very elegant, it
keeps the change small, to avoid this patch creating a large
collateral churn in fsl/fsl_xcvr.c.
Analysis of other callers of snd_soc_card_get_kcontrol() is that
they do not need any changes, they are not holding card->controls_rwsem
when they call snd_soc_card_get_kcontrol().
Direct callers of snd_soc_card_get_kcontrol():
fsl/fsl_spdif.c: fsl_spdif_dai_probe() - DAI probe function
fsl/fsl_micfil.c: voice_detected_fn() - IRQ handler
Indirect callers via soc_component_notify_control():
codecs/cs42l43: cs42l43_mic_shutter() - IRQ handler
codecs/cs42l43: cs42l43_spk_shutter() - IRQ handler
codecs/ak4118.c: ak4118_irq_handler() - IRQ handler
codecs/wm_adsp.c: wm_adsp_write_ctl() - not currently used
Indirect callers via snd_soc_limit_volume():
qcom/sc8280xp.c: sc8280xp_snd_init() - DAIlink init function
ti/rx51.c: rx51_aic34_init() - DAI init function
I don't have hardware to test the fsl/*, qcom/sc828xp.c, ti/rx51.c
and ak4118.c changes.
Backport note:
The fsl/, qcom/, cs35l45, cs35l56 and cs42l43 callers were added
since the Fixes commit so won't all be present on older kernels.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes:
|
||
---|---|---|
.. | ||
ac97 | ||
sof | ||
ac97_codec.h | ||
aci.h | ||
acp63_chip_offset_byte.h | ||
ad1816a.h | ||
ad1843.h | ||
adau1373.h | ||
ak4xxx-adda.h | ||
ak4113.h | ||
ak4114.h | ||
ak4117.h | ||
ak4531_codec.h | ||
ak4641.h | ||
alc5623.h | ||
asequencer.h | ||
asound.h | ||
asoundef.h | ||
compress_driver.h | ||
control.h | ||
core.h | ||
cs35l33.h | ||
cs35l34.h | ||
cs35l35.h | ||
cs35l36.h | ||
cs35l41.h | ||
cs35l56.h | ||
cs42l42.h | ||
cs42l43.h | ||
cs42l52.h | ||
cs42l56.h | ||
cs42l73.h | ||
cs4231-regs.h | ||
cs4271.h | ||
cs8403.h | ||
cs8427.h | ||
da7213.h | ||
da7218.h | ||
da7219-aad.h | ||
da7219.h | ||
da9055.h | ||
designware_i2s.h | ||
dmaengine_pcm.h | ||
emu10k1.h | ||
emu10k1_synth.h | ||
emu8000.h | ||
emu8000_reg.h | ||
emux_legacy.h | ||
emux_synth.h | ||
es1688.h | ||
graph_card.h | ||
gus.h | ||
hda-mlink.h | ||
hda_chmap.h | ||
hda_codec.h | ||
hda_component.h | ||
hda_hwdep.h | ||
hda_i915.h | ||
hda_register.h | ||
hda_regmap.h | ||
hda_verbs.h | ||
hdaudio.h | ||
hdaudio_ext.h | ||
hdmi-codec.h | ||
hwdep.h | ||
i2c.h | ||
info.h | ||
initval.h | ||
intel-dsp-config.h | ||
intel-nhlt.h | ||
jack.h | ||
madera-pdata.h | ||
max9768.h | ||
max98088.h | ||
max98090.h | ||
max98095.h | ||
memalloc.h | ||
minors.h | ||
mixer_oss.h | ||
mpu401.h | ||
omap-hdmi-audio.h | ||
opl3.h | ||
opl4.h | ||
pcm-indirect.h | ||
pcm.h | ||
pcm_drm_eld.h | ||
pcm_iec958.h | ||
pcm_oss.h | ||
pcm_params.h | ||
pt2258.h | ||
pxa2xx-lib.h | ||
rawmidi.h | ||
rt286.h | ||
rt298.h | ||
rt1015.h | ||
rt5514.h | ||
rt5659.h | ||
rt5660.h | ||
rt5663.h | ||
rt5665.h | ||
rt5668.h | ||
rt5682.h | ||
rt5682s.h | ||
sb.h | ||
sb16_csp.h | ||
sdw.h | ||
seq_device.h | ||
seq_kernel.h | ||
seq_midi_emul.h | ||
seq_midi_event.h | ||
seq_oss.h | ||
seq_oss_legacy.h | ||
seq_virmidi.h | ||
sh_dac_audio.h | ||
sh_fsi.h | ||
simple_card.h | ||
simple_card_utils.h | ||
snd_wavefront.h | ||
soc-acpi-intel-match.h | ||
soc-acpi.h | ||
soc-card.h | ||
soc-component.h | ||
soc-dai.h | ||
soc-dapm.h | ||
soc-dpcm.h | ||
soc-jack.h | ||
soc-link.h | ||
soc-topology.h | ||
soc.h | ||
sof.h | ||
soundfont.h | ||
spear_dma.h | ||
spear_spdif.h | ||
sta32x.h | ||
sta350.h | ||
tas2552-plat.h | ||
tas2781-dsp.h | ||
tas2781-tlv.h | ||
tas2781.h | ||
tas5086.h | ||
tea6330t.h | ||
timer.h | ||
tlv.h | ||
tlv320aic32x4.h | ||
tlv320dac33-plat.h | ||
tpa6130a2-plat.h | ||
uda1380.h | ||
ump.h | ||
ump_convert.h | ||
ump_msg.h | ||
util_mem.h | ||
vx_core.h | ||
wavefront.h | ||
wm0010.h | ||
wm2000.h | ||
wm2200.h | ||
wm5100.h | ||
wm8903.h | ||
wm8904.h | ||
wm8955.h | ||
wm8960.h | ||
wm8962.h | ||
wm8993.h | ||
wm8996.h | ||
wm9081.h | ||
wm9090.h | ||
wss.h |