March 2023 - Alsa-devel - mailman.alsa-project.org

[PATCH] soundwire: qcom: correct setting ignore bit on v1.5.1
by Krzysztof Kozlowski 15 Mar '23

15 Mar '23

According to the comment and to downstream sources, the SWRM_CONTINUE_EXEC_ON_CMD_IGNORE in SWRM_CMD_FIFO_CFG_ADDR register should be set for v1.5.1 and newer, so fix the >= operator. Fixes: 542d3491cdd7 ("soundwire: qcom: set continue execution flag for ignored commands") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index d5b73b7f98bf..29035cf15407 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -733,7 +733,7 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) } /* Configure number of retries of a read/write cmd */ - if (ctrl->version > 0x01050001) { + if (ctrl->version >= 0x01050001) { /* Only for versions >= 1.5.1 */ ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR, SWRM_RD_WR_CMD_RETRIES | -- 2.34.1

3 2

[PATCH] soundwire: dmi-quirks: add remapping for Intel 'Rooks County' NUC M15
by Bard Liao 15 Mar '23

15 Mar '23

From: Eugene Huang <eugene.huang99(a)gmail.com> Same DSDT problem as the HP Omen 16-k0005TX, except rt1316 amp is on link2. Link: https://github.com/thesofproject/linux/issues/4088 Signed-off-by: Eugene Huang <eugene.huang99(a)gmail.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- To support 'Rooks County', we also need the "ASOC: Intel: add quirk for Intel 'Rooks County' NUC M15" series. --- drivers/soundwire/dmi-quirks.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c index 7969881f126d..58ea013fa918 100644 --- a/drivers/soundwire/dmi-quirks.c +++ b/drivers/soundwire/dmi-quirks.c @@ -73,6 +73,23 @@ static const struct adr_remap hp_omen_16[] = { {} }; +/* + * Intel NUC M15 LAPRC510 and LAPRC710 + */ +static const struct adr_remap intel_rooks_county[] = { + /* rt711-sdca on link0 */ + { + 0x000020025d071100ull, + 0x000030025d071101ull + }, + /* rt1316-sdca on link2 */ + { + 0x000120025d071100ull, + 0x000230025d131601ull + }, + {} +}; + static const struct dmi_system_id adr_remap_quirk_table[] = { /* TGL devices */ { @@ -98,6 +115,14 @@ static const struct dmi_system_id adr_remap_quirk_table[] = { }, .driver_data = (void *)intel_tgl_bios, }, + { + /* quirk used for NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"), + DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"), + }, + .driver_data = (void *)intel_rooks_county, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), -- 2.25.1

2 1

[PATCH] ASoC: soc-pcm.c: remove indirect runtime copy
by Kuninori Morimoto 15 Mar '23

15 Mar '23

substream->runtime will be attached when substream was opened at snd_pcm_attach_substream(). When it uses DPCM, FE substream->runtime is attached, but BE substream->runtime is not. Thus, we are copying FE substream->runtime to BE. But, we are copyig FE substream->runtime to FE dpcm->runtime first (A), and copy it to BE dpcm->runtime (B), and copy it to BE substream->runtime (C). static int dpcm_fe_dai_open(...) { ... (A) fe->dpcm[stream].runtime = fe_substream->runtime; ... } static int dpcm_be_connect(...) { ... (B) be->dpcm[stream].runtime = fe->dpcm[stream].runtime; ... } int dpcm_be_dai_startup(...) { ... (C) be_substream->runtime = be->dpcm[stream].runtime; ... } It is too roundabout and troublesome. OTOH, it is directly copying fe_substream->runtime at dpcm_be_reparent() without using be->dpcm[stream].runtime. static void dpcm_be_reparent(...) { ... for_each_dpcm_fe(be, stream, dpcm) { ... => be_substream->runtime = fe_substream->runtime; break; } } This patch removes indirect copying. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/sound/soc-dpcm.h | 1 - sound/soc/soc-compress.c | 7 ------- sound/soc/soc-pcm.c | 10 ++++------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 1e7d09556fe3..4d6ac7699833 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -91,7 +91,6 @@ struct snd_soc_dpcm_runtime { struct list_head fe_clients; int users; - struct snd_pcm_runtime *runtime; struct snd_pcm_hw_params hw_params; /* state and update */ diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index e7aa6f360cab..554c329ec87f 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -134,8 +134,6 @@ static int soc_compr_open(struct snd_compr_stream *cstream) static int soc_compr_open_fe(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *fe = cstream->private_data; - struct snd_pcm_substream *fe_substream = - fe->pcm->streams[cstream->direction].substream; struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); struct snd_soc_dpcm *dpcm; struct snd_soc_dapm_widget_list *list; @@ -143,7 +141,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) int ret; mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME); - fe->dpcm[stream].runtime = fe_substream->runtime; ret = dpcm_path_get(fe, stream, &list); if (ret < 0) @@ -153,7 +150,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) /* calculate valid and active FE <-> BE dpcms */ dpcm_process_paths(fe, stream, &list, 1); - fe->dpcm[stream].runtime = fe_substream->runtime; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; @@ -164,7 +160,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; dpcm_be_disconnect(fe, stream); - fe->dpcm[stream].runtime = NULL; goto out; } @@ -236,8 +231,6 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) mutex_unlock(&fe->card->pcm_mutex); - fe->dpcm[stream].runtime = NULL; - snd_soc_link_compr_shutdown(cstream, 0); snd_soc_compr_components_free(cstream, 0); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 41a111586ac3..f6b5f72df65e 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1230,7 +1230,6 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe, dpcm->be = be; dpcm->fe = fe; - be->dpcm[stream].runtime = fe->dpcm[stream].runtime; dpcm->state = SND_SOC_DPCM_LINK_STATE_NEW; snd_soc_dpcm_stream_lock_irq(fe, stream); list_add(&dpcm->list_be, &fe->dpcm[stream].be_clients); @@ -1465,10 +1464,11 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, struct snd_soc_dapm_widget_list *list = *list_; struct snd_soc_pcm_runtime *be; struct snd_soc_dapm_widget *widget; + struct snd_pcm_substream *fe_substream = snd_soc_dpcm_get_substream(fe, stream); int i, new = 0, err; /* don't connect if FE is not running */ - if (!fe->dpcm[stream].runtime && !fe->fe_compr) + if (!fe_substream->runtime && !fe->fe_compr) return new; /* Create any new FE <--> BE connections */ @@ -1590,6 +1590,7 @@ void dpcm_be_dai_stop(struct snd_soc_pcm_runtime *fe, int stream, int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) { + struct snd_pcm_substream *fe_substream = snd_soc_dpcm_get_substream(fe, stream); struct snd_soc_pcm_runtime *be; struct snd_soc_dpcm *dpcm; int err, count = 0; @@ -1629,7 +1630,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) dev_dbg(be->dev, "ASoC: open %s BE %s\n", stream ? "capture" : "playback", be->dai_link->name); - be_substream->runtime = be->dpcm[stream].runtime; + be_substream->runtime = fe_substream->runtime; err = __soc_pcm_open(be, be_substream); if (err < 0) { be->dpcm[stream].users--; @@ -2693,8 +2694,6 @@ static void dpcm_fe_dai_cleanup(struct snd_pcm_substream *fe_substream) dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; dpcm_be_disconnect(fe, stream); - - fe->dpcm[stream].runtime = NULL; } static int dpcm_fe_dai_close(struct snd_pcm_substream *fe_substream) @@ -2719,7 +2718,6 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) int stream = fe_substream->stream; snd_soc_dpcm_mutex_lock(fe); - fe->dpcm[stream].runtime = fe_substream->runtime; ret = dpcm_path_get(fe, stream, &list); if (ret < 0) -- 2.25.1

2 1

[PATCH] ASoC: soc-dai.c: add missing flag check at snd_soc_pcm_dai_probe()
by Kuninori Morimoto 15 Mar '23

15 Mar '23

dai->probed is used at snd_soc_pcm_dai_probe/remove(), and used to call real remove() function only when it was probed. int snd_soc_pcm_dai_probe(...) { ... for_each_rtd_dais(rtd, i, dai) { ... if (dai->driver->probe) { (A) int ret = dai->driver->probe(dai); if (ret < 0) return soc_dai_ret(dai, ret); } => dai->probed = 1; } ... } int snd_soc_pcm_dai_remove(...) { ... for_each_rtd_dais(rtd, i, dai) { ... => if (dai->probed && ...) { ... } => dai->probed = 0; } ... } But on probe() case, we need to check dai->probed before calling real probe() function at (A), otherwise real probe() might be called multi times (but real remove() will be called only once). This patch checks it at probe(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-dai.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 0119afbd01fc..02dd64dea179 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -542,6 +542,9 @@ int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order) if (dai->driver->probe_order != order) continue; + if (dai->probed) + continue; + if (dai->driver->probe) { int ret = dai->driver->probe(dai); -- 2.25.1

2 1

[PATCH 0/2] ASoC: mt8192: Address spammy log messages
by Nícolas F. R. A. Prado 15 Mar '23

15 Mar '23

A couple commits to make the mt8192 sound driver not spam the console. Nícolas F. R. A. Prado (2): ASoC: mt8192: Remove function name log messages ASoC: mt8192: Move spammy messages to debug level sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 4 --- sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 6 +--- sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 28 +++++++++---------- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 12 ++++---- 4 files changed, 19 insertions(+), 31 deletions(-) -- 2.39.2

3 6

libasound.so.2 segmentation fault
by GitHub issues - opened 15 Mar '23

15 Mar '23

alsa-project/alsa-lib issue #306 was opened from zmzeeshan1: The problematic frame identified in the error message is _snd_pcm_adpcm_open, which is a function within the libasound.so.2 library. This function appears to be causing the segmentation fault. See below error 1. A fatal error has been detected by the Java Runtime Environment: # 2. SIGSEGV (0xb) at pc=0x28b931ea, pid=15187, tid=371194784 # 3. JRE version: 6.0_43-b01 4. Java VM: Java HotSpot(TM) Server VM (20.14-b01 mixed mode linux-x86 ) 5. Problematic frame: 6. C [libasound.so.2+0x521ea] _snd_pcm_adpcm_open+0x2e4 # 7. If you would like to submit a bug report, please visit: 8. [http://java.sun.com/webapps/bugreport/crash.jsp](https://urldefense.com/v3/… 9. The crash happened outside the Java Virtual Machine in native code. 10. See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x1fe2b000): JavaThread "Direct Clip" daemon [_thread_in_native, id=32499, stack(0x16138000,0x16200000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x00000008 Registers: EAX=0x4030a800, EBX=0x28be41b0, ECX=0x40306000, EDX=0x00000000 ESP=0x161feb60, EBP=0x161fec28, ESI=0x00000020, EDI=0x00000000 EIP=0x28b931ea, EFLAGS=0x00010206, CR2=0x00000008 Top of Stack: (sp=0x161feb60) 0x161feb60: f5400000 ffffffff 00100000 00000000 0x161feb70: 0806a900 00004092 00000001 161febb7 0x161feb80: abe85bc0 00004092 161feba8 b75f2a6c 0x161feb90: 08070e20 4ba67960 ffffff7d ffffffff 0x161feba0: 161febe0 080705e0 161febc8 b7560a65 0x161febb0: 00080000 00000000 b7a5fa88 b7a5fa88 0x161febc0: f5400000 ffffffff 161febf8 28b88c38 0x161febd0: 00000000 ffbbffca 40316002 4030a002 Instructions: (pc=0x28b931ea) 0x28b931ca: c7 45 a8 00 00 00 00 03 42 04 66 89 4d ac a8 07 0x28b931da: 0f 85 a4 05 00 00 8b 0a c1 e8 03 8b 55 0c 01 c8 0x28b931ea: 8b 4f 08 0f af d1 89 45 b4 03 57 04 f6 c2 07 0f 0x28b931fa: 85 85 05 00 00 c1 ea 03 8b 07 01 c2 f7 c6 07 00 Register to memory mapping: EAX=0x4030a800 is an unknown value EBX=0x28be41b0: <offset 0xa31b0> in /lib/libasound.so.2 at 0x28b41000 ECX=0x40306000 is an unknown value EDX=0x00000000 is an unknown value ESP=0x161feb60 is pointing into the stack for thread: 0x1fe2b000 EBP=0x161fec28 is pointing into the stack for thread: 0x1fe2b000 ESI=0x00000020 is an unknown value EDI=0x00000000 is an unknown value Stack: [0x16138000,0x16200000], sp=0x161feb60, free space=794k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libasound.so.2+0x521ea] _snd_pcm_adpcm_open+0x2e4 C [libasound.so.2+0x54f05] _snd_pcm_adpcm_open+0x2fff C [libasound.so.2+0x55046] _snd_pcm_adpcm_open+0x3140 C [libasound.so.2+0x3fedd] short+0x7a C [libasound.so.2+0x58dec] short+0xf7 C [libasound.so.2+0x403dd] short+0x1cd C [libasound.so.2+0x58fe2] short+0x6b C [libasound.so.2+0x392df] short+0x5c C [libjsoundalsa.so+0xa54a] DAUDIO_Write+0x4a C [libjsoundalsa.so+0x77ca] Java_com_sun_media_sound_DirectAudioDevice_nWrite+0x13a j com.sun.media.sound.DirectAudioDevice.nWrite(J[BIIIFF)I+0 j com.sun.media.sound.DirectAudioDevice.access$1800(J[BIIIFF)I+11 j com.sun.media.sound.DirectAudioDevice$DirectDL.write([BII)I+202 j com.sun.media.sound.DirectAudioDevice$DirectClip.run()V+163 j java.lang.Thread.run()V+11 v ~StubRoutines::call_stub V [libjvm.so+0x3e1d61] JavaCalls::call_helper(JavaValue*, methodHandle*, JavaCallArguments*, Thread*)+0x1c1 V [libjvm.so+0x5e3558] os::os_exception_wrapper(void [https://jira1.melb.tatm.thales:8443/images/icons/emoticons/star_yellow.png(…, methodHandle*, JavaCallArguments*, Thread*), JavaValue*, methodHandle*, JavaCallArguments*, Thread*)+0x18 V [libjvm.so+0x3e15d5] JavaCalls::call_virtual(JavaValue*, KlassHandle, symbolHandle, symbolHandle, JavaCallArguments*, Thread*)+0xc5 V [libjvm.so+0x3e1698] JavaCalls::call_virtual(JavaValue*, Handle, KlassHandle, symbolHandle, symbolHandle, Thread*)+0x58 V [libjvm.so+0x4660d7] thread_entry(JavaThread*, Thread*)+0xa7 V [libjvm.so+0x6e495f] JavaThread::run()+0x11f V [libjvm.so+0x5e4dae] java_start(Thread*)+0x14e C [libpthread.so.0+0x53cc] short+0xac Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j com.sun.media.sound.DirectAudioDevice.nWrite(J[BIIIFF)I+0 j com.sun.media.sound.DirectAudioDevice.access$1800(J[BIIIFF)I+11 j com.sun.media.sound.DirectAudioDevice$DirectDL.write([BII)I+202 j com.sun.media.sound.DirectAudioDevice$DirectClip.run()V+163 j java.lang.Thread.run()V+11 v ~StubRoutines::call_stub The version of ALSA installed is alsa-lib-1.0.6-5.RHEL4.i386.rpm 28-Aug-2006 15:26 302K alsa-lib-devel-1.0.6-5.RHEL4.i386.rpm 28-Aug-2006 15:26 807K alsa-utils-1.0.6-10.i386.rpm 02-Oct-2009 15:54 125K Issue URL : https://github.com/alsa-project/alsa-lib/issues/306 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 0/2] ASOC: Intel: add quirk for Intel 'Rooks County' NUC M15
by Bard Liao 14 Mar '23

14 Mar '23

Adding Intel 'Rooks County' NUC M15 support. To support 'Rooks County', we also need the "soundwire: dmi-quirks: add remapping for Intel 'Rooks County'" patch. Eugene Huang (2): ASOC: Intel: sof_sdw: add quirk for Intel 'Rooks County' NUC M15 ASoC: Intel: soc-acpi: add table for Intel 'Rooks County' NUC M15 sound/soc/intel/boards/sof_sdw.c | 11 ++++++++++ .../intel/common/soc-acpi-intel-adl-match.c | 20 +++++++++++++++++++ 2 files changed, 31 insertions(+) -- 2.25.1

2 3

[PATCH] ALSA: hda/ca0132: fixup buffer overrun at tuning_ctl_set()
by Kuninori Morimoto 14 Mar '23

14 Mar '23

tuning_ctl_set() might have buffer overrun at (X) if it didn't break from loop by matching (A). static int tuning_ctl_set(...) { for (i = 0; i < TUNING_CTLS_COUNT; i++) (A) if (nid == ca0132_tuning_ctls[i].nid) break; snd_hda_power_up(...); (X) dspio_set_param(..., ca0132_tuning_ctls[i].mid, ...); snd_hda_power_down(...); ^ return 1; } We will get below error by cppcheck sound/pci/hda/patch_ca0132.c:4229:2: note: After for loop, i has value 12 for (i = 0; i < TUNING_CTLS_COUNT; i++) ^ sound/pci/hda/patch_ca0132.c:4234:43: note: Array index out of bounds dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20, ^ This patch cares non match case. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/pci/hda/patch_ca0132.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 0a292bf271f2..5ce4b5f62983 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -4228,8 +4228,10 @@ static int tuning_ctl_set(struct hda_codec *codec, hda_nid_t nid, for (i = 0; i < TUNING_CTLS_COUNT; i++) if (nid == ca0132_tuning_ctls[i].nid) - break; + goto found; + return -EINVAL; +found: snd_hda_power_up(codec); dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20, ca0132_tuning_ctls[i].req, -- 2.25.1

2 1

[PATCH] ALSA: asihpi: check pao in control_message()
by Kuninori Morimoto 14 Mar '23

14 Mar '23

control_message() might be called with pao = NULL. Here indicates control_message() as sample. (B) static void control_message(struct hpi_adapter_obj *pao, ...) { ^^^ struct hpi_hw_obj *phw = pao->priv; ... ^^^ } (A) void _HPI_6205(struct hpi_adapter_obj *pao, ...) { ^^^ ... case HPI_OBJ_CONTROL: (B) control_message(pao, phm, phr); break; ^^^ ... } void HPI_6205(...) { ... (A) _HPI_6205(NULL, phm, phr); ... ^^^^ } Therefore, We will get too many warning via cppcheck, like below sound/pci/asihpi/hpi6205.c:238:27: warning: Possible null pointer dereference: pao [nullPointer] struct hpi_hw_obj *phw = pao->priv; ^ sound/pci/asihpi/hpi6205.c:433:13: note: Calling function '_HPI_6205', 1st argument 'NULL' value is 0 _HPI_6205(NULL, phm, phr); ^ sound/pci/asihpi/hpi6205.c:401:20: note: Calling function 'control_message', 1st argument 'pao' value is 0 control_message(pao, phm, phr); ^ Set phr->error like many functions doing, and don't call _HPI_6205() with NULL. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/pci/asihpi/hpi6205.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c index 27e11b5f70b9..c7d7eff86727 100644 --- a/sound/pci/asihpi/hpi6205.c +++ b/sound/pci/asihpi/hpi6205.c @@ -430,7 +430,7 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr) pao = hpi_find_adapter(phm->adapter_index); } else { /* subsys messages don't address an adapter */ - _HPI_6205(NULL, phm, phr); + phr->error = HPI_ERROR_INVALID_OBJ_INDEX; return; } -- 2.25.1

2 1

[PATCH] sound: usb: remove Wireless USB dead code
by Ruslan Bilovol 14 Mar '23

14 Mar '23

Wireless USB host controller support has been removed from Linux Kernel more than 3 years ago in commit caa6772db4c1 ("Staging: remove wusbcore and UWB from the kernel tree."), and the associated code in the snd-usb-audio driver became unused and untested. If in the future somebody will return WUSB/UWB support back to the kernel, the snd-usb-audio driver will reject Wireless USB audio devices at probe stage, and this patch should be reverted. Signed-off-by: Ruslan Bilovol <ruslan.bilovol(a)gmail.com> --- sound/usb/card.c | 1 - sound/usb/endpoint.c | 16 +--------------- sound/usb/helper.c | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 26268ffb8274..f6e99ced8068 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -609,7 +609,6 @@ static int snd_usb_audio_create(struct usb_interface *intf, case USB_SPEED_LOW: case USB_SPEED_FULL: case USB_SPEED_HIGH: - case USB_SPEED_WIRELESS: case USB_SPEED_SUPER: case USB_SPEED_SUPER_PLUS: break; diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 419302e2057e..1e0af1179ca8 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1173,22 +1173,8 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep) */ if (usb_pipein(ep->pipe) || ep->implicit_fb_sync) { - urb_packs = packs_per_ms; - /* - * Wireless devices can poll at a max rate of once per 4ms. - * For dataintervals less than 5, increase the packet count to - * allow the host controller to use bursting to fill in the - * gaps. - */ - if (snd_usb_get_speed(chip->dev) == USB_SPEED_WIRELESS) { - int interval = ep->datainterval; - while (interval < 5) { - urb_packs <<= 1; - ++interval; - } - } /* make capture URBs <= 1 ms and smaller than a period */ - urb_packs = min(max_packs_per_urb, urb_packs); + urb_packs = min(max_packs_per_urb, packs_per_ms); while (urb_packs > 1 && urb_packs * maxsize >= ep->cur_period_bytes) urb_packs >>= 1; ep->nurbs = MAX_URBS; diff --git a/sound/usb/helper.c b/sound/usb/helper.c index a4410267bf70..bf80e55d013a 100644 --- a/sound/usb/helper.c +++ b/sound/usb/helper.c @@ -108,7 +108,6 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip, { switch (snd_usb_get_speed(chip->dev)) { case USB_SPEED_HIGH: - case USB_SPEED_WIRELESS: case USB_SPEED_SUPER: case USB_SPEED_SUPER_PLUS: if (get_endpoint(alts, 0)->bInterval >= 1 && -- 2.39.2

2 1