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

[alsa-devel] [asoc:topic/intel 52/54] sound/soc/intel/skylake/skl-messages.c:320:9: warning: 'ret' may be used uninitialized in this function
by kbuild test robot 23 Aug '17

23 Aug '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 7b992c24de78a206b3abd07192686d2d5db5012c commit: f77d443c4c299aff5ad9c74811dd063f4d8bebcf [52/54] ASoC: Intel: Skylake: Fix to free resources for dsp_init failure config: x86_64-randconfig-ne0-08232016 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout f77d443c4c299aff5ad9c74811dd063f4d8bebcf # save the attached .config to linux build tree make ARCH=x86_64 Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): sound/soc/intel/skylake/skl-messages.c: In function 'skl_init_dsp': >> sound/soc/intel/skylake/skl-messages.c:320:9: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] return ret; ^~~ vim +/ret +320 sound/soc/intel/skylake/skl-messages.c bc23ca35c Jeeja KP 2016-03-11 256 d255b0955 Jeeja KP 2015-07-21 257 int skl_init_dsp(struct skl *skl) d255b0955 Jeeja KP 2015-07-21 258 { d255b0955 Jeeja KP 2015-07-21 259 void __iomem *mmio_base; d255b0955 Jeeja KP 2015-07-21 260 struct hdac_ext_bus *ebus = &skl->ebus; d255b0955 Jeeja KP 2015-07-21 261 struct hdac_bus *bus = ebus_to_hbus(ebus); d255b0955 Jeeja KP 2015-07-21 262 struct skl_dsp_loader_ops loader_ops; bc23ca35c Jeeja KP 2016-03-11 263 int irq = bus->irq; 73a675816 Vinod Koul 2016-07-26 264 const struct skl_dsp_ops *ops; f0a550a88 Guneshwor Singh 2017-08-02 265 struct skl_dsp_cores *cores; 73a675816 Vinod Koul 2016-07-26 266 int ret; d255b0955 Jeeja KP 2015-07-21 267 d255b0955 Jeeja KP 2015-07-21 268 /* enable ppcap interrupt */ d255b0955 Jeeja KP 2015-07-21 269 snd_hdac_ext_bus_ppcap_enable(&skl->ebus, true); d255b0955 Jeeja KP 2015-07-21 270 snd_hdac_ext_bus_ppcap_int_enable(&skl->ebus, true); d255b0955 Jeeja KP 2015-07-21 271 d255b0955 Jeeja KP 2015-07-21 272 /* read the BAR of the ADSP MMIO */ d255b0955 Jeeja KP 2015-07-21 273 mmio_base = pci_ioremap_bar(skl->pci, 4); d255b0955 Jeeja KP 2015-07-21 274 if (mmio_base == NULL) { d255b0955 Jeeja KP 2015-07-21 275 dev_err(bus->dev, "ioremap error\n"); d255b0955 Jeeja KP 2015-07-21 276 return -ENXIO; d255b0955 Jeeja KP 2015-07-21 277 } d255b0955 Jeeja KP 2015-07-21 278 73a675816 Vinod Koul 2016-07-26 279 ops = skl_get_dsp_ops(skl->pci->device); f77d443c4 Subhransu S. Prusty 2017-08-22 280 if (!ops) { f77d443c4 Subhransu S. Prusty 2017-08-22 281 goto unmap_mmio; f77d443c4 Subhransu S. Prusty 2017-08-22 282 ret = -EIO; f77d443c4 Subhransu S. Prusty 2017-08-22 283 } bc23ca35c Jeeja KP 2016-03-11 284 73a675816 Vinod Koul 2016-07-26 285 loader_ops = ops->loader_ops(); 73a675816 Vinod Koul 2016-07-26 286 ret = ops->init(bus->dev, mmio_base, irq, 73a675816 Vinod Koul 2016-07-26 287 skl->fw_name, loader_ops, 73a675816 Vinod Koul 2016-07-26 288 &skl->skl_sst); bc23ca35c Jeeja KP 2016-03-11 289 2ac454ffe Jeeja KP 2015-10-22 290 if (ret < 0) f77d443c4 Subhransu S. Prusty 2017-08-22 291 goto unmap_mmio; 2ac454ffe Jeeja KP 2015-10-22 292 7bd86a305 G Kranthi 2017-03-13 293 skl->skl_sst->dsp_ops = ops; f0a550a88 Guneshwor Singh 2017-08-02 294 cores = &skl->skl_sst->cores; f0a550a88 Guneshwor Singh 2017-08-02 295 cores->count = ops->num_cores; f0a550a88 Guneshwor Singh 2017-08-02 296 f0a550a88 Guneshwor Singh 2017-08-02 297 cores->state = kcalloc(cores->count, sizeof(*cores->state), GFP_KERNEL); f77d443c4 Subhransu S. Prusty 2017-08-22 298 if (!cores->state) { f77d443c4 Subhransu S. Prusty 2017-08-22 299 ret = -ENOMEM; f77d443c4 Subhransu S. Prusty 2017-08-22 300 goto unmap_mmio; f77d443c4 Subhransu S. Prusty 2017-08-22 301 } f0a550a88 Guneshwor Singh 2017-08-02 302 f0a550a88 Guneshwor Singh 2017-08-02 303 cores->usage_count = kcalloc(cores->count, sizeof(*cores->usage_count), f0a550a88 Guneshwor Singh 2017-08-02 304 GFP_KERNEL); f0a550a88 Guneshwor Singh 2017-08-02 305 if (!cores->usage_count) { f77d443c4 Subhransu S. Prusty 2017-08-22 306 ret = -ENOMEM; f77d443c4 Subhransu S. Prusty 2017-08-22 307 goto free_core_state; f0a550a88 Guneshwor Singh 2017-08-02 308 } 363d45385 Dharageswari R 2017-08-02 309 d255b0955 Jeeja KP 2015-07-21 310 dev_dbg(bus->dev, "dsp registration status=%d\n", ret); d255b0955 Jeeja KP 2015-07-21 311 f77d443c4 Subhransu S. Prusty 2017-08-22 312 return 0; f77d443c4 Subhransu S. Prusty 2017-08-22 313 f77d443c4 Subhransu S. Prusty 2017-08-22 314 free_core_state: f77d443c4 Subhransu S. Prusty 2017-08-22 315 kfree(cores->state); f77d443c4 Subhransu S. Prusty 2017-08-22 316 f77d443c4 Subhransu S. Prusty 2017-08-22 317 unmap_mmio: f77d443c4 Subhransu S. Prusty 2017-08-22 318 iounmap(mmio_base); f77d443c4 Subhransu S. Prusty 2017-08-22 319 d255b0955 Jeeja KP 2015-07-21 @320 return ret; d255b0955 Jeeja KP 2015-07-21 321 } d255b0955 Jeeja KP 2015-07-21 322 :::::: The code at line 320 was first introduced by commit :::::: d255b09555e8ea0e517a4d3368ec60097ac9cf96 ASoC: Intel: Skylake: Add dsp and ipc init helpers :::::: TO: Jeeja KP <jeeja.kp(a)intel.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: tegra: Fix unused variable warning
by Takashi Iwai 23 Aug '17

23 Aug '17

Fixes: 2a8bd83af30e ("ASoC: tegra: Remove superfluous snd_soc_jack_free_gpios() call") Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/tegra/tegra_wm8903.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index ce498cc0914b..05f95944669a 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -203,7 +203,6 @@ static int tegra_wm8903_remove(struct snd_soc_card *card) snd_soc_get_pcm_runtime(card, card->dai_link[0].name); struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_codec *codec = codec_dai->codec; - struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); wm8903_mic_detect(codec, NULL, 0, 0); -- 2.14.0

2 1

[alsa-devel] [PATCH] ASoC: wm8524: remove unnecessary snd_soc_unregister_platform()
by Kuninori Morimoto 23 Aug '17

23 Aug '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> wm8524 doesn't register platform, unregister platform is not needed Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/wm8524.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8524.c b/sound/soc/codecs/wm8524.c index b66147e..856a695 100644 --- a/sound/soc/codecs/wm8524.c +++ b/sound/soc/codecs/wm8524.c @@ -233,10 +233,8 @@ static int wm8524_codec_probe(struct platform_device *pdev) ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8524, &wm8524_dai, 1); - if (ret < 0) { + if (ret < 0) dev_err(&pdev->dev, "Failed to register codec: %d\n", ret); - snd_soc_unregister_platform(&pdev->dev); - } return ret; } -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: simple-scu-card: Add pm callbacks to platform driver
by Kuninori Morimoto 23 Aug '17

23 Aug '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM operations are going to happen. This is needed to get suspend/resume working correctly when the audio is using simple-scu-card. Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/simple-scu-card.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 0bb3da7..48606c6 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -300,6 +300,7 @@ static int asoc_simple_card_remove(struct platform_device *pdev) static struct platform_driver asoc_simple_card = { .driver = { .name = "simple-scu-audio-card", + .pm = &snd_soc_pm_ops, .of_match_table = asoc_simple_of_match, }, .probe = asoc_simple_card_probe, -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: audio-graph-card: Add pm callbacks to platform driver
by Kuninori Morimoto 23 Aug '17

23 Aug '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM operations are going to happen. This is needed to get suspend/resume working correctly when the audio is using audio-graph-card. Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/audio-graph-card.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 2f7c8cf..488c52f 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -325,6 +325,7 @@ static int asoc_graph_card_remove(struct platform_device *pdev) static struct platform_driver asoc_graph_card = { .driver = { .name = "asoc-audio-graph-card", + .pm = &snd_soc_pm_ops, .of_match_table = asoc_graph_of_match, }, .probe = asoc_graph_card_probe, -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: audio-graph-scu-card: Add pm callbacks to platform driver
by Kuninori Morimoto 23 Aug '17

23 Aug '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Set snd_soc_pm_ops for the pm ops to make sure that the ASoC level of PM operations are going to happen. This is needed to get suspend/resume working correctly when the audio is using audio-graph-scu-card. Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/audio-graph-scu-card.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index 06b6fcf..a967aa1 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -401,6 +401,7 @@ static int asoc_graph_card_remove(struct platform_device *pdev) static struct platform_driver asoc_graph_card = { .driver = { .name = "asoc-audio-graph-scu-card", + .pm = &snd_soc_pm_ops, .of_match_table = asoc_graph_of_match, }, .probe = asoc_graph_card_probe, -- 1.9.1

2 1

[alsa-devel] [PATCH 0/4] ASoC: Intel: Skylake: Fixes to free resources on init failure
by Subhransu S. Prusty 23 Aug '17

23 Aug '17

Some resources are not freed for ipc and dsp init failures. This results in random failures in a stress test environment. So fixed to free the required resources and also fixed the DSP core reference counting for firmware load failure. Subhransu S. Prusty (4): ASoC: Intel: Skylake: Fix to free dsp resource on ipc_init failure ASoC: Intel: Skylake: Fix to free resources for dsp_init failure ASoC: Intel: Skylake: Fix to free correct dev id in free_irq ASoC: Intel: Skylake: Fix DSP core ref count for init failure sound/soc/intel/skylake/bxt-sst.c | 4 +++- sound/soc/intel/skylake/cnl-sst.c | 4 +++- sound/soc/intel/skylake/skl-messages.c | 26 +++++++++++++++++++------- sound/soc/intel/skylake/skl-sst-dsp.c | 4 ++-- sound/soc/intel/skylake/skl-sst.c | 4 +++- sound/soc/intel/skylake/skl.c | 2 +- 6 files changed, 31 insertions(+), 13 deletions(-) -- 1.9.1

3 9

[alsa-devel] [PATCH][next] ASoC: tegra: remove unused variable machine, fixes build warning
by Colin King 23 Aug '17

23 Aug '17

From: Colin Ian King <colin.king(a)canonical.com> Remove unused variable 'machine', fixes build warning: sound/soc/tegra/tegra_wm8903.c: In function 'tegra_wm8903_remove': sound/soc/tegra/tegra_wm8903.c:206:23: warning: unused variable 'machine' [-Wunused-variable] struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); ^~~~~~~ Fixes: 2a8bd83af30e ("ASoC: tegra: Remove superfluous snd_soc_jack_free_gpios() call") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/tegra/tegra_wm8903.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 2384cb9cb95c..18bdae59a4df 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -203,7 +203,6 @@ static int tegra_wm8903_remove(struct snd_soc_card *card) snd_soc_get_pcm_runtime(card, card->dai_link[0].name); struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_codec *codec = codec_dai->codec; - struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); wm8903_mic_detect(codec, NULL, 0, 0); -- 2.14.1

2 1

[alsa-devel] [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create()
by SF Markus Elfring 23 Aug '17

23 Aug '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Wed, 23 Aug 2017 12:20:07 +0200 Add jump targets so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/usb/midi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/usb/midi.c b/sound/usb/midi.c index a35f41467237..bd9d02268724 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2435,10 +2435,8 @@ int __snd_usbmidi_create(struct snd_card *card, err = -ENXIO; break; } - if (err < 0) { - kfree(umidi); - return err; - } + if (err < 0) + goto free_midi; /* create rawmidi device */ out_ports = 0; @@ -2448,23 +2446,25 @@ int __snd_usbmidi_create(struct snd_card *card, in_ports += hweight16(endpoints[i].in_cables); } err = snd_usbmidi_create_rawmidi(umidi, out_ports, in_ports); - if (err < 0) { - kfree(umidi); - return err; - } + if (err < 0) + goto free_midi; /* create endpoint/port structures */ if (quirk && quirk->type == QUIRK_MIDI_MIDIMAN) err = snd_usbmidi_create_endpoints_midiman(umidi, &endpoints[0]); else err = snd_usbmidi_create_endpoints(umidi, endpoints); - if (err < 0) { - return err; - } + if (err < 0) + goto exit; usb_autopm_get_interface_no_resume(umidi->iface); list_add_tail(&umidi->list, midi_list); return 0; + +free_midi: + kfree(umidi); +exit: + return err; } EXPORT_SYMBOL(__snd_usbmidi_create); -- 2.14.0

3 2

[alsa-devel] [PATCH] ASoC: Add delay quirk for H650e/Jabra 550a USB headsets
by Joakim Tjernlund 23 Aug '17

23 Aug '17

These headsets reports a lot of: cannot set freq 44100 to ep 0x81 and need a small delay between sample rate settings, just like Zoom R16/24. Add both headsets to the Zoom R16/24 quirk for a 1 ms delay between control msgs. Signed-off-by: Joakim Tjernlund <joakim.tjernlund(a)infinera.com> --- sound/usb/quirks.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index eb4b9f7a571e..6f395150243f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1308,10 +1308,13 @@ void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) mdelay(20); - /* Zoom R16/24 needs a tiny delay here, otherwise requests like - * get/set frequency return as failed despite actually succeeding. + /* Zoom R16/24, Logitech H650e, Jabra 550a needs a tiny delay here, + * otherwise requests like get/set frequency return as failed despite + * actually succeeding. */ - if (chip->usb_id == USB_ID(0x1686, 0x00dd) && + if ((chip->usb_id == USB_ID(0x1686, 0x00dd) || + chip->usb_id == USB_ID(0x046d, 0x0a46) || + chip->usb_id == USB_ID(0x0b0e, 0x0349)) && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) mdelay(1); } -- 2.13.5

2 2