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

[PATCH] sound/core: remove useless NULL check before kfree
by Bernard Zhao 06 Dec '21

06 Dec '21

Tis patch try to remove useless NULL check before kfree Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- sound/core/info_oss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c index 1ba887c7954e..ebc714b2f46b 100644 --- a/sound/core/info_oss.c +++ b/sound/core/info_oss.c @@ -32,10 +32,8 @@ int snd_oss_info_register(int dev, int num, char *string) mutex_lock(&strings); if (string == NULL) { x = snd_sndstat_strings[num][dev]; - if (x) { - kfree(x); - x = NULL; - } + kfree(x); + x = NULL; } else { x = kstrdup(string, GFP_KERNEL); if (x == NULL) { -- 2.33.1

2 1

[PATCH v2] ALSA: usb-audio: Reorder snd_djm_devices[] entries
by Geraldo Nascimento 06 Dec '21

06 Dec '21

Olivia Mackintosh has posted to alsa-devel reporting that there's a potential bug that could break mixer quirks for Pioneer devices introduced by 6d27788160362a7ee6c0d317636fe4b1ddbe59a7 "ALSA: usb-audio: Add support for the Pioneer DJM 750MK2 Mixer/Soundcard". This happened because the DJM 750 MK2 was added last to the Pioneer DJM device table index and defined as 0x4 but was added to snd_djm_devices[] just after the DJM 750 (MK1) entry instead of last, after the DJM 900 NXS2. This escaped review. To prevent that from ever happening again, Takashi Iwai suggested to use C99 array designators in snd_djm_devices[] instead of simply reordering the entries. Reported-by: Olivia Mackintosh <livvy(a)base.nu> Suggested-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Geraldo Nascimento <geraldogabriel(a)gmail.com> --- V1 -> V2: added C99 array designators to prevent the order of entries ever being an issue again. --- Hi Takashi, First, thanks for the suggestion regarding C99 array designators. This will serve us well. As I said before, I don't own any DJM mixers to test this, and although it's a simple change, I'm always for testing. Thanks, Geraldo Nascimento --- diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index d489c1de3bae..823b6b8de942 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3016,11 +3016,11 @@ static const struct snd_djm_ctl snd_djm_ctls_750mk2[] = { static const struct snd_djm_device snd_djm_devices[] = { - SND_DJM_DEVICE(250mk2), - SND_DJM_DEVICE(750), - SND_DJM_DEVICE(750mk2), - SND_DJM_DEVICE(850), - SND_DJM_DEVICE(900nxs2) + [SND_DJM_250MK2_IDX] = SND_DJM_DEVICE(250mk2), + [SND_DJM_750_IDX] = SND_DJM_DEVICE(750), + [SND_DJM_850_IDX] = SND_DJM_DEVICE(850), + [SND_DJM_900NXS2_IDX] = SND_DJM_DEVICE(900nxs2), + [SND_DJM_750MK2_IDX] = SND_DJM_DEVICE(750mk2), };

2 1

[PATCH] sound: Fix some typo
by Christophe JAILLET 06 Dec '21

06 Dec '21

Some comments and include guards are not consistent with the name of the file where they can be found. This is likely some typo or cut'n'paste issues. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/pci/ac97/ac97_pcm.c | 2 +- sound/pci/hda/hda_generic.h | 2 +- sound/soc/codecs/sta350.h | 2 +- sound/soc/codecs/tlv320aic26.h | 6 +++--- sound/usb/usx2y/usbusx2y.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c index 491de1a623cb..5fee8e89790f 100644 --- a/sound/pci/ac97/ac97_pcm.c +++ b/sound/pci/ac97/ac97_pcm.c @@ -231,7 +231,7 @@ static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate) * If the codec doesn't support VAR, the rate must be 48000 (except * for SPDIF). * - * The valid registers are AC97_PMC_MIC_ADC_RATE, + * The valid registers are AC97_PCM_MIC_ADC_RATE, * AC97_PCM_FRONT_DAC_RATE, AC97_PCM_LR_ADC_RATE. * AC97_PCM_SURR_DAC_RATE and AC97_PCM_LFE_DAC_RATE are accepted * if the codec supports them. diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index c43bd0f0338e..8e1bc8ea74fc 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -183,7 +183,7 @@ struct hda_gen_spec { struct automic_entry am_entry[MAX_AUTO_MIC_PINS]; /* for pin sensing */ - /* current status; set in hda_geneic.c */ + /* current status; set in hda_generic.c */ unsigned int hp_jack_present:1; unsigned int line_jack_present:1; unsigned int speaker_muted:1; /* current status of speaker mute */ diff --git a/sound/soc/codecs/sta350.h b/sound/soc/codecs/sta350.h index f16900e00afa..80bf56093d94 100644 --- a/sound/soc/codecs/sta350.h +++ b/sound/soc/codecs/sta350.h @@ -14,7 +14,7 @@ #ifndef _ASOC_STA_350_H #define _ASOC_STA_350_H -/* STA50 register addresses */ +/* STA350 register addresses */ #define STA350_REGISTER_COUNT 0x4D #define STA350_COEF_COUNT 62 diff --git a/sound/soc/codecs/tlv320aic26.h b/sound/soc/codecs/tlv320aic26.h index 1f2879b7a080..c86569883e0c 100644 --- a/sound/soc/codecs/tlv320aic26.h +++ b/sound/soc/codecs/tlv320aic26.h @@ -6,8 +6,8 @@ * Copyright (C) 2008 Secret Lab Technologies Ltd. */ -#ifndef _TLV320AIC16_H_ -#define _TLV320AIC16_H_ +#ifndef _TLV320AIC26_H_ +#define _TLV320AIC26_H_ /* AIC26 Registers */ #define AIC26_PAGE_ADDR(page, offset) ((page << 11) | offset << 5) @@ -88,4 +88,4 @@ enum aic26_wlen { AIC26_WLEN_32 = 3 << 10, }; -#endif /* _TLV320AIC16_H_ */ +#endif /* _TLV320AIC26_H_ */ diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index 099bee662af6..52f4e6652407 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * usbusy2y.c - ALSA USB US-428 Driver + * usbusx2y.c - ALSA USB US-428 Driver * 2005-04-14 Karsten Wiese Version 0.8.7.2: -- 2.30.2

2 1

[PATCH] ASoC: SOF: Intel: move CODEC_PROBE_RETRIES definition
by Arnd Bergmann 06 Dec '21

06 Dec '21

From: Arnd Bergmann <arnd(a)arndb.de> The macro is defined in an #ifdef but used outside: sound/soc/sof/intel/hda-codec.c: In function 'hda_codec_probe': sound/soc/sof/intel/hda-codec.c:132:42: error: 'CODEC_PROBE_RETRIES' undeclared (first use in this function) 132 | } while (resp == -1 && retry++ < CODEC_PROBE_RETRIES); | ^~~~~~~~~~~~~~~~~~~ Move it to a place where it can be seen unconditionally. Fixes: 046aede2f847 ("ASoC: SOF: Intel: Retry codec probing if it fails") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/sof/intel/hda-codec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 13cd96e6724a..4324178b3ca6 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -20,9 +20,10 @@ #include "../../codecs/hdac_hda.h" #endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */ +#define CODEC_PROBE_RETRIES 3 + #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) #define IDISP_VID_INTEL 0x80860000 -#define CODEC_PROBE_RETRIES 3 /* load the legacy HDA codec driver */ static int request_codec_module(struct hda_codec *codec) -- 2.29.2

2 1

[PATCH] ALSA: usb-audio: Reorder snd_djm_devices entries
by Geraldo Nascimento 04 Dec '21

04 Dec '21

Olivia Mackintosh has posted to alsa-devel reporting that there's a potential bug that could break mixer quirks for Pioneer devices introduced by 6d27788160362a7ee6c0d317636fe4b1ddbe59a7 "ALSA: usb-audio: Add support for the Pioneer DJM 750MK2 Mixer/Soundcard". This happened because the DJM 750 MK2 was added last to the Pioneer DJM device table index and defined as 0x4 but was added to snd_djm_devices[] just after the DJM 750 (MK1) entry instead of last, after the DJM 900 NXS2. This escaped review. Let's reorder the entries in snd_djm_devices[] so they match the Pioneer DJM device table index #define's. Reported-by: Olivia Mackintosh <livvy(a)base.nu> Signed-off-by: Geraldo Nascimento <geraldogabriel(a)gmail.com> diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index d489c1de3bae..d4cd880b5c6c 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3018,9 +3018,9 @@ static const struct snd_djm_ctl snd_djm_ctls_750mk2[] = { static const struct snd_djm_device snd_djm_devices[] = { SND_DJM_DEVICE(250mk2), SND_DJM_DEVICE(750), - SND_DJM_DEVICE(750mk2), SND_DJM_DEVICE(850), - SND_DJM_DEVICE(900nxs2) + SND_DJM_DEVICE(900nxs2), + SND_DJM_DEVICE(750mk2) };

2 2

[PATCH v8 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 04 Dec '21

04 Dec '21

This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V7: -- Fix indentation errors. -- Bisect patches to avoid interdependency. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: SC7280: Update config for building codec dma drivers ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add regmap config support for codec dma driver ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 70 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 275 +++++++++ sound/soc/qcom/lpass-cpu.c | 244 +++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 617 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 441 +++++++++++++++ sound/soc/qcom/lpass.h | 162 ++++++ 9 files changed, 1864 insertions(+), 87 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

5 15

[PATCH v8 0/3] Machine driver to support LPASS SC7280 sound card registration
by Srinivasa Rao Mandadapu 04 Dec '21

04 Dec '21

This patch set is to add support for SC7280 sound card registration and to add dt-bindings documentation file. Srinivasa Rao Mandadapu (3): ASoC: google: dt-bindings: Add sc7280-herobrine machine bindings ASoC: qcom: Add macro for lpass DAI id's max limit ASoC: qcom: SC7280: Add machine driver Changes Since V7: -- Create separate patch for dai id's macro. -- Remove unused dapm widget structure. Changes Since V6: -- Remove redundant headers. -- Move max ports macro to lpass.h header. -- Arrange structure alignment. -- Fix indentation errors. -- Update module license. Changes Since V5: -- Add required properties to dt-bindings Changes Since V4: -- Add COMPILE_TEST flag in sc7280 configuration. -- Remove redundant startup and shutdown callbacks of snd_soc_ops. -- Fix typo errors. Changes Since V3: -- Change audio jack playpause key value. Changes Since V2: -- updated required field in bindings -- updated Return type check with proper enum in sc7280.c -- Updated Header name and Typos in sc7280.c Changes Since V1: -- Indentation changes and typo. .../bindings/sound/google,sc7280-herobrine.yaml | 171 +++++++++++++ sound/soc/qcom/Kconfig | 14 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass.h | 1 + sound/soc/qcom/sc7280.c | 284 +++++++++++++++++++++ 5 files changed, 472 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml create mode 100644 sound/soc/qcom/sc7280.c -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2 4

[bug report] ASoC: Intel: mrfld - create separate module for pci part
by Dan Carpenter 04 Dec '21

04 Dec '21

Hello Vinod Koul, The patch f533a035e4da: "ASoC: Intel: mrfld - create separate module for pci part" from Nov 4, 2014, leads to the following Smatch static checker warning: sound/soc/intel/atom/sst/sst_pci.c:102 sst_platform_get_resources() warn: resource freed on success: 'ctx->pci' sound/soc/intel/atom/sst/sst_pci.c 25 static int sst_platform_get_resources(struct intel_sst_drv *ctx) 26 { 27 int ddr_base, ret = 0; 28 struct pci_dev *pci = ctx->pci; 29 30 ret = pci_request_regions(pci, SST_DRV_NAME); 31 if (ret) 32 return ret; 33 34 /* map registers */ 35 /* DDR base */ 36 if (ctx->dev_id == SST_MRFLD_PCI_ID) { 37 ctx->ddr_base = pci_resource_start(pci, 0); 38 /* check that the relocated IMR base matches with FW Binary */ 39 ddr_base = relocate_imr_addr_mrfld(ctx->ddr_base); 40 if (!ctx->pdata->lib_info) { 41 dev_err(ctx->dev, "lib_info pointer NULL\n"); 42 ret = -EINVAL; 43 goto do_release_regions; 44 } 45 if (ddr_base != ctx->pdata->lib_info->mod_base) { 46 dev_err(ctx->dev, 47 "FW LSP DDR BASE does not match with IFWI\n"); 48 ret = -EINVAL; 49 goto do_release_regions; 50 } 51 ctx->ddr_end = pci_resource_end(pci, 0); 52 53 ctx->ddr = pcim_iomap(pci, 0, 54 pci_resource_len(pci, 0)); 55 if (!ctx->ddr) { 56 ret = -EINVAL; 57 goto do_release_regions; 58 } 59 dev_dbg(ctx->dev, "sst: DDR Ptr %p\n", ctx->ddr); 60 } else { 61 ctx->ddr = NULL; 62 } 63 /* SHIM */ 64 ctx->shim_phy_add = pci_resource_start(pci, 1); 65 ctx->shim = pcim_iomap(pci, 1, pci_resource_len(pci, 1)); 66 if (!ctx->shim) { 67 ret = -EINVAL; 68 goto do_release_regions; 69 } 70 dev_dbg(ctx->dev, "SST Shim Ptr %p\n", ctx->shim); 71 72 /* Shared SRAM */ 73 ctx->mailbox_add = pci_resource_start(pci, 2); 74 ctx->mailbox = pcim_iomap(pci, 2, pci_resource_len(pci, 2)); 75 if (!ctx->mailbox) { 76 ret = -EINVAL; 77 goto do_release_regions; 78 } 79 dev_dbg(ctx->dev, "SRAM Ptr %p\n", ctx->mailbox); 80 81 /* IRAM */ 82 ctx->iram_end = pci_resource_end(pci, 3); 83 ctx->iram_base = pci_resource_start(pci, 3); 84 ctx->iram = pcim_iomap(pci, 3, pci_resource_len(pci, 3)); 85 if (!ctx->iram) { 86 ret = -EINVAL; 87 goto do_release_regions; 88 } 89 dev_dbg(ctx->dev, "IRAM Ptr %p\n", ctx->iram); 90 91 /* DRAM */ 92 ctx->dram_end = pci_resource_end(pci, 4); 93 ctx->dram_base = pci_resource_start(pci, 4); 94 ctx->dram = pcim_iomap(pci, 4, pci_resource_len(pci, 4)); 95 if (!ctx->dram) { 96 ret = -EINVAL; 97 goto do_release_regions; 98 } 99 dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram); 100 do_release_regions: 101 pci_release_regions(pci); --> 102 return ret; 103 } Surely there should be a "return 0;" before the do_release_regions: label? How does this code work? regards, dan carpenter

6 8

[RFC patch 0/5] Support BCLK input clock in tlv320aic31xx
by Ariel D'Alessandro 03 Dec '21

03 Dec '21

The tlv320aic31xx codec allows using BCLK as the input clock for PLL, deriving all the frequencies through a set of divisors. In this case, codec sysclk is determined by the hwparams sample rate/format. So its frequency must be updated from the codec itself when these are changed. This patchset modifies the tlv320aic31xx driver to update its sysclk if BCLK is used as the input clock. This allows to be used by the generic fsl-asoc-card, without having to add a specific driver. Ariel D'Alessandro (5): ASoC: tlv320aic31xx: Fix typo in BCLK clock name ASoC: tlv320aic31xx: Add support for pll_r coefficient ASoC: tlv320aic31xx: Add divs for bclk as clk_in ASoC: tlv320aic31xx: Handle BCLK set as PLL input configuration ASoC: fsl-asoc-card: Support fsl,imx-audio-tlv320aic31xx codec sound/soc/codecs/tlv320aic31xx.c | 105 ++++++++++++++++++++----------- sound/soc/codecs/tlv320aic31xx.h | 2 +- sound/soc/fsl/fsl-asoc-card.c | 12 ++++ 3 files changed, 83 insertions(+), 36 deletions(-) -- 2.30.2

3 13

[PATCH v7 00/10] Add support for audio on SC7280 based targets
by Srinivasa Rao Mandadapu 03 Dec '21

03 Dec '21

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> This patch set is to add support for Audio over wcd codec, digital mics, through digital codecs and without ADSP. Changes Since V6: -- Split cdc dma regmap config macros. -- Add write dma reg fields for i2s path. -- Add helper function to distinguish rxtx and va dma ports. -- Optimizing clock and reg name in cpu dt-bindings. -- Update buffer management for cdc dma path. -- Remove Kconfig fields of machine driver. Changes Since V5: -- Include MI2S primary node to snd_soc_dai_driver in lpass-sc7280 platform driver. -- Move dependency patch list to corresponding patch. -- Add support for missing cdc-dma ports. -- Change if/else conditional statements to switch cases. -- Add missing error handlings. -- Typo errors fix. Changes Since V4: -- Remove unused variable in lpass-sc7280 platform driver. Changes Since V3: -- Remove redundant power domain controls. As power domains can be configured from dtsi. Changes Since V2: -- Split lpass sc7280 cpu driver patch and create regmap config patch. -- Create patches based on latest kernel tip. -- Add helper function to get dma control and lpaif handle. -- Remove unused variables. Changes Since V1: -- Typo errors fix -- CPU driver readable/writable apis optimization. -- Add Missing config patch -- Add Common api for repeated dmactl initialization. Srinivasa Rao Mandadapu (10): ASoC: qcom: Move lpass_pcm_data structure to lpass header ASoC: qcom: lpass: Add dma fields for codec dma lpass interface ASoC: qcom: Add register definition for codec rddma and wrdma ASoC: qcom: Add lpass CPU driver for codec dma control ASoC: qcom: Add helper function to get dma control and lpaif handle ASoC: qcom: Add support for codec dma driver ASoC: qcom: Add regmap config support for codec dma driver ASoC: dt-bindings: Add SC7280 lpass cpu bindings ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio ASoC: qcom: SC7280: Update config for building codec dma drivers .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 70 ++- sound/soc/qcom/Kconfig | 11 + sound/soc/qcom/Makefile | 4 + sound/soc/qcom/lpass-cdc-dma.c | 275 +++++++++ sound/soc/qcom/lpass-cpu.c | 244 +++++++- sound/soc/qcom/lpass-lpaif-reg.h | 127 ++++- sound/soc/qcom/lpass-platform.c | 617 ++++++++++++++++++--- sound/soc/qcom/lpass-sc7280.c | 441 +++++++++++++++ sound/soc/qcom/lpass.h | 162 ++++++ 9 files changed, 1864 insertions(+), 87 deletions(-) create mode 100644 sound/soc/qcom/lpass-cdc-dma.c create mode 100644 sound/soc/qcom/lpass-sc7280.c -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

4 18