Skip to content

Commit 517363b

Browse files
torvaldstorvalds
committed
Merge tag 'sound-fix-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A collection of small fixes. Majority of changes are device-specific fixes and quirks, while there are a few core fixes to address regressions and corner cases spotted by fuzzers. - Fix of spinlock range that wrongly covered kvfree() call in rawmidi - Fix potential NULL dereference at PCM mmap - Fix incorrectly advertised MIDI 2.0 UMP Function Block info - Various ASoC AMD quirks and fixes - ASoC SOF Intel, Mediatek, HDMI-codec fixes - A few more quirks and TAS2781 codec fix for HD-audio - A couple of fixes for USB-audio for malicious USB descriptors" * tag 'sound-fix-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits) ALSA: hda: improve bass speaker support for ASUS Zenbook UM5606WA ALSA: hda/realtek: Apply quirk for Medion E15433 ASoC: amd: yc: Add a quirk for microfone on Lenovo ThinkPad P14s Gen 5 21MES00B00 ASoC: SOF: ipc3-topology: Convert the topology pin index to ALH dai index ASoC: mediatek: Check num_codecs is not zero to avoid panic during probe ASoC: amd: yc: Fix for enabling DMIC on acp6x via _DSD entry ALSA: ump: Fix evaluation of MIDI 1.0 FB info ALSA: core: Fix possible NULL dereference caused by kunit_kzalloc() ALSA: hda: Show the codec quirk info at probing ALSA: asihpi: Remove unused variable ALSA: hda/realtek: Set PCBeep to default value for ALC274 ALSA: hda/tas2781: Add speaker id check for ASUS projects ALSA: hda/realtek: Update ALC225 depop procedure ALSA: hda/realtek: Enable speaker pins for Medion E15443 platform ALSA: hda/realtek: fix mute/micmute LEDs don't work for EliteBook X G1i ALSA: usb-audio: Fix out of bounds reads when finding clock sources ALSA: rawmidi: Fix kvfree() call in spinlock ALSA: hda/realtek: Fix Internal Speaker and Mic boost of Infinix Y4 Max ASoC: amd: yc: Add quirk for microphone on Lenovo Thinkpad T14s Gen 6 21M1CTO1WW ASoC: doc: dapm: Add location information for dapm-graph tool ...
2 parents 2eff01e + 2e5bf5b commit 517363b

File tree

23 files changed

+328
-109
lines changed

23 files changed

+328
-109
lines changed

‎Documentation/sound/hd-audio/notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you are interested in the deep debugging of HD-audio, read the
4242
HD-audio specification at first. The specification is found on
4343
Intel's web page, for example:
4444

45-
* https://www.intel.com/standards/hdaudio/
45+
* https://www.intel.com/content/www/us/en/standards/high-definition-audio-specification.html
4646

4747

4848
HD-Audio Controller

‎Documentation/sound/soc/dapm.rst

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ The graph for the STM32MP1-DK1 sound card is shown in picture:
3535
:alt: Example DAPM graph
3636
:align: center
3737

38+
You can also generate compatible graph for your sound card using
39+
`tools/sound/dapm-graph` utility.
40+
3841
DAPM power domains
3942
==================
4043

‎include/sound/tas2781.h

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ struct tasdevice_priv {
156156
struct tasdevice_rca rcabin;
157157
struct calidata cali_data;
158158
struct tasdevice_fw *fmw;
159+
struct gpio_desc *speaker_id;
159160
struct gpio_desc *reset;
160161
struct mutex codec_lock;
161162
struct regmap *regmap;

‎sound/ac97/bus.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static int ac97_bus_reset(struct ac97_controller *ac97_ctrl)
180180

181181
/**
182182
* snd_ac97_codec_driver_register - register an AC97 codec driver
183-
* @dev: AC97 driver codec to register
183+
* @drv: AC97 driver codec to register
184184
*
185185
* Register an AC97 codec driver to the ac97 bus driver, aka. the AC97 digital
186186
* controller.
@@ -196,7 +196,7 @@ EXPORT_SYMBOL_GPL(snd_ac97_codec_driver_register);
196196

197197
/**
198198
* snd_ac97_codec_driver_unregister - unregister an AC97 codec driver
199-
* @dev: AC97 codec driver to unregister
199+
* @drv: AC97 codec driver to unregister
200200
*
201201
* Unregister a previously registered ac97 codec driver.
202202
*/
@@ -338,6 +338,7 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl)
338338
* @dev: the device providing the ac97 DC function
339339
* @slots_available: mask of the ac97 codecs that can be scanned and probed
340340
* bit0 => codec 0, bit1 => codec 1 ... bit 3 => codec 3
341+
* @codecs_pdata: codec platform data
341342
*
342343
* Register a digital controller which can control up to 4 ac97 codecs. This is
343344
* the controller side of the AC97 AC-link, while the slave side are the codecs.

‎sound/core/pcm_native.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -3813,9 +3813,11 @@ static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf)
38133813
return VM_FAULT_SIGBUS;
38143814
if (substream->ops->page)
38153815
page = substream->ops->page(substream, offset);
3816-
else if (!snd_pcm_get_dma_buf(substream))
3816+
else if (!snd_pcm_get_dma_buf(substream)) {
3817+
if (WARN_ON_ONCE(!runtime->dma_area))
3818+
return VM_FAULT_SIGBUS;
38173819
page = virt_to_page(runtime->dma_area + offset);
3818-
else
3820+
} else
38193821
page = snd_sgbuf_get_page(snd_pcm_get_dma_buf(substream), offset);
38203822
if (!page)
38213823
return VM_FAULT_SIGBUS;

‎sound/core/rawmidi.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -724,15 +724,17 @@ static int resize_runtime_buffer(struct snd_rawmidi_substream *substream,
724724
newbuf = kvzalloc(params->buffer_size, GFP_KERNEL);
725725
if (!newbuf)
726726
return -ENOMEM;
727-
guard(spinlock_irq)(&substream->lock);
727+
spin_lock_irq(&substream->lock);
728728
if (runtime->buffer_ref) {
729+
spin_unlock_irq(&substream->lock);
729730
kvfree(newbuf);
730731
return -EBUSY;
731732
}
732733
oldbuf = runtime->buffer;
733734
runtime->buffer = newbuf;
734735
runtime->buffer_size = params->buffer_size;
735736
__reset_runtime_ptrs(runtime, is_input);
737+
spin_unlock_irq(&substream->lock);
736738
kvfree(oldbuf);
737739
}
738740
runtime->avail_min = params->avail_min;

‎sound/core/sound_kunit.c

+11
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ static void test_format_fill_silence(struct kunit *test)
172172
u32 i, j;
173173

174174
buffer = kunit_kzalloc(test, SILENCE_BUFFER_SIZE, GFP_KERNEL);
175+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buffer);
175176

176177
for (i = 0; i < ARRAY_SIZE(buf_samples); i++) {
177178
for (j = 0; j < ARRAY_SIZE(valid_fmt); j++)
@@ -208,8 +209,12 @@ static void test_playback_avail(struct kunit *test)
208209
struct snd_pcm_runtime *r = kunit_kzalloc(test, sizeof(*r), GFP_KERNEL);
209210
u32 i;
210211

212+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r);
213+
211214
r->status = kunit_kzalloc(test, sizeof(*r->status), GFP_KERNEL);
212215
r->control = kunit_kzalloc(test, sizeof(*r->control), GFP_KERNEL);
216+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r->status);
217+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r->control);
213218

214219
for (i = 0; i < ARRAY_SIZE(p_avail_data); i++) {
215220
r->buffer_size = p_avail_data[i].buffer_size;
@@ -232,8 +237,12 @@ static void test_capture_avail(struct kunit *test)
232237
struct snd_pcm_runtime *r = kunit_kzalloc(test, sizeof(*r), GFP_KERNEL);
233238
u32 i;
234239

240+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r);
241+
235242
r->status = kunit_kzalloc(test, sizeof(*r->status), GFP_KERNEL);
236243
r->control = kunit_kzalloc(test, sizeof(*r->control), GFP_KERNEL);
244+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r->status);
245+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, r->control);
237246

238247
for (i = 0; i < ARRAY_SIZE(c_avail_data); i++) {
239248
r->buffer_size = c_avail_data[i].buffer_size;
@@ -247,6 +256,7 @@ static void test_capture_avail(struct kunit *test)
247256
static void test_card_set_id(struct kunit *test)
248257
{
249258
struct snd_card *card = kunit_kzalloc(test, sizeof(*card), GFP_KERNEL);
259+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, card);
250260

251261
snd_card_set_id(card, VALID_NAME);
252262
KUNIT_EXPECT_STREQ(test, card->id, VALID_NAME);
@@ -280,6 +290,7 @@ static void test_pcm_format_name(struct kunit *test)
280290
static void test_card_add_component(struct kunit *test)
281291
{
282292
struct snd_card *card = kunit_kzalloc(test, sizeof(*card), GFP_KERNEL);
293+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, card);
283294

284295
snd_component_add(card, TEST_FIRST_COMPONENT);
285296
KUNIT_ASSERT_STREQ(test, card->components, TEST_FIRST_COMPONENT);

‎sound/core/ump.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,10 @@ static void fill_fb_info(struct snd_ump_endpoint *ump,
788788
info->ui_hint = buf->fb_info.ui_hint;
789789
info->first_group = buf->fb_info.first_group;
790790
info->num_groups = buf->fb_info.num_groups;
791-
info->flags = buf->fb_info.midi_10;
791+
if (buf->fb_info.midi_10 < 2)
792+
info->flags = buf->fb_info.midi_10;
793+
else
794+
info->flags = SNDRV_UMP_BLOCK_IS_MIDI1 | SNDRV_UMP_BLOCK_IS_LOWSPEED;
792795
info->active = buf->fb_info.active;
793796
info->midi_ci_version = buf->fb_info.midi_ci_version;
794797
info->sysex8_streams = buf->fb_info.sysex8_streams;

‎sound/pci/asihpi/asihpi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
464464
return -ENOMEM;
465465
}
466466

467-
err = hpi_stream_get_info_ex(dpcm->h_stream, NULL,
467+
hpi_stream_get_info_ex(dpcm->h_stream, NULL,
468468
&dpcm->hpi_buffer_attached, NULL, NULL, NULL);
469469
}
470470
bytes_per_sec = params_rate(params) * params_channels(params);

‎sound/pci/hda/hda_auto_parser.c

+11-9
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,7 @@ void snd_hda_pick_pin_fixup(struct hda_codec *codec,
933933
bool match_all_pins)
934934
{
935935
const struct snd_hda_pin_quirk *pq;
936+
const char *name = NULL;
936937

937938
if (codec->fixup_id != HDA_FIXUP_ID_NOT_SET)
938939
return;
@@ -946,9 +947,10 @@ void snd_hda_pick_pin_fixup(struct hda_codec *codec,
946947
codec->fixup_id = pq->value;
947948
#ifdef CONFIG_SND_DEBUG_VERBOSE
948949
codec->fixup_name = pq->name;
949-
codec_dbg(codec, "%s: picked fixup %s (pin match)\n",
950-
codec->core.chip_name, codec->fixup_name);
950+
name = pq->name;
951951
#endif
952+
codec_info(codec, "%s: picked fixup %s (pin match)\n",
953+
codec->core.chip_name, name ? name : "");
952954
codec->fixup_list = fixlist;
953955
return;
954956
}
@@ -1015,8 +1017,8 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
10151017
if (codec->modelname && !strcmp(codec->modelname, "nofixup")) {
10161018
id = HDA_FIXUP_ID_NO_FIXUP;
10171019
fixlist = NULL;
1018-
codec_dbg(codec, "%s: picked no fixup (nofixup specified)\n",
1019-
codec->core.chip_name);
1020+
codec_info(codec, "%s: picked no fixup (nofixup specified)\n",
1021+
codec->core.chip_name);
10201022
goto found;
10211023
}
10221024

@@ -1026,8 +1028,8 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
10261028
if (!strcmp(codec->modelname, models->name)) {
10271029
id = models->id;
10281030
name = models->name;
1029-
codec_dbg(codec, "%s: picked fixup %s (model specified)\n",
1030-
codec->core.chip_name, codec->fixup_name);
1031+
codec_info(codec, "%s: picked fixup %s (model specified)\n",
1032+
codec->core.chip_name, name);
10311033
goto found;
10321034
}
10331035
models++;
@@ -1085,9 +1087,9 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
10851087
#ifdef CONFIG_SND_DEBUG_VERBOSE
10861088
name = q->name;
10871089
#endif
1088-
codec_dbg(codec, "%s: picked fixup %s for %s %04x:%04x\n",
1089-
codec->core.chip_name, name ? name : "",
1090-
type, q->subvendor, q->subdevice);
1090+
codec_info(codec, "%s: picked fixup %s for %s %04x:%04x\n",
1091+
codec->core.chip_name, name ? name : "",
1092+
type, q->subvendor, q->subdevice);
10911093
found:
10921094
codec->fixup_id = id;
10931095
codec->fixup_list = fixlist;

0 commit comments

Comments
 (0)