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

[PATCH v1] Asoc: dt_bindings: Add tas2781 yaml
by Kevin Lu 15 Jan '23

15 Jan '23

Complete the DTS for tas2781 Signed-off-by: Kevin Lu <luminlong(a)139.com> --- .../devicetree/bindings/sound/ti,tas2781.yaml | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,tas2781.yaml diff --git a/Documentation/devicetree/bindings/sound/ti,tas2781.yaml b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml new file mode 100644 index 0000000..7d73f46 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ti,tas2781.yaml @@ -0,0 +1,122 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/ti,tas2781.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Texas Instruments TAS2781 Smart PA + +maintainers: + - Shenghao Ding <shenghao-ding(a)ti.com> + - Kevin Lu <kevin-lu(a)ti.com> + +description: | + The TAS2781 is a mono, digital input Class-D audio amplifier + optimized for efficiently driving high peak power into small + loudspeakers. Integrated an on-chip DSP supports Texas Instruments + Smart Amp speaker protection algorithm. The integrated speaker + voltage and current sense provides for real time + monitoring of loudspeaker behavior. + +properties: + compatible: + enum: + - ti,tas2781 + + reg: + maxItems: 1 + description: | + I2C address of the device can be in range from 0x38 to 0x40. + + ti,audio-slots: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 4 + description: | + This item is used to store the i2c address of the device + for deifferent audio slots. It is not required for Mono case. + + ti,global-addr: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + This item is used to store the generic i2c address of + all the tas2781 devices for I2C broadcast during the multi-device + writes, useless in mono case. + + ti,reset-gpios: + minItems: 1 + maxItems: 4 + description: GPIO specifier for the reset pin. + + ti,irq-gpio: + maxItems: 1 + description: GPIO used to interrupts the device. + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + /* example with mono support */ + #address-cells = <1>; + #size-cells = <0>; + mono: codec@38 { + compatible = "ti,tas2781"; + reg = <0x38>; + #sound-dai-cells = <1>; + ti,reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + ti,irq-gpio = <&gpio1 15 0>; + }; + }; + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + /* Stereo without irq-gpio and global-addr */ + #address-cells = <1>; + #size-cells = <0>; + stereo: codec@38 { + compatible = "ti,tas2781"; + reg = <0x38>; + #sound-dai-cells = <1>; + ti,audio-slots = < 0x38 /* left-channel */ + 0x39 /* right-channel */ + >; + ti,reset-gpios = < &gpio1 10 GPIO_ACTIVE_HIGH + &gpio1 11 GPIO_ACTIVE_HIGH + >; + }; + }; + - | + #include <dt-bindings/gpio/gpio.h> + i2c { + /* example with quad support, such as tablet or pad device */ + #address-cells = <1>; + #size-cells = <0>; + quad: codec@38 { + compatible = "ti,tas2781"; + reg = <0x38>; + #sound-dai-cells = <1>; + ti,audio-slots = < 0x38 /* topleft-channel */ + 0x39 /* topright-channel */ + 0x3a /* bottomleft-channel */ + 0x3b /* bottomright-channel */ + >; + ti,global-addr = <0x40>; + ti,reset-gpios = < &gpio1 10 GPIO_ACTIVE_HIGH + &gpio1 11 GPIO_ACTIVE_HIGH + &gpio1 12 GPIO_ACTIVE_HIGH + &gpio1 13 GPIO_ACTIVE_HIGH + >; + ti,irq-gpio = <&gpio1 15 0>; + }; + }; +... -- 2.34.1

2 1

[PATCH] ASoC: codec: rt5640: Resolve failure to set DMIC clock after playback
by Jarrah Gosbell 14 Jan '23

14 Jan '23

From: Ondrej Jirman <megi(a)xff.cz> rt5640_set_dai_sysclk is called with freq == 0 when playback stops. This causes DMIC setup code to fail. I2S interface doesn't need to be active for codec to work, so don't clear rt5640->sysclk after rt5640_set_dai_sysclk is called with freq == 0. Signed-off-by: Ondrej Jirman <megi(a)xff.cz> Signed-off-by: Jarrah Gosbell <kernel(a)undef.tools> --- sound/soc/codecs/rt5640.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 18e01949f20e..054de41ceccb 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1839,6 +1839,9 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai, unsigned int reg_val = 0; unsigned int pll_bit = 0; + if (freq == 0) + return 0; + switch (clk_id) { case RT5640_SCLK_S_MCLK: reg_val |= RT5640_SCLK_SRC_MCLK; -- 2.39.0

2 1

[PATCH 0/5] soundwire: better error handling in deferred transfers
by Bard Liao 13 Jan '23

13 Jan '23

This is a generic cleanup series. Pierre-Louis Bossart (5): soundwire: stream: uniquify dev_err() logs soundwire: stream: use consistent pattern for freeing buffers soundwire: bus: remove sdw_defer argument in sdw_transfer_defer() soundwire: cadence: use directly bus sdw_defer structure soundwire: cadence: further simplify low-level xfer_msg_defer() callback drivers/soundwire/bus.c | 12 +++++------- drivers/soundwire/bus.h | 3 +-- drivers/soundwire/cadence_master.c | 20 ++++++++++---------- drivers/soundwire/cadence_master.h | 5 +---- drivers/soundwire/stream.c | 22 ++++++++++++---------- include/linux/soundwire/sdw.h | 6 +++--- 6 files changed, 32 insertions(+), 36 deletions(-) -- 2.25.1

3 7

[linux-next:master] BUILD REGRESSION 6b31ffe9c8b9947d6d3552d6e10752fd96d0f80f
by kernel test robot 13 Jan '23

13 Jan '23

tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master branch HEAD: 6b31ffe9c8b9947d6d3552d6e10752fd96d0f80f Add linux-next specific files for 20230113 Error/Warning: (recently discovered and may have been fixed) aarch64-linux-ld: ID map text too big or misaligned arch/arm/kernel/entry-armv.S:485:5: warning: "CONFIG_ARM_THUMB" is not defined, evaluates to 0 [-Wundef] drivers/gpu/drm/ttm/ttm_bo_util.c:364:32: error: implicit declaration of function 'vmap'; did you mean 'kmap'? [-Werror=implicit-function-declaration] drivers/gpu/drm/ttm/ttm_bo_util.c:429:17: error: implicit declaration of function 'vunmap'; did you mean 'kunmap'? [-Werror=implicit-function-declaration] Unverified Error/Warning (likely false positive, please contact us if interested): drivers/nvmem/layouts/sl28vpd.c:143:21: sparse: sparse: symbol 'sl28vpd_layout' was not declared. Should it be static? drivers/scsi/qla2xxx/qla_mid.c:1189:6: sparse: sparse: symbol 'qla_trim_buf' was not declared. Should it be static? drivers/scsi/qla2xxx/qla_mid.c:1221:6: sparse: sparse: symbol '__qla_adjust_buf' was not declared. Should it be static? sound/ac97/bus.c:465:1: sparse: sparse: symbol 'dev_attr_vendor_id' was not declared. Should it be static? Error/Warning ids grouped by kconfigs: gcc_recent_errors |-- arm-buildonly-randconfig-r003-20230113 | `-- arch-arm-kernel-entry-armv.S:warning:CONFIG_ARM_THUMB-is-not-defined-evaluates-to |-- arm64-allyesconfig | `-- aarch64-linux-ld:ID-map-text-too-big-or-misaligned |-- microblaze-randconfig-s041-20230112 | |-- drivers-nvmem-layouts-sl28vpd.c:sparse:sparse:symbol-sl28vpd_layout-was-not-declared.-Should-it-be-static | `-- sound-ac97-bus.c:sparse:sparse:symbol-dev_attr_vendor_id-was-not-declared.-Should-it-be-static |-- microblaze-randconfig-s043-20230112 | |-- drivers-scsi-qla2xxx-qla_mid.c:sparse:sparse:symbol-__qla_adjust_buf-was-not-declared.-Should-it-be-static | `-- drivers-scsi-qla2xxx-qla_mid.c:sparse:sparse:symbol-qla_trim_buf-was-not-declared.-Should-it-be-static |-- mips-allyesconfig | |-- drivers-gpu-drm-ttm-ttm_bo_util.c:error:implicit-declaration-of-function-vmap | `-- drivers-gpu-drm-ttm-ttm_bo_util.c:error:implicit-declaration-of-function-vunmap `-- mips-randconfig-r012-20230113 |-- drivers-gpu-drm-ttm-ttm_bo_util.c:error:implicit-declaration-of-function-vmap `-- drivers-gpu-drm-ttm-ttm_bo_util.c:error:implicit-declaration-of-function-vunmap elapsed time: 725m configs tested: 68 configs skipped: 2 gcc tested configs: x86_64 allnoconfig um i386_defconfig um x86_64_defconfig powerpc allnoconfig x86_64 rhel-8.3-func x86_64 rhel-8.3-kselftests arc defconfig s390 allmodconfig alpha defconfig s390 defconfig sh allmodconfig x86_64 defconfig mips allyesconfig x86_64 rhel-8.3 s390 allyesconfig powerpc allmodconfig arc randconfig-r043-20230112 arm defconfig x86_64 allyesconfig i386 defconfig ia64 allmodconfig i386 randconfig-a001 x86_64 rhel-8.3-bpf i386 randconfig-a003 riscv randconfig-r042-20230112 s390 randconfig-r044-20230112 x86_64 randconfig-a013 i386 randconfig-a005 arm64 allyesconfig x86_64 randconfig-a011 i386 randconfig-a014 x86_64 randconfig-a002 arm allyesconfig i386 randconfig-a012 x86_64 randconfig-a015 i386 randconfig-a016 x86_64 randconfig-a006 i386 allyesconfig x86_64 randconfig-a004 sh urquell_defconfig sh magicpanelr2_defconfig xtensa common_defconfig m68k allyesconfig m68k allmodconfig alpha allyesconfig arc allyesconfig x86_64 rhel-8.3-syz x86_64 rhel-8.3-kunit x86_64 rhel-8.3-kvm clang tested configs: x86_64 rhel-8.3-rust arm randconfig-r046-20230112 hexagon randconfig-r041-20230112 hexagon randconfig-r045-20230112 i386 randconfig-a002 x86_64 randconfig-a014 i386 randconfig-a013 i386 randconfig-a006 i386 randconfig-a011 x86_64 randconfig-a012 x86_64 randconfig-a001 i386 randconfig-a015 i386 randconfig-a004 x86_64 randconfig-a016 x86_64 randconfig-a003 x86_64 randconfig-a005 mips rbtx49xx_defconfig s390 alldefconfig powerpc walnut_defconfig -- 0-DAY CI Kernel Test Service https://01.org/lkp

1 0

[PATCH 5.10.y] ALSA: pcm: Properly take rwsem lock in ctl_elem_read_user/ctl_elem_write_user to prevent UAF
by Takashi Iwai 13 Jan '23

13 Jan '23

From: Clement Lecigne <clecigne(a)google.com> [ Note: this is a fix that works around the bug equivalently as the two upstream commits: 1fa4445f9adf ("ALSA: control - introduce snd_ctl_notify_one() helper") 56b88b50565c ("ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF") but in a simpler way to fit with older stable trees -- tiwai ] Add missing locking in ctl_elem_read_user/ctl_elem_write_user which can be easily triggered and turned into an use-after-free. Example code paths with SNDRV_CTL_IOCTL_ELEM_READ: 64-bits: snd_ctl_ioctl snd_ctl_elem_read_user [takes controls_rwsem] snd_ctl_elem_read [lock properly held, all good] [drops controls_rwsem] 32-bits (compat): snd_ctl_ioctl_compat snd_ctl_elem_write_read_compat ctl_elem_write_read snd_ctl_elem_read [missing lock, not good] CVE-2023-0266 was assigned for this issue. Signed-off-by: Clement Lecigne <clecigne(a)google.com> Cc: stable(a)kernel.org # 5.12 and older Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Greg, this is a patch for the last ALSA PCM UCM fix for the older stable trees. Please take this to 5.10.y and older stable trees. Thanks! sound/core/control_compat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index 97467f6a32a1..980ab3580f1b 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -304,7 +304,9 @@ static int ctl_elem_read_user(struct snd_card *card, err = snd_power_wait(card, SNDRV_CTL_POWER_D0); if (err < 0) goto error; + down_read(&card->controls_rwsem); err = snd_ctl_elem_read(card, data); + up_read(&card->controls_rwsem); if (err < 0) goto error; err = copy_ctl_value_to_user(userdata, valuep, data, type, count); @@ -332,7 +334,9 @@ static int ctl_elem_write_user(struct snd_ctl_file *file, err = snd_power_wait(card, SNDRV_CTL_POWER_D0); if (err < 0) goto error; + down_write(&card->controls_rwsem); err = snd_ctl_elem_write(card, file, data); + up_write(&card->controls_rwsem); if (err < 0) goto error; err = copy_ctl_value_to_user(userdata, valuep, data, type, count); -- 2.35.3

3 2

[PATCH 1/2] ASoC: Intel: avs: Use asoc_substream_to_rtd() to obtain rtd
by Amadeusz Sławiński 13 Jan '23

13 Jan '23

From: Cezary Rojewski <cezary.rojewski(a)intel.com> Utilize the helper function instead of casting from ->private_data or snd_pcm_substream_chip() directly. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- sound/soc/intel/avs/boards/rt286.c | 2 +- sound/soc/intel/avs/boards/rt298.c | 2 +- sound/soc/intel/avs/pcm.c | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index 8447b37a2a41..3551a05bd599 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -98,7 +98,7 @@ static int avs_rt286_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pc static int avs_rt286_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *runtime = substream->private_data; + struct snd_soc_pcm_runtime *runtime = asoc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0); int ret; diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index bd25f0fde35e..2923f3805bbe 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -109,7 +109,7 @@ static int avs_rt298_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pc static int avs_rt298_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); unsigned int clk_freq; int ret; diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index f930c5e86a84..c4376c9c35ef 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -60,7 +60,7 @@ avs_dai_find_path_template(struct snd_soc_dai *dai, bool is_fe, int direction) static int avs_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai, bool is_fe, const struct snd_soc_dai_ops *ops) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct avs_dev *adev = to_avs_dev(dai->dev); struct avs_tplg_path_template *template; struct avs_dma_data *data; @@ -169,7 +169,7 @@ static int avs_dai_nonhda_be_startup(struct snd_pcm_substream *substream, struct static void avs_dai_nonhda_be_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct avs_dev *adev = to_avs_dev(dai->dev); struct avs_dma_data *data; @@ -218,7 +218,7 @@ static int avs_dai_nonhda_be_prepare(struct snd_pcm_substream *substream, struct static int avs_dai_nonhda_be_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct avs_dma_data *data; int ret = 0; @@ -305,7 +305,7 @@ static int avs_dai_hda_be_hw_params(struct snd_pcm_substream *substream, static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct avs_dma_data *data; - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; struct hdac_ext_link *link; struct hda_codec *codec; @@ -335,7 +335,7 @@ static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct sn static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct hdac_ext_stream *link_stream = runtime->private_data; struct hdac_ext_link *link; @@ -374,7 +374,7 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct sn static int avs_dai_hda_be_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; struct avs_dma_data *data; int ret = 0; @@ -489,7 +489,7 @@ static int avs_dai_fe_startup(struct snd_pcm_substream *substream, struct snd_so static void avs_dai_fe_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct avs_dev *adev = to_avs_dev(dai->dev); struct avs_dma_data *data; @@ -628,7 +628,7 @@ static int avs_dai_fe_prepare(struct snd_pcm_substream *substream, struct snd_so static int avs_dai_fe_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct avs_dma_data *data; struct hdac_ext_stream *host_stream; struct hdac_bus *bus; @@ -836,7 +836,7 @@ static int avs_dai_resume_hw_params(struct snd_soc_dai *dai, struct avs_dma_data int ret; substream = data->substream; - rtd = snd_pcm_substream_chip(substream); + rtd = asoc_substream_to_rtd(substream); ret = dai->driver->ops->hw_params(substream, &rtd->dpcm[substream->stream].hw_params, dai); if (ret) @@ -931,7 +931,7 @@ static int avs_component_pm_op(struct snd_soc_component *component, bool be, for_each_component_dais(component, dai) { data = dai->playback_dma_data; if (data) { - rtd = snd_pcm_substream_chip(data->substream); + rtd = asoc_substream_to_rtd(data->substream); if (rtd->dai_link->no_pcm == be && !rtd->dai_link->ignore_suspend) { ret = op(dai, data); if (ret < 0) { @@ -944,7 +944,7 @@ static int avs_component_pm_op(struct snd_soc_component *component, bool be, data = dai->capture_dma_data; if (data) { - rtd = snd_pcm_substream_chip(data->substream); + rtd = asoc_substream_to_rtd(data->substream); if (rtd->dai_link->no_pcm == be && !rtd->dai_link->ignore_suspend) { ret = op(dai, data); if (ret < 0) { @@ -1048,7 +1048,7 @@ static const struct snd_pcm_hardware avs_pcm_hardware = { static int avs_component_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); /* only FE DAI links are handled here */ if (rtd->dai_link->no_pcm) @@ -1066,7 +1066,7 @@ static unsigned int avs_hda_stream_dpib_read(struct hdac_ext_stream *stream) static snd_pcm_uframes_t avs_component_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct avs_dma_data *data; struct hdac_ext_stream *host_stream; unsigned int pos; @@ -1394,7 +1394,7 @@ static void avs_component_hda_remove(struct snd_soc_component *component) static int avs_component_hda_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; struct hda_codec *codec; @@ -1441,7 +1441,7 @@ static int avs_component_hda_open(struct snd_soc_component *component, static int avs_component_hda_close(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream); + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct hdac_ext_stream *link_stream; /* only BE DAI links are handled here */ -- 2.25.1

2 3

[PATCH 0/3] Fixes for avs driver
by Amadeusz Sławiński 13 Jan '23

13 Jan '23

First patch fixes problems reported when performing shutdown. Second one is for a problem reported by LKP. Last one fixes problem reported by checkpatch. Amadeusz Sławiński (3): ASoC: Intel: avs: Implement PCI shutdown ASoC: Intel: avs: Correctly access topology fiels ASoC: Intel: avs: Use min_t instead of min with cast sound/soc/intel/avs/core.c | 24 ++++++++++++++++++++++++ sound/soc/intel/avs/topology.c | 2 +- sound/soc/intel/avs/trace.c | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) -- 2.25.1

3 5

[PATCH 0/3] Add the Renesas IDT821034 codec support
by Herve Codina 13 Jan '23

13 Jan '23

Hi, The Renesas IDT821034 codec is four channel PCM codec with on-chip filters and programmable gain setting. It also provides SLIC (Subscriber Line Interface Circuit) signals as GPIOs. Best regards, Herve Codina Herve Codina (3): dt-bindings: sound: Add Renesas IDT821034 codec ASoC: codecs: Add support for the Renesas IDT821034 codec MAINTAINERS: add the Renesas IDT821034 codec entry .../bindings/sound/renesas,idt821034.yaml | 97 ++ MAINTAINERS | 7 + sound/soc/codecs/Kconfig | 12 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/idt821034.c | 1234 +++++++++++++++++ 5 files changed, 1352 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/renesas,idt821034.yaml create mode 100644 sound/soc/codecs/idt821034.c -- 2.38.1

3 11

[bug report] ALSA: firewire-lib: extend tracepoints event including CYCLE_TIME of 1394 OHCI
by Dan Carpenter 13 Jan '23

13 Jan '23

Hello Takashi Sakamoto, The patch fef4e61b0b76: "ALSA: firewire-lib: extend tracepoints event including CYCLE_TIME of 1394 OHCI" from Jan 10, 2023, leads to the following Smatch static checker warning: sound/firewire/amdtp-stream.c:944 generate_tx_packet_descs() error: uninitialized symbol 'curr_cycle_time'. sound/firewire/amdtp-stream.c:1099 process_rx_packets() error: uninitialized symbol 'curr_cycle_time'. sound/firewire/amdtp-stream.c 1047 static void process_rx_packets(struct fw_iso_context *context, u32 tstamp, size_t header_length, 1048 void *header, void *private_data) 1049 { 1050 struct amdtp_stream *s = private_data; 1051 const struct amdtp_domain *d = s->domain; 1052 const __be32 *ctx_header = header; 1053 const unsigned int events_per_period = d->events_per_period; 1054 unsigned int event_count = s->ctx_data.rx.event_count; 1055 struct pkt_desc *desc = s->packet_descs_cursor; 1056 unsigned int pkt_header_length; 1057 unsigned int packets; 1058 u32 curr_cycle_time; ^^^^^^^^^^^^^^^^^^^ 1059 bool need_hw_irq; 1060 int i; 1061 1062 if (s->packet_index < 0) 1063 return; 1064 1065 // Calculate the number of packets in buffer and check XRUN. 1066 packets = header_length / sizeof(*ctx_header); 1067 1068 generate_rx_packet_descs(s, desc, ctx_header, packets); 1069 1070 process_ctx_payloads(s, desc, packets); 1071 1072 if (!(s->flags & CIP_NO_HEADER)) 1073 pkt_header_length = IT_PKT_HEADER_SIZE_CIP; 1074 else 1075 pkt_header_length = 0; 1076 1077 if (s == d->irq_target) { 1078 // At NO_PERIOD_WAKEUP mode, the packets for all IT/IR contexts are processed by 1079 // the tasks of user process operating ALSA PCM character device by calling ioctl(2) 1080 // with some requests, instead of scheduled hardware IRQ of an IT context. 1081 struct snd_pcm_substream *pcm = READ_ONCE(s->pcm); 1082 need_hw_irq = !pcm || !pcm->runtime->no_period_wakeup; 1083 } else { 1084 need_hw_irq = false; 1085 } 1086 1087 if (trace_amdtp_packet_enabled()) 1088 (void)fw_card_read_cycle_time(fw_parent_device(s->unit)->card, &curr_cycle_time); No error checking and no else path. 1089 1090 for (i = 0; i < packets; ++i) { 1091 struct { 1092 struct fw_iso_packet params; 1093 __be32 header[CIP_HEADER_QUADLETS]; 1094 } template = { {0}, {0} }; 1095 bool sched_irq = false; 1096 1097 build_it_pkt_header(s, desc->cycle, &template.params, pkt_header_length, 1098 desc->data_blocks, desc->data_block_counter, --> 1099 desc->syt, i, curr_cycle_time); ^^^^^^^^^^^^^^^ Uninitialized. 1100 1101 if (s == s->domain->irq_target) { 1102 event_count += desc->data_blocks; 1103 if (event_count >= events_per_period) { 1104 event_count -= events_per_period; 1105 sched_irq = need_hw_irq; 1106 } 1107 } 1108 1109 if (queue_out_packet(s, &template.params, sched_irq) < 0) { 1110 cancel_stream(s); 1111 return; 1112 } 1113 1114 desc = amdtp_stream_next_packet_desc(s, desc); 1115 } 1116 1117 s->ctx_data.rx.event_count = event_count; 1118 s->packet_descs_cursor = desc; 1119 } regards, dan carpenter

2 1

[PATCH] ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF
by Takashi Iwai 13 Jan '23

13 Jan '23

From: Clement Lecigne <clecigne(a)google.com> Takes rwsem lock inside snd_ctl_elem_read instead of snd_ctl_elem_read_user like it was done for write in commit 1fa4445f9adf1 ("ALSA: control - introduce snd_ctl_notify_one() helper"). Doing this way we are also fixing the following locking issue happening in the compat path which can be easily triggered and turned into an use-after-free. 64-bits: snd_ctl_ioctl snd_ctl_elem_read_user [takes controls_rwsem] snd_ctl_elem_read [lock properly held, all good] [drops controls_rwsem] 32-bits: snd_ctl_ioctl_compat snd_ctl_elem_write_read_compat ctl_elem_write_read snd_ctl_elem_read [missing lock, not good] CVE-2023-0266 was assigned for this issue. Cc: stable(a)kernel.org # 5.13+ Signed-off-by: Clement Lecigne <clecigne(a)google.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Note: the fixes for older stable trees will be submitted in another patch sound/core/control.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index 50e7ba66f187..82aa1af1d1d8 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1203,14 +1203,19 @@ static int snd_ctl_elem_read(struct snd_card *card, const u32 pattern = 0xdeadbeef; int ret; + down_read(&card->controls_rwsem); kctl = snd_ctl_find_id(card, &control->id); - if (kctl == NULL) - return -ENOENT; + if (kctl == NULL) { + ret = -ENOENT; + goto unlock; + } index_offset = snd_ctl_get_ioff(kctl, &control->id); vd = &kctl->vd[index_offset]; - if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_READ) || kctl->get == NULL) - return -EPERM; + if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_READ) || kctl->get == NULL) { + ret = -EPERM; + goto unlock; + } snd_ctl_build_ioff(&control->id, kctl, index_offset); @@ -1220,7 +1225,7 @@ static int snd_ctl_elem_read(struct snd_card *card, info.id = control->id; ret = __snd_ctl_elem_info(card, kctl, &info, NULL); if (ret < 0) - return ret; + goto unlock; #endif if (!snd_ctl_skip_validation(&info)) @@ -1230,7 +1235,7 @@ static int snd_ctl_elem_read(struct snd_card *card, ret = kctl->get(kctl, control); snd_power_unref(card); if (ret < 0) - return ret; + goto unlock; if (!snd_ctl_skip_validation(&info) && sanity_check_elem_value(card, control, &info, pattern) < 0) { dev_err(card->dev, @@ -1238,8 +1243,11 @@ static int snd_ctl_elem_read(struct snd_card *card, control->id.iface, control->id.device, control->id.subdevice, control->id.name, control->id.index); - return -EINVAL; + ret = -EINVAL; + goto unlock; } +unlock: + up_read(&card->controls_rwsem); return ret; } @@ -1253,9 +1261,7 @@ static int snd_ctl_elem_read_user(struct snd_card *card, if (IS_ERR(control)) return PTR_ERR(control); - down_read(&card->controls_rwsem); result = snd_ctl_elem_read(card, control); - up_read(&card->controls_rwsem); if (result < 0) goto error; -- 2.35.3

2 1