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

[PATCH 6.0 024/157] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b7aee23fc387..47ef6bc30c0e 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -113,15 +113,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -151,8 +155,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH 0/4] ASoC: microchip: power saving features and cleanups
by Claudiu Beznea 12 Dec '22

12 Dec '22

Hi, The following series adds runtime PM and suspend to RAM features for mchp-pdmc driver. Along with it 2 cleanup patches were added: - patch 1/4: use vendor,device.yaml file format for Microchip AT91 ASoC bindings - patch 4/4: use FIELD_PREP() in mchp-spdiftx.c Thank you, Claudiu Beznea Claudiu Beznea (4): ASoC: dt-bindings: microchip: use proper naming syntax ASoC: mchp-pdmc: use runtime pm for clock power saving ASoC: mchp-pdmc: add support for suspend to RAM ASoC: mchp-spdiftx: use FIELD_PREP() where possible ...cc.yaml => microchip,sama7g5-i2s-mcc.yaml} | 0 ...,pdmc.yaml => microchip,sama7g5-pdmc.yaml} | 0 ...rx.yaml => microchip,sama7g5-spdifrx.yaml} | 0 ...tx.yaml => microchip,sama7g5-spdiftx.yaml} | 0 sound/soc/atmel/mchp-pdmc.c | 145 ++++++++++++------ sound/soc/atmel/mchp-spdiftx.c | 8 +- 6 files changed, 101 insertions(+), 52 deletions(-) rename Documentation/devicetree/bindings/sound/{mchp,i2s-mcc.yaml => microchip,sama7g5-i2s-mcc.yaml} (100%) rename Documentation/devicetree/bindings/sound/{microchip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} (100%) rename Documentation/devicetree/bindings/sound/{mchp,spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} (100%) rename Documentation/devicetree/bindings/sound/{mchp,spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} (100%) -- 2.34.1

1 4

[PATCH 5.10 019/106] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Greg Kroah-Hartman 12 Dec '22

12 Dec '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 65db1a7c77b7..bb76a2dd0a2f 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -112,15 +112,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -149,8 +153,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH] slimbus: qcom-ngd: Add check for platform_driver_register
by Jiasheng Jiang 12 Dec '22

12 Dec '22

Add the check for the return value of platform_driver_register in order to catch the exception. Fixes: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 76c5e446d243..c16fc9e6d1c6 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1590,7 +1590,10 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) goto err_pdr_lookup; } - platform_driver_register(&qcom_slim_ngd_driver); + ret = platform_driver_register(&qcom_slim_ngd_driver); + if (ret < 0) + goto err_pdr_lookup; + return of_qcom_slim_ngd_register(dev, ctrl); err_pdr_alloc: -- 2.25.1

2 1

Add support for ASUS ROG Crosshair X670 Extreme
by GitHub pull_request - opened 11 Dec '22

11 Dec '22

alsa-project/alsa-ucm-conf pull request #249 was opened from ioquatix: - Confirmed working. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/249 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/249.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Sound is pitched and slowed down when going through the sound card of a mixer controller
by GitHub issues - opened 10 Dec '22

10 Dec '22

alsa-project/alsa-firmware issue #7 was opened from mYnDstrEAm: First of all I'm not sure if that's a bug in ALSA and if so if this is the right repo to file it. When I connect my mixer to my Debian11/KDE machine the sound is slowed and pitched down. Sometimes it takes days or weeks until this effect occurs, most of the time everything works well and I don't know what causes this to occur. **See https://unix.stackexchange.com/questions/572895/linux-sound-is-pitched-and-… (and comments below)** `aplay -l` says the driver is module-alsa-card.c. The track is still pitched down when played with `aplay`. I'm not sure if the sound really is slowed down or if it was changed in a slightly different way in the past (had this bug for years now), but right now when I use my mixer rather than internal audio, the sound is lower in pitch. Let me know if there's something I could check like something in some logs. Issue URL : https://github.com/alsa-project/alsa-firmware/issues/7 Repository URL: https://github.com/alsa-project/alsa-firmware

1 0

Simple card and PLL/FLL
by Emanuele Ghidoli 09 Dec '22

09 Dec '22

Hello, I want to understand what is the right way to implement PLL/FLL usage on audio codec when using simple-card. In wm8904 driver I found that FLL is used if set_sysclk is called (that means mclk-fs property is set, otherwise it is not called). In this case the frequency passed to set_sysclk is assumed to be the "desired" frequency, the codec read the currently clkrate coming from "cpu" ("clk_get_rate(priv->mclk)") and use these information to program FLL. In other codec drives I do not find a similar approach. In general codec register the set_pll function but it is never called by simple-card driver. I guess what is the "right/better" implementation? Have we to add the set_pll call in simple-card? Or have we to add it to e.g. fsl_sai driver? Or, in some way, the wm8904 codec driver is approaching in the right way? Is there any documentation that explain all of that (I have already looked at Documentation/sound)? Any driver that is considered well written and complete I should use as a reference? Thanks a lot for your help Best regards, Emanuele

4 4

[PATCH v1] ASoC: Intel: sof_nau8825: add support for nau8825 with amp nau8318
by Ajye Huang 09 Dec '22

09 Dec '22

This patch adds the driver data for two nau8318 speaker amplifiers on SSP1 and nau8825 on SSP0 for ADL platform. And reusing max98360's topology since DAI setting could be leveraged. Signed-off-by: Ajye Huang <ajye_huang(a)compal.corp-partner.google.com> --- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/sof_nau8825.c | 23 +++++++++++++++++++ .../intel/common/soc-acpi-intel-adl-match.c | 12 ++++++++++ 3 files changed, 36 insertions(+) diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index a472de1909f4..3f68e9edd853 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -554,6 +554,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH select SND_SOC_RT1015P select SND_SOC_MAX98373_I2C select SND_SOC_MAX98357A + select SND_SOC_NAU8315 select SND_SOC_DMIC select SND_SOC_HDAC_HDMI select SND_SOC_INTEL_HDA_DSP_COMMON diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 27880224359d..0936450be153 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -48,6 +48,7 @@ #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(15) #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(16) #define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(17) +#define SOF_NAU8318_SPEAKER_AMP_PRESENT BIT(18) static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0); @@ -338,6 +339,13 @@ static struct snd_soc_dai_link_component rt1019p_component[] = { } }; +static struct snd_soc_dai_link_component nau8318_components[] = { + { + .name = "NVTN2012:00", + .dai_name = "nau8315-hifi", + } +}; + static struct snd_soc_dai_link_component dummy_component[] = { { .name = "snd-soc-dummy", @@ -486,6 +494,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, max_98360a_dai_link(&links[id]); } else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) { sof_rt1015p_dai_link(&links[id]); + } else if (sof_nau8825_quirk & + SOF_NAU8318_SPEAKER_AMP_PRESENT) { + links[id].codecs = nau8318_components; + links[id].num_codecs = ARRAY_SIZE(nau8318_components); + links[id].init = speaker_codec_init; } else { goto devm_err; } @@ -657,6 +670,16 @@ static const struct platform_device_id board_ids[] = { SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "adl_nau8318_nau8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_NAU8318_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 60aee56f94bd..282b9c966ce6 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -450,6 +450,11 @@ static const struct snd_soc_acpi_codecs adl_lt6911_hdmi = { .codecs = {"INTC10B0"} }; +static const struct snd_soc_acpi_codecs adl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { { .comp_ids = &adl_rt5682_rt5682s_hp, @@ -507,6 +512,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .quirk_data = &adl_rt1015p_amp, .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg", }, + { + .id = "10508825", + .drv_name = "adl_nau8318_nau8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_nau8318_amp, + .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg", + }, { .id = "10508825", .drv_name = "sof_nau8825", -- 2.25.1

2 4

alsa-project.org is down
by GitHub issues - opened 09 Dec '22

09 Dec '22

alsa-project/alsa-lib issue #287 was opened from afq984: ``` curl -i https://alsa-project.org HTTP/2 404 server: nginx/1.14.1 date: Fri, 09 Dec 2022 16:34:22 GMT content-type: text/html; charset=UTF-8 x-powered-by: PHP/7.4.30 No input file specified. ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/287 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

Re: ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open() breaks SOF Audio in Lenovo laptops
by Richard Fitzgerald 09 Dec '22

09 Dec '22

On 9/12/22 14:42, Pierre-Louis Bossart wrote: > > > On 12/9/22 01:37, Péter Ujfalusi wrote: >> >> >> On 08/12/2022 18:37, Pierre-Louis Bossart wrote: >>> >>> >>> On 12/8/22 10:17, Mark Brown wrote: >>>> On Thu, Dec 08, 2022 at 02:02:02PM +0000, Joakim Tjernlund wrote: >>>>> Several of our Lenovo laptops lost PC audio output in Teams in 5.15.81(also in 5.15.82) >>>>> Revering above patch:https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/comm… >>>>> fixes it. >>>>> >>>>> Any idea what the real fix is? >>>> >>>> Adding the Intel people. I've no idea if there's issues with >>>> dependencies, missing quirks for the hardare or anything in that stable >>>> version. >>> >>> Humm, yes in the past we used the TDM masks to convey the 'stream_tag' >>> for HDaudio. >>> >>> I can still see this in v5.15.85 in sound/soc/sof/intel/hda-dai.c >>> >>> /* set the stream tag in the codec dai dma params */ >>> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) >>> snd_soc_dai_set_tdm_slot(codec_dai, stream_tag, 0, 0, 0); >>> else >>> snd_soc_dai_set_tdm_slot(codec_dai, 0, stream_tag, 0, 0); >>> >>> >>> That was changed in >>> 636110411ca72 ASoC: Intel/SOF: use set_stream() instead of >>> set_tdm_slots() for HDAudio >>> >>> snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), >>> substream->stream); >>> >>> So my guess is that zeroing out TDM masks has a side effect on older >>> stable kernels, and that effect is not seen on newer kernels. >>> >>> I don't really understand what the side effect might be though. >> >> The reason is that on the the tdm mask now became persistent and the HDA >> code relied on the fact that it is volatile, it is reset for each stream >> open. >> The core would do some fixup if the tx/rx_mask is set: >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/sound… >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/sound… >> >> This did not happened when the tx/rx_mask was reset at open - and later >> set bny the HDA driver, I guess after these checks, so the fixup did not >> happened, but without resetting them we would use the previously set >> masks to do fixups for the number of channels (!) based on a stream_tag >> value, which has nothing to do with channels. > > Agree with the analysis, so what would be the least bad recommendation? > a) revert the "don't zero TDM masks" patch > b) backport the change to use set_stream()? Adding alsa-devel(a)alsa-project.org and patches(a)opensource.cirrus.com. Please add relevant lists when sending emails so that other people who might need to know, or have an opinion, are aware of the discussion.

1 0