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

[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

[PATCH] ASoC: soc-pcm: fix hw->formats cleared by soc_pcm_hw_init() for dpcm
by Shengjiu Wang 14 Mar '23

14 Mar '23

The hw->formats may be set by snd_dmaengine_pcm_refine_runtime_hwparams() in component's startup()/open(), but soc_pcm_hw_init() will init hw->formats in dpcm_runtime_setup_fe() after component's startup()/open(), which causes the valuable hw->formats to be cleared. So need to store the hw->formats before initialization, then restore it after initialization. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/soc-pcm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5eb056b942ce..7958c9defd49 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1661,10 +1661,14 @@ static void dpcm_runtime_setup_fe(struct snd_pcm_substream *substream) struct snd_pcm_hardware *hw = &runtime->hw; struct snd_soc_dai *dai; int stream = substream->stream; + u64 formats = hw->formats; int i; soc_pcm_hw_init(hw); + if (formats) + hw->formats &= formats; + for_each_rtd_cpu_dais(fe, i, dai) { struct snd_soc_pcm_stream *cpu_stream; -- 2.34.1

4 4

[PATCH v1] ASoC: Intel: sof_rt5682: Enable Bluetooth offload on adl_rt1019_rt5682
by Ajye Huang 14 Mar '23

14 Mar '23

Enable Bluetooth audio offload for drv_name "adl_rt1019_rt5682" with following board configuration specifically: SSP0 - rt5682 Headset SSP1 - alc1019p speaker amp SSP2 - Bluetooth audio Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- sound/soc/intel/boards/sof_rt5682.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 4fe448295a90..2eec32846078 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1109,7 +1109,9 @@ static const struct platform_device_id board_ids[] = { SOF_SPEAKER_AMP_PRESENT | SOF_RT1019_SPEAKER_AMP_PRESENT | SOF_RT5682_SSP_AMP(1) | - SOF_RT5682_NUM_HDMIDEV(4)), + SOF_RT5682_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), }, { .name = "mtl_mx98357_rt5682", -- 2.25.1

3 6

[PATCH 00/11] ASoC: SOF: ipc4: Add support for formats per pins
by Peter Ujfalusi 14 Mar '23

14 Mar '23

Hi, The modules in IPC4 can have multiple 'pins' on their input and output and these pins can receive or output audio in different formats. Currently we assume that all pins are using the same format which is a limitation that needs to be lifted in order to support more complex components. This series will extend and rework the format handling to allow different formats on pins. Regards, Peter --- Ranjani Sridharan (11): ASoC: SOF: rename a couple of tokens ASoC: SOF: Use input/output pin consistently ASoC: SOF: ipc4-topology: Add a new field in struct sof_ipc4_available_audio_format ASoC: SOF: ipc4-topology: Do not parse the DMA_BUFFER_SIZE token ASoC: SOF: ipc4-topology: Parse the SOF_COMP_TOKENS only once ASoC: SOF: ipc4-topology: Always parse the output formats in topology ASoC: SOF: ipc4-topology: Modify the type of available input/output formats ASoC: SOF: ipc4-topology: Modify the signature of sof_ipc4_init_audio_fmt() ASoC: SOF: ipc4-topology: Remove the ref_audio_fmt field ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format count ASoC: SOF: ipc4-topology: Search only pin 0 formats include/uapi/sound/sof/tokens.h | 20 +- sound/soc/sof/ipc4-pcm.c | 2 +- sound/soc/sof/ipc4-topology.c | 529 +++++++++++++++----------------- sound/soc/sof/ipc4-topology.h | 36 ++- sound/soc/sof/sof-audio.h | 35 +-- sound/soc/sof/topology.c | 124 ++++---- 6 files changed, 371 insertions(+), 375 deletions(-) -- 2.39.2

2 12

[PATCH 0/7] ASoC: SOF: ipc4: Add support for bytes control
by Peter Ujfalusi 14 Mar '23

14 Mar '23

Hi, This series will add support for bytes control and topology types. With IPC4 only the binary payload is sent to the firmware via LARGE_CONFIG message (which does similar multi-part message handling as the IPC3 control message did). The bytes payload itself is not checked by the kernel but user space expected to wrap it in sof_abi_hdr struct in order to get the target information of the binary data. The SOF firmware and sof-ctl have been updated to support blobs used in IPC4 setups. Regards, Peter --- Libin Yang (2): ASoC: SOF: ipc4-control: set_volume_data only applies to VOLSW family ASoC: SOF: ipc4-topology: Add support for TPLG_CTL_BYTES Peter Ujfalusi (5): ASoC: SOF: ipc3-control: Rename snd_sof_refresh_control() ASoC: SOF: ipc3-control: Merge functions to handle bytes_ext get variants ASoC: SOF: uapi: header: Convert sof_abi_hdr comments to kernel style ASoC: SOF: uapi: header: Update sof_abi_hdr doc for IPC4 use ASoC: SOF: ipc4-control: Add support for bytes control get and put include/uapi/sound/sof/abi.h | 2 + include/uapi/sound/sof/header.h | 27 +++- sound/soc/sof/ipc3-control.c | 90 ++++------- sound/soc/sof/ipc4-control.c | 260 +++++++++++++++++++++++++++++++- sound/soc/sof/ipc4-topology.c | 67 ++++++++ 5 files changed, 368 insertions(+), 78 deletions(-) -- 2.39.2

2 8

dpcm_be_connect: FE is atomic but BE is nonatomic, invalid configuration
by Daniel Baluta 14 Mar '23

14 Mar '23

Hi Morimoto-san, I would like to know your take on the following issue. On I.MX with SOF we use simple-card and hit the following error: sai1-wm8960-hifi: dpcm_be_connect: FE is atomic but BE is nonatomic, invalid configuration and I think it makes sense to have the BE nonatomic as set by SOF core. In order to fix this, we need to make FE nonatomic too. But FE is handled by simple-card and it doesn't set .nonatomic field leaving it as default (.nonatomic = 0). How do you think we can update this field? Would a DT property be good enough? thanks, Daniel.

2 2

Tegra: add UCM configuration for RT5631, WM8903 and MAX98089 based devices
by GitHub pull_request - edited 14 Mar '23

14 Mar '23

alsa-project/alsa-ucm-conf pull request #291 was edited from clamor-s: Proposed UCM configurations were tested for a while on wide range of devices. Did not cause any issues so far. List of supported devices using RT5631: - ASUS TF201 - ASUS TF300TG - ASUS TF300TL - ASUS TF700T using WM8903: - ASUS TF101 - ASUS SL101 - ASUS TF300T using MAX98089 - LG P880 - LG P895 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/291 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/291.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Tegra: add UCM configuration for RT5631, WM8903 and MAX98089 based devices
by GitHub pull_request - edited 14 Mar '23

14 Mar '23

alsa-project/alsa-ucm-conf pull request #291 was edited from clamor-s: Proposed UCM configurations were tested for a while on wide range of devices. Did not cause any issues so far. List of supported devices using RT5631: - ASUS TF201 - ASUS TF300TG - ASUS TF300TL - ASUS TF700T using WM8903: - ASUS TF101 - ASUS TF300T using MAX98089 - LG P880 - LG P895 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/291 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/291.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0