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

[alsa-devel] [PATCH v4] ASoC: AMD: Enable/Disable auxiliary clock via common clock framework
by Akshu Agrawal 30 Mar '18

30 Mar '18

This enables/disables and sets auxiliary clock at 25Mhz. It uses common clock framework for proper ref counting. This approach will save power in comparison to keeping it always On in firmware. V2: Correcting the pin to OSCOUT1 from OSCOUT2 V3: Fix error/warnings from kbuild test V4: Fix build errors for platform which do not support CONFIG_COMMON_CLK TEST= aplay -vv <file> check register to see clock enabled kill aplay check register to see clock disabled Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> Acked-by: Alex Deucher <alexander.deucher(a)amd.com> --- sound/soc/amd/acp-da7219-max98357a.c | 144 ++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 99c6b5c..3c77803 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -30,10 +30,13 @@ #include <sound/soc-dapm.h> #include <sound/jack.h> #include <linux/clk.h> +#include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/gpio.h> #include <linux/module.h> #include <linux/i2c.h> #include <linux/acpi.h> +#include <linux/types.h> #include "../codecs/da7219.h" #include "../codecs/da7219-aad.h" @@ -41,6 +44,20 @@ #define CZ_PLAT_CLK 24000000 #define MCLK_RATE 24576000 #define DUAL_CHANNEL 2 +#define CLKDRVSTR2 0x28 +#define MISCCLKCNTL1 0x40 +#define OSCCLKENB 2 +#define OSCOUT1CLK25MHZ 16 + +struct cz_clock { + const char* acp_clks_name; +#ifdef CONFIG_COMMON_CLK + struct clk_hw acp_clks_hw; +#endif + struct clk_lookup *acp_clks_lookup; + struct clk *acp_clks; + void __iomem *res_base; +}; static struct snd_soc_jack cz_jack; struct clk *da7219_dai_clk; @@ -91,6 +108,8 @@ static int cz_da7219_hw_params(struct snd_pcm_substream *substream, { int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *card = rtd->card; + struct clk *acpd7219_clk; ret = clk_prepare_enable(da7219_dai_clk); if (ret < 0) { @@ -98,13 +117,27 @@ static int cz_da7219_hw_params(struct snd_pcm_substream *substream, return ret; } + acpd7219_clk = clk_get(card->dev, "acpd7219-clks"); + ret = clk_prepare_enable(acpd7219_clk); + if (ret < 0) { + dev_err(rtd->dev, "can't enable oscillator clock %d\n", ret); + return ret; + } + return ret; } static int cz_da7219_hw_free(struct snd_pcm_substream *substream) { + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *card = rtd->card; + struct clk *acpd7219_clk; + clk_disable_unprepare(da7219_dai_clk); + acpd7219_clk = clk_get(card->dev, "acpd7219-clks"); + clk_disable_unprepare(acpd7219_clk); + return 0; } @@ -237,9 +270,113 @@ static int cz_fe_startup(struct snd_pcm_substream *substream) .num_controls = ARRAY_SIZE(cz_mc_controls), }; +#ifdef CONFIG_COMMON_CLK +static int acpd7219_clks_prepare(struct clk_hw *hw) +{ + u32 reg_val; + struct cz_clock *cz_clock_obj = + container_of(hw, struct cz_clock, acp_clks_hw); + void __iomem *base = cz_clock_obj->res_base; + + reg_val = readl(base + MISCCLKCNTL1); + reg_val &= ~(0x1 << OSCCLKENB); + writel(reg_val, base + MISCCLKCNTL1); + reg_val = readl(base + CLKDRVSTR2); + reg_val |= (0x1 << OSCOUT1CLK25MHZ); + writel(reg_val, base + CLKDRVSTR2); + + return 0; +} + +static void acpd7219_clks_unprepare(struct clk_hw *hw) +{ + u32 reg_val; + struct cz_clock *cz_clock_obj = + container_of(hw, struct cz_clock, acp_clks_hw); + void __iomem *base = cz_clock_obj->res_base; + + reg_val = readl(base + MISCCLKCNTL1); + reg_val |= (0x1 << OSCCLKENB); + writel(reg_val, base + MISCCLKCNTL1); +} + +static int acpd7219_clks_is_enabled(struct clk_hw *hw) +{ + u32 reg_val; + struct cz_clock *cz_clock_obj = + container_of(hw, struct cz_clock, acp_clks_hw); + void __iomem *base = cz_clock_obj->res_base; + + reg_val = readl(base + MISCCLKCNTL1); + + return !(reg_val & OSCCLKENB); +} + +const struct clk_ops acpd7219_clks_ops = { + .prepare = acpd7219_clks_prepare, + .unprepare = acpd7219_clks_unprepare, + .is_enabled = acpd7219_clks_is_enabled, +}; + +static int register_acpd7219_clocks(struct platform_device *pdev) +{ + struct clk_init_data init = {}; + struct clk *acp_clks; + struct clk_lookup *acp_clks_lookup; + struct cz_clock *cz_clock_obj; + struct resource *res; + struct device dev = pdev->dev; + + cz_clock_obj = kzalloc(sizeof(struct cz_clock), GFP_KERNEL); + if (!cz_clock_obj) + return -ENOMEM; + + cz_clock_obj->acp_clks_name = "acpd7219-clks"; + + init.parent_names = NULL; + init.num_parents = 0; + init.name = cz_clock_obj->acp_clks_name; + init.ops = &acpd7219_clks_ops; + cz_clock_obj->acp_clks_hw.init = &init; + + acp_clks = devm_clk_register(&dev, &cz_clock_obj->acp_clks_hw); + if (IS_ERR(acp_clks)) + { + dev_err(&dev, "Failed to register DAI clocks: %ld\n", + PTR_ERR(acp_clks)); + return -EINVAL; + } + cz_clock_obj->acp_clks = acp_clks; + + acp_clks_lookup = clkdev_create(acp_clks, cz_clock_obj->acp_clks_name, + "%s", dev_name(&dev)); + if (!acp_clks_lookup) + dev_warn(&dev, "Failed to create DAI clkdev"); + else + cz_clock_obj->acp_clks_lookup = acp_clks_lookup; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "Failed to get misc io resource.\n"); + return -EINVAL; + } + cz_clock_obj->res_base = devm_ioremap_nocache(&pdev->dev, res->start, + resource_size(res)); + if (!cz_clock_obj->res_base) + return -ENOMEM; + + return 0; +} +#else +static int register_acpd7219_clocks(struct platform_device *pdev) +{ + return 0; +} +#endif /* CONFIG_COMMON_CLK */ + static int cz_probe(struct platform_device *pdev) { - int ret; + int ret = 0; struct snd_soc_card *card; card = &cz_card; @@ -252,7 +389,10 @@ static int cz_probe(struct platform_device *pdev) cz_card.name, ret); return ret; } - return 0; + + ret = register_acpd7219_clocks(pdev); + + return ret; } static const struct acpi_device_id cz_audio_acpi_match[] = { -- 1.9.1

4 4

[alsa-devel] Regression? No sound with HDMI audio (snd-hda-intel) with kernel 4.15(.*)
by VDR User 30 Mar '18

30 Mar '18

Hi, I upgraded my Debian Sid box from kernel 4.14.31 to 4.15.14 and I no longer get sound over HDMI with my Nividia GT430. Nvidia driver version is 390.48. Neither the Nvidia installer nor dkms makes any difference. My alsa-utils is 1.1.3-1 and my ~/.asoundrc is: ~$ cat .asoundrc pcm.!default "hdmi:NVidia,1" ~$ aplay -l **** List of PLAYBACK Hardware Devices **** card 1: NVidia [HDA NVidia], device 3: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: NVidia [HDA NVidia], device 7: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: NVidia [HDA NVidia], device 8: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: NVidia [HDA NVidia], device 9: HDMI 0 [HDMI 0] Subdevices: 1/1 Subdevice #0: subdevice #0 I'm using 'speaker-test -c 2 -t wav -Dhw:CARD=1,7' for testing. After kernel 4.15.14 didn't work, I compiled kernel 4.15 and still got no audio. I then compiled kernel 4.15-rc9 and audio worked. From there I tried to bisect the exact patch that broke the audio but got the following: ~$ cd /usr/src /usr/src$ git clone https://github.com/torvalds/linux.git /usr/src$ cd linux /usr/src/linux$ git bisect start -- sound/hda sound/pci/hda /usr/src/linux$ git bisect good v4.15-rc9 /usr/src/linux$ git bisect bad v4.15 No testable commit found. Maybe you started with bad path parameters? /usr/src/linux$ I'm not sure what went wrong there, hopefully one of you reading this may have an idea. It's worth noting I upgraded another near-identical system and HDMI audio is working fine with 4.15.* on that box. That box has an Nvidia GT520 but other than that the package versions, driver version, etc. are all the same. Also, it's connected to a surround receiver whereas the non-working box is connected directly to a tv. Please let me know if any other info is needed or what I can do/try to debug this further. Any help is greatly appreciated! -Derek

1 0

Re: [alsa-devel] [PATCH] pcm_native: Remove VLA usage
by kbuild test robot 30 Mar '18

30 Mar '18

Hi Kyle, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on v4.16-rc7] [cannot apply to sound/for-next next-20180329] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Kyle-Spiers/pcm_native-Remove-VLA-… config: x86_64-randconfig-x019-201812 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All warnings (new ones prefixed by >>): In file included from include/asm-generic/bug.h:5:0, from arch/x86/include/asm/bug.h:83, from include/linux/bug.h:5, from include/linux/mmdebug.h:5, from include/linux/mm.h:9, from sound/core/pcm_native.c:22: sound/core/pcm_native.c: In function 'constrain_params_by_rules': include/linux/compiler.h:58:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (__builtin_constant_p(!!(cond)) ? !!(cond) : \ ^ include/linux/compiler.h:56:23: note: in expansion of macro '__trace_if' #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) ) ^~~~~~~~~~ >> sound/core/pcm_native.c:401:3: note: in expansion of macro 'if' if (changed < 0) ^~ sound/core/pcm_native.c:403:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' return changed; ^~~~~~ vim +/if +401 sound/core/pcm_native.c ^1da177e4 Linus Torvalds 2005-04-16 319 9cc07f55d Takashi Sakamoto 2017-06-09 320 static int constrain_params_by_rules(struct snd_pcm_substream *substream, 877211f5e Takashi Iwai 2005-11-17 321 struct snd_pcm_hw_params *params) ^1da177e4 Linus Torvalds 2005-04-16 322 { 9cc07f55d Takashi Sakamoto 2017-06-09 323 struct snd_pcm_hw_constraints *constrs = 9cc07f55d Takashi Sakamoto 2017-06-09 324 &substream->runtime->hw_constraints; ^1da177e4 Linus Torvalds 2005-04-16 325 unsigned int k; 16c438ade Kyle Spiers 2018-03-28 326 unsigned int *rstamps; ^1da177e4 Linus Torvalds 2005-04-16 327 unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1]; d81052f92 Takashi Sakamoto 2017-06-09 328 unsigned int stamp; a1c06e39a Takashi Sakamoto 2017-06-09 329 struct snd_pcm_hw_rule *r; a1c06e39a Takashi Sakamoto 2017-06-09 330 unsigned int d; 9cc07f55d Takashi Sakamoto 2017-06-09 331 struct snd_mask old_mask; 9cc07f55d Takashi Sakamoto 2017-06-09 332 struct snd_interval old_interval; a1c06e39a Takashi Sakamoto 2017-06-09 333 bool again; 9cc07f55d Takashi Sakamoto 2017-06-09 334 int changed; ^1da177e4 Linus Torvalds 2005-04-16 335 d81052f92 Takashi Sakamoto 2017-06-09 336 /* d81052f92 Takashi Sakamoto 2017-06-09 337 * Each application of rule has own sequence number. d81052f92 Takashi Sakamoto 2017-06-09 338 * d81052f92 Takashi Sakamoto 2017-06-09 339 * Each member of 'rstamps' array represents the sequence number of d81052f92 Takashi Sakamoto 2017-06-09 340 * recent application of corresponding rule. d81052f92 Takashi Sakamoto 2017-06-09 341 */ 16c438ade Kyle Spiers 2018-03-28 342 16c438ade Kyle Spiers 2018-03-28 343 rstamps = kcalloc(constrs->rules_num, sizeof(*rstamps), GFP_KERNEL); d81052f92 Takashi Sakamoto 2017-06-09 344 d81052f92 Takashi Sakamoto 2017-06-09 345 /* d81052f92 Takashi Sakamoto 2017-06-09 346 * Each member of 'vstamps' array represents the sequence number of d81052f92 Takashi Sakamoto 2017-06-09 347 * recent application of rule in which corresponding parameters were d81052f92 Takashi Sakamoto 2017-06-09 348 * changed. d81052f92 Takashi Sakamoto 2017-06-09 349 * d81052f92 Takashi Sakamoto 2017-06-09 350 * In initial state, elements corresponding to parameters requested by d81052f92 Takashi Sakamoto 2017-06-09 351 * a caller is 1. For unrequested parameters, corresponding members d81052f92 Takashi Sakamoto 2017-06-09 352 * have 0 so that the parameters are never changed anymore. d81052f92 Takashi Sakamoto 2017-06-09 353 */ ^1da177e4 Linus Torvalds 2005-04-16 354 for (k = 0; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) ^1da177e4 Linus Torvalds 2005-04-16 355 vstamps[k] = (params->rmask & (1 << k)) ? 1 : 0; d81052f92 Takashi Sakamoto 2017-06-09 356 d81052f92 Takashi Sakamoto 2017-06-09 357 /* Due to the above design, actual sequence number starts at 2. */ d81052f92 Takashi Sakamoto 2017-06-09 358 stamp = 2; 0d4e39996 Takashi Sakamoto 2017-06-09 359 retry: d81052f92 Takashi Sakamoto 2017-06-09 360 /* Apply all rules in order. */ a1c06e39a Takashi Sakamoto 2017-06-09 361 again = false; ^1da177e4 Linus Torvalds 2005-04-16 362 for (k = 0; k < constrs->rules_num; k++) { a1c06e39a Takashi Sakamoto 2017-06-09 363 r = &constrs->rules[k]; d81052f92 Takashi Sakamoto 2017-06-09 364 d81052f92 Takashi Sakamoto 2017-06-09 365 /* d81052f92 Takashi Sakamoto 2017-06-09 366 * Check condition bits of this rule. When the rule has d81052f92 Takashi Sakamoto 2017-06-09 367 * some condition bits, parameter without the bits is d81052f92 Takashi Sakamoto 2017-06-09 368 * never processed. SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP d81052f92 Takashi Sakamoto 2017-06-09 369 * is an example of the condition bits. d81052f92 Takashi Sakamoto 2017-06-09 370 */ ^1da177e4 Linus Torvalds 2005-04-16 371 if (r->cond && !(r->cond & params->flags)) ^1da177e4 Linus Torvalds 2005-04-16 372 continue; d81052f92 Takashi Sakamoto 2017-06-09 373 d81052f92 Takashi Sakamoto 2017-06-09 374 /* d81052f92 Takashi Sakamoto 2017-06-09 375 * The 'deps' array includes maximum three dependencies d81052f92 Takashi Sakamoto 2017-06-09 376 * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fourth d81052f92 Takashi Sakamoto 2017-06-09 377 * member of this array is a sentinel and should be d81052f92 Takashi Sakamoto 2017-06-09 378 * negative value. d81052f92 Takashi Sakamoto 2017-06-09 379 * d81052f92 Takashi Sakamoto 2017-06-09 380 * This rule should be processed in this time when dependent d81052f92 Takashi Sakamoto 2017-06-09 381 * parameters were changed at former applications of the other d81052f92 Takashi Sakamoto 2017-06-09 382 * rules. d81052f92 Takashi Sakamoto 2017-06-09 383 */ ^1da177e4 Linus Torvalds 2005-04-16 384 for (d = 0; r->deps[d] >= 0; d++) { d656b4a65 Takashi Sakamoto 2017-06-09 385 if (vstamps[r->deps[d]] > rstamps[k]) ^1da177e4 Linus Torvalds 2005-04-16 386 break; ^1da177e4 Linus Torvalds 2005-04-16 387 } d656b4a65 Takashi Sakamoto 2017-06-09 388 if (r->deps[d] < 0) ^1da177e4 Linus Torvalds 2005-04-16 389 continue; be4e31dab Takashi Sakamoto 2017-06-07 390 be4e31dab Takashi Sakamoto 2017-06-07 391 if (trace_hw_mask_param_enabled()) { be4e31dab Takashi Sakamoto 2017-06-07 392 if (hw_is_mask(r->var)) be4e31dab Takashi Sakamoto 2017-06-07 393 old_mask = *hw_param_mask(params, r->var); ^1da177e4 Linus Torvalds 2005-04-16 394 } be4e31dab Takashi Sakamoto 2017-06-07 395 if (trace_hw_interval_param_enabled()) { be4e31dab Takashi Sakamoto 2017-06-07 396 if (hw_is_interval(r->var)) be4e31dab Takashi Sakamoto 2017-06-07 397 old_interval = *hw_param_interval(params, r->var); ^1da177e4 Linus Torvalds 2005-04-16 398 } c6706de0c Takashi Sakamoto 2017-06-07 399 ^1da177e4 Linus Torvalds 2005-04-16 400 changed = r->func(params, r); f74ae15fe Takashi Sakamoto 2017-06-11 @401 if (changed < 0) 16c438ade Kyle Spiers 2018-03-28 402 kfree(rstamps); f74ae15fe Takashi Sakamoto 2017-06-11 403 return changed; c6706de0c Takashi Sakamoto 2017-06-07 404 d81052f92 Takashi Sakamoto 2017-06-09 405 /* 82e7d5012 Takashi Sakamoto 2017-06-11 406 * When the parameter is changed, notify it to the caller d81052f92 Takashi Sakamoto 2017-06-09 407 * by corresponding returned bit, then preparing for next d81052f92 Takashi Sakamoto 2017-06-09 408 * iteration. d81052f92 Takashi Sakamoto 2017-06-09 409 */ ^1da177e4 Linus Torvalds 2005-04-16 410 if (changed && r->var >= 0) { 82e7d5012 Takashi Sakamoto 2017-06-11 411 if (hw_is_mask(r->var)) { 82e7d5012 Takashi Sakamoto 2017-06-11 412 trace_hw_mask_param(substream, r->var, 82e7d5012 Takashi Sakamoto 2017-06-11 413 k + 1, &old_mask, 82e7d5012 Takashi Sakamoto 2017-06-11 414 hw_param_mask(params, r->var)); ^1da177e4 Linus Torvalds 2005-04-16 415 } 82e7d5012 Takashi Sakamoto 2017-06-11 416 if (hw_is_interval(r->var)) { 82e7d5012 Takashi Sakamoto 2017-06-11 417 trace_hw_interval_param(substream, r->var, 82e7d5012 Takashi Sakamoto 2017-06-11 418 k + 1, &old_interval, 82e7d5012 Takashi Sakamoto 2017-06-11 419 hw_param_interval(params, r->var)); ^1da177e4 Linus Torvalds 2005-04-16 420 } 82e7d5012 Takashi Sakamoto 2017-06-11 421 ^1da177e4 Linus Torvalds 2005-04-16 422 params->cmask |= (1 << r->var); ^1da177e4 Linus Torvalds 2005-04-16 423 vstamps[r->var] = stamp; a1c06e39a Takashi Sakamoto 2017-06-09 424 again = true; ^1da177e4 Linus Torvalds 2005-04-16 425 } f74ae15fe Takashi Sakamoto 2017-06-11 426 82e7d5012 Takashi Sakamoto 2017-06-11 427 rstamps[k] = stamp++; ^1da177e4 Linus Torvalds 2005-04-16 428 } 0d4e39996 Takashi Sakamoto 2017-06-09 429 d81052f92 Takashi Sakamoto 2017-06-09 430 /* Iterate to evaluate all rules till no parameters are changed. */ 0d4e39996 Takashi Sakamoto 2017-06-09 431 if (again) 0d4e39996 Takashi Sakamoto 2017-06-09 432 goto retry; 9cc07f55d Takashi Sakamoto 2017-06-09 433 16c438ade Kyle Spiers 2018-03-28 434 kfree(rstamps); 9cc07f55d Takashi Sakamoto 2017-06-09 435 return 0; ^1da177e4 Linus Torvalds 2005-04-16 436 } 9cc07f55d Takashi Sakamoto 2017-06-09 437 :::::: The code at line 401 was first introduced by commit :::::: f74ae15fe3da7905b78e986ad906a333587cf160 ALSA: pcm: return error immediately for parameters handling :::::: TO: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [GIT PULL] Audio firmware update
by Sanyog Kale 30 Mar '18

30 Mar '18

Hi, Please PULL to receive the update for Skylake, Kabylake, Broxton and Geminilake audio DSP firmware. The following changes since commit 44476f2465dac9c22bce90da66e86b2b56ba34f0: BCM-0bb4-0306: Update to Cypress license in WHENCE (2018-03-20 12:20:21 -0400) are available in the git repository at: https://github.com/sanyogrk/firmware kbl for you to fetch changes up to 9c53767c99f1d393e9c0f566ec17e4699788e95d: linux-firmware: intel: Update Geminilake audio firmware (2018-03-23 09:55:51 +0530) ---------------------------------------------------------------- Sanyog Kale (4): linux-firmware: intel: Update Skylake audio firmware linux-firmware: intel: Update Broxton audio firmware linux-firmware: intel: Update Kabylake audio firmware linux-firmware: intel: Update Geminilake audio firmware WHENCE | 16 ++++++++++++---- intel/dsp_fw_bxtn.bin | 2 +- intel/dsp_fw_bxtn_v3366.bin | Bin 0 -> 505608 bytes intel/dsp_fw_glk.bin | 2 +- intel/dsp_fw_glk_v3366.bin | Bin 0 -> 505608 bytes intel/dsp_fw_kbl.bin | 2 +- intel/dsp_fw_kbl_v3402.bin | Bin 0 -> 247112 bytes intel/dsp_fw_release.bin | 2 +- intel/dsp_fw_release_v3402.bin | Bin 0 -> 247112 bytes 9 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 intel/dsp_fw_bxtn_v3366.bin create mode 100644 intel/dsp_fw_glk_v3366.bin create mode 100644 intel/dsp_fw_kbl_v3402.bin create mode 100644 intel/dsp_fw_release_v3402.bin Thanks, Sanyog --

2 1

Re: [alsa-devel] [PATCH] pcm_native: Remove VLA usage
by kbuild test robot 30 Mar '18

30 Mar '18

Hi Kyle, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on v4.16-rc7] [cannot apply to sound/for-next next-20180329] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Kyle-Spiers/pcm_native-Remove-VLA-… config: i386-randconfig-x075-201812 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=i386 All warnings (new ones prefixed by >>): sound/core/pcm_native.c: In function 'constrain_params_by_rules': >> sound/core/pcm_native.c:401:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (changed < 0) ^~ sound/core/pcm_native.c:403:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' return changed; ^~~~~~ vim +/if +401 sound/core/pcm_native.c ^1da177e4 Linus Torvalds 2005-04-16 319 9cc07f55d Takashi Sakamoto 2017-06-09 320 static int constrain_params_by_rules(struct snd_pcm_substream *substream, 877211f5e Takashi Iwai 2005-11-17 321 struct snd_pcm_hw_params *params) ^1da177e4 Linus Torvalds 2005-04-16 322 { 9cc07f55d Takashi Sakamoto 2017-06-09 323 struct snd_pcm_hw_constraints *constrs = 9cc07f55d Takashi Sakamoto 2017-06-09 324 &substream->runtime->hw_constraints; ^1da177e4 Linus Torvalds 2005-04-16 325 unsigned int k; 16c438ade Kyle Spiers 2018-03-28 326 unsigned int *rstamps; ^1da177e4 Linus Torvalds 2005-04-16 327 unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1]; d81052f92 Takashi Sakamoto 2017-06-09 328 unsigned int stamp; a1c06e39a Takashi Sakamoto 2017-06-09 329 struct snd_pcm_hw_rule *r; a1c06e39a Takashi Sakamoto 2017-06-09 330 unsigned int d; 9cc07f55d Takashi Sakamoto 2017-06-09 331 struct snd_mask old_mask; 9cc07f55d Takashi Sakamoto 2017-06-09 332 struct snd_interval old_interval; a1c06e39a Takashi Sakamoto 2017-06-09 333 bool again; 9cc07f55d Takashi Sakamoto 2017-06-09 334 int changed; ^1da177e4 Linus Torvalds 2005-04-16 335 d81052f92 Takashi Sakamoto 2017-06-09 336 /* d81052f92 Takashi Sakamoto 2017-06-09 337 * Each application of rule has own sequence number. d81052f92 Takashi Sakamoto 2017-06-09 338 * d81052f92 Takashi Sakamoto 2017-06-09 339 * Each member of 'rstamps' array represents the sequence number of d81052f92 Takashi Sakamoto 2017-06-09 340 * recent application of corresponding rule. d81052f92 Takashi Sakamoto 2017-06-09 341 */ 16c438ade Kyle Spiers 2018-03-28 342 16c438ade Kyle Spiers 2018-03-28 343 rstamps = kcalloc(constrs->rules_num, sizeof(*rstamps), GFP_KERNEL); d81052f92 Takashi Sakamoto 2017-06-09 344 d81052f92 Takashi Sakamoto 2017-06-09 345 /* d81052f92 Takashi Sakamoto 2017-06-09 346 * Each member of 'vstamps' array represents the sequence number of d81052f92 Takashi Sakamoto 2017-06-09 347 * recent application of rule in which corresponding parameters were d81052f92 Takashi Sakamoto 2017-06-09 348 * changed. d81052f92 Takashi Sakamoto 2017-06-09 349 * d81052f92 Takashi Sakamoto 2017-06-09 350 * In initial state, elements corresponding to parameters requested by d81052f92 Takashi Sakamoto 2017-06-09 351 * a caller is 1. For unrequested parameters, corresponding members d81052f92 Takashi Sakamoto 2017-06-09 352 * have 0 so that the parameters are never changed anymore. d81052f92 Takashi Sakamoto 2017-06-09 353 */ ^1da177e4 Linus Torvalds 2005-04-16 354 for (k = 0; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) ^1da177e4 Linus Torvalds 2005-04-16 355 vstamps[k] = (params->rmask & (1 << k)) ? 1 : 0; d81052f92 Takashi Sakamoto 2017-06-09 356 d81052f92 Takashi Sakamoto 2017-06-09 357 /* Due to the above design, actual sequence number starts at 2. */ d81052f92 Takashi Sakamoto 2017-06-09 358 stamp = 2; 0d4e39996 Takashi Sakamoto 2017-06-09 359 retry: d81052f92 Takashi Sakamoto 2017-06-09 360 /* Apply all rules in order. */ a1c06e39a Takashi Sakamoto 2017-06-09 361 again = false; ^1da177e4 Linus Torvalds 2005-04-16 362 for (k = 0; k < constrs->rules_num; k++) { a1c06e39a Takashi Sakamoto 2017-06-09 363 r = &constrs->rules[k]; d81052f92 Takashi Sakamoto 2017-06-09 364 d81052f92 Takashi Sakamoto 2017-06-09 365 /* d81052f92 Takashi Sakamoto 2017-06-09 366 * Check condition bits of this rule. When the rule has d81052f92 Takashi Sakamoto 2017-06-09 367 * some condition bits, parameter without the bits is d81052f92 Takashi Sakamoto 2017-06-09 368 * never processed. SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP d81052f92 Takashi Sakamoto 2017-06-09 369 * is an example of the condition bits. d81052f92 Takashi Sakamoto 2017-06-09 370 */ ^1da177e4 Linus Torvalds 2005-04-16 371 if (r->cond && !(r->cond & params->flags)) ^1da177e4 Linus Torvalds 2005-04-16 372 continue; d81052f92 Takashi Sakamoto 2017-06-09 373 d81052f92 Takashi Sakamoto 2017-06-09 374 /* d81052f92 Takashi Sakamoto 2017-06-09 375 * The 'deps' array includes maximum three dependencies d81052f92 Takashi Sakamoto 2017-06-09 376 * to SNDRV_PCM_HW_PARAM_XXXs for this rule. The fourth d81052f92 Takashi Sakamoto 2017-06-09 377 * member of this array is a sentinel and should be d81052f92 Takashi Sakamoto 2017-06-09 378 * negative value. d81052f92 Takashi Sakamoto 2017-06-09 379 * d81052f92 Takashi Sakamoto 2017-06-09 380 * This rule should be processed in this time when dependent d81052f92 Takashi Sakamoto 2017-06-09 381 * parameters were changed at former applications of the other d81052f92 Takashi Sakamoto 2017-06-09 382 * rules. d81052f92 Takashi Sakamoto 2017-06-09 383 */ ^1da177e4 Linus Torvalds 2005-04-16 384 for (d = 0; r->deps[d] >= 0; d++) { d656b4a65 Takashi Sakamoto 2017-06-09 385 if (vstamps[r->deps[d]] > rstamps[k]) ^1da177e4 Linus Torvalds 2005-04-16 386 break; ^1da177e4 Linus Torvalds 2005-04-16 387 } d656b4a65 Takashi Sakamoto 2017-06-09 388 if (r->deps[d] < 0) ^1da177e4 Linus Torvalds 2005-04-16 389 continue; be4e31dab Takashi Sakamoto 2017-06-07 390 be4e31dab Takashi Sakamoto 2017-06-07 391 if (trace_hw_mask_param_enabled()) { be4e31dab Takashi Sakamoto 2017-06-07 392 if (hw_is_mask(r->var)) be4e31dab Takashi Sakamoto 2017-06-07 393 old_mask = *hw_param_mask(params, r->var); ^1da177e4 Linus Torvalds 2005-04-16 394 } be4e31dab Takashi Sakamoto 2017-06-07 395 if (trace_hw_interval_param_enabled()) { be4e31dab Takashi Sakamoto 2017-06-07 396 if (hw_is_interval(r->var)) be4e31dab Takashi Sakamoto 2017-06-07 397 old_interval = *hw_param_interval(params, r->var); ^1da177e4 Linus Torvalds 2005-04-16 398 } c6706de0c Takashi Sakamoto 2017-06-07 399 ^1da177e4 Linus Torvalds 2005-04-16 400 changed = r->func(params, r); f74ae15fe Takashi Sakamoto 2017-06-11 @401 if (changed < 0) 16c438ade Kyle Spiers 2018-03-28 402 kfree(rstamps); f74ae15fe Takashi Sakamoto 2017-06-11 403 return changed; c6706de0c Takashi Sakamoto 2017-06-07 404 d81052f92 Takashi Sakamoto 2017-06-09 405 /* 82e7d5012 Takashi Sakamoto 2017-06-11 406 * When the parameter is changed, notify it to the caller d81052f92 Takashi Sakamoto 2017-06-09 407 * by corresponding returned bit, then preparing for next d81052f92 Takashi Sakamoto 2017-06-09 408 * iteration. d81052f92 Takashi Sakamoto 2017-06-09 409 */ ^1da177e4 Linus Torvalds 2005-04-16 410 if (changed && r->var >= 0) { 82e7d5012 Takashi Sakamoto 2017-06-11 411 if (hw_is_mask(r->var)) { 82e7d5012 Takashi Sakamoto 2017-06-11 412 trace_hw_mask_param(substream, r->var, 82e7d5012 Takashi Sakamoto 2017-06-11 413 k + 1, &old_mask, 82e7d5012 Takashi Sakamoto 2017-06-11 414 hw_param_mask(params, r->var)); ^1da177e4 Linus Torvalds 2005-04-16 415 } 82e7d5012 Takashi Sakamoto 2017-06-11 416 if (hw_is_interval(r->var)) { 82e7d5012 Takashi Sakamoto 2017-06-11 417 trace_hw_interval_param(substream, r->var, 82e7d5012 Takashi Sakamoto 2017-06-11 418 k + 1, &old_interval, 82e7d5012 Takashi Sakamoto 2017-06-11 419 hw_param_interval(params, r->var)); ^1da177e4 Linus Torvalds 2005-04-16 420 } 82e7d5012 Takashi Sakamoto 2017-06-11 421 ^1da177e4 Linus Torvalds 2005-04-16 422 params->cmask |= (1 << r->var); ^1da177e4 Linus Torvalds 2005-04-16 423 vstamps[r->var] = stamp; a1c06e39a Takashi Sakamoto 2017-06-09 424 again = true; ^1da177e4 Linus Torvalds 2005-04-16 425 } f74ae15fe Takashi Sakamoto 2017-06-11 426 82e7d5012 Takashi Sakamoto 2017-06-11 427 rstamps[k] = stamp++; ^1da177e4 Linus Torvalds 2005-04-16 428 } 0d4e39996 Takashi Sakamoto 2017-06-09 429 d81052f92 Takashi Sakamoto 2017-06-09 430 /* Iterate to evaluate all rules till no parameters are changed. */ 0d4e39996 Takashi Sakamoto 2017-06-09 431 if (again) 0d4e39996 Takashi Sakamoto 2017-06-09 432 goto retry; 9cc07f55d Takashi Sakamoto 2017-06-09 433 16c438ade Kyle Spiers 2018-03-28 434 kfree(rstamps); 9cc07f55d Takashi Sakamoto 2017-06-09 435 return 0; ^1da177e4 Linus Torvalds 2005-04-16 436 } 9cc07f55d Takashi Sakamoto 2017-06-09 437 :::::: The code at line 401 was first introduced by commit :::::: f74ae15fe3da7905b78e986ad906a333587cf160 ALSA: pcm: return error immediately for parameters handling :::::: TO: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [RESEND][PATCH v4 0/3] Add SPIB Support for Intel Skylake platforms
by Sriram Periyasamy 29 Mar '18

29 Mar '18

Skylake audio controller supports SPIB (Software Position in buffer) capability, which can be used to inform position of application pointer to host DMA controller. When SPIB mode is enabled, driver could write the application pointer position in SPIB register. Host DMA will make sure it won't read/write beyond bytes specified in SPIB register. SPIB mode will be useful in low power use cases, where DSP could pre-fetch large buffers to avoid frequent wakes caused due to interrupts. To support SPIB in the driver, save the spib values in stream context which can be restored during resume from S3. Add new hw_params flag to explicitly tell driver that rewinds will never be used. Please find the references for the previous discussions at [1][2] [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-January/131329. html [2] https://patchwork.kernel.org/patch/9795233/ and the patches of previous versions at [3][4][5] [3] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-June/121967.html [4] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-June/121683.html [5] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-May/120676.html Pierre-Louis Bossart (1): ALSA: core: let low-level driver or userspace disable rewinds Ramesh Babu (2): ALSA: hda: ext: add spib to stream context ASoC: Intel: Skylake: Add support for spib mode include/sound/hdaudio_ext.h | 1 + include/sound/pcm.h | 1 + include/uapi/sound/asound.h | 1 + sound/core/pcm_native.c | 8 ++++++++ sound/hda/ext/hdac_ext_stream.c | 2 ++ sound/soc/intel/skylake/skl-pcm.c | 43 ++++++++++++++++++++++++++++++++++++++- 6 files changed, 55 insertions(+), 1 deletion(-) -- 2.7.4

4 18

[alsa-devel] [PATCH] ALSA: hda_intel: mark PM functions as __maybe_unused
by Arnd Bergmann 29 Mar '18

29 Mar '18

Two callsites of azx_suspend/azx_resume were removed, leaving these functions only called from the optional SET_SYSTEM_SLEEP_PM_OPS() and causing a warning without CONFIG_PM_SLEEP: sound/pci/hda/hda_intel.c:1029:12: error: 'azx_resume' defined but not used [-Werror=unused-function] static int azx_resume(struct device *dev) ^~~~~~~~~~ sound/pci/hda/hda_intel.c:994:12: error: 'azx_suspend' defined but not used [-Werror=unused-function] static int azx_suspend(struct device *dev) ^~~~~~~~~~~ Keeping track of the correct #ifdef checks is hard, so this removes all the #ifdefs for power management in this file and instead uses __maybe_unused annotations that let the compiler do the job right by itself. Fixes: 07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/pci/hda/hda_intel.c | 52 +++++++++++++++++------------------------ sound/pci/hda/hda_intel_trace.h | 2 -- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 087c4d861c6e..01a96972d191 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -198,7 +198,9 @@ static bool power_save_controller = 1; module_param(power_save_controller, bool, 0644); MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode."); #else -#define power_save 0 +#define power_save 0 +#define power_save_controller 0 +#define pm_blacklist 0 #endif /* CONFIG_PM */ static int align_buffer_size = -1; @@ -941,13 +943,16 @@ static unsigned int azx_get_pos_skl(struct azx *chip, struct azx_dev *azx_dev) return azx_get_pos_posbuf(chip, azx_dev); } -#ifdef CONFIG_PM static DEFINE_MUTEX(card_list_lock); static LIST_HEAD(card_list); static void azx_add_card_list(struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip); + + if (!IS_ENABLED(CONFIG_PM)) + return; + mutex_lock(&card_list_lock); list_add(&hda->list, &card_list); mutex_unlock(&card_list_lock); @@ -956,13 +961,17 @@ static void azx_add_card_list(struct azx *chip) static void azx_del_card_list(struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip); + + if (!IS_ENABLED(CONFIG_PM)) + return; + mutex_lock(&card_list_lock); list_del_init(&hda->list); mutex_unlock(&card_list_lock); } /* trigger power-save check at writing parameter */ -static int param_set_xint(const char *val, const struct kernel_param *kp) +static int __maybe_unused param_set_xint(const char *val, const struct kernel_param *kp) { struct hda_intel *hda; struct azx *chip; @@ -982,16 +991,11 @@ static int param_set_xint(const char *val, const struct kernel_param *kp) mutex_unlock(&card_list_lock); return 0; } -#else -#define azx_add_card_list(chip) /* NOP */ -#define azx_del_card_list(chip) /* NOP */ -#endif /* CONFIG_PM */ -#if defined(CONFIG_PM_SLEEP) || defined(SUPPORT_VGA_SWITCHEROO) /* * power management */ -static int azx_suspend(struct device *dev) +static int __maybe_unused azx_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1026,7 +1030,7 @@ static int azx_suspend(struct device *dev) return 0; } -static int azx_resume(struct device *dev) +static int __maybe_unused azx_resume(struct device *dev) { struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); @@ -1068,13 +1072,11 @@ static int azx_resume(struct device *dev) trace_azx_resume(chip); return 0; } -#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */ -#ifdef CONFIG_PM_SLEEP /* put codec down to D3 at hibernation for Intel SKL+; * otherwise BIOS may still access the codec and screw up the driver */ -static int azx_freeze_noirq(struct device *dev) +static int __maybe_unused azx_freeze_noirq(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; @@ -1086,7 +1088,7 @@ static int azx_freeze_noirq(struct device *dev) return 0; } -static int azx_thaw_noirq(struct device *dev) +static int __maybe_unused azx_thaw_noirq(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; @@ -1097,10 +1099,8 @@ static int azx_thaw_noirq(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_PM -static int azx_runtime_suspend(struct device *dev) +static int __maybe_unused azx_runtime_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1132,7 +1132,7 @@ static int azx_runtime_suspend(struct device *dev) return 0; } -static int azx_runtime_resume(struct device *dev) +static int __maybe_unused azx_runtime_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1185,7 +1185,7 @@ static int azx_runtime_resume(struct device *dev) return 0; } -static int azx_runtime_idle(struct device *dev) +static int __maybe_unused azx_runtime_idle(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct azx *chip; @@ -1215,12 +1215,6 @@ static const struct dev_pm_ops azx_pm = { SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) }; -#define AZX_PM_OPS &azx_pm -#else -#define AZX_PM_OPS NULL -#endif /* CONFIG_PM */ - - static int azx_probe_continue(struct azx *chip); #ifdef SUPPORT_VGA_SWITCHEROO @@ -2199,7 +2193,6 @@ static int azx_probe(struct pci_dev *pci, return err; } -#ifdef CONFIG_PM /* On some boards setting power_save to a non 0 value leads to clicking / * popping sounds when ever we enter/leave powersaving mode. Ideally we would * figure out how to avoid these sounds, but that is not always feasible. @@ -2215,7 +2208,6 @@ static struct snd_pci_quirk power_save_blacklist[] = { SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0), {} }; -#endif /* CONFIG_PM */ /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */ static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = { @@ -2313,8 +2305,7 @@ static int azx_probe_continue(struct azx *chip) azx_add_card_list(chip); val = power_save; -#ifdef CONFIG_PM - if (pm_blacklist) { + if (IS_ENABLED(CONFIG_PM) && pm_blacklist) { const struct snd_pci_quirk *q; q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist); @@ -2324,7 +2315,6 @@ static int azx_probe_continue(struct azx *chip) val = 0; } } -#endif /* CONFIG_PM */ /* * The discrete GPU cannot power down unless the HDA controller runtime @@ -2671,7 +2661,7 @@ static struct pci_driver azx_driver = { .remove = azx_remove, .shutdown = azx_shutdown, .driver = { - .pm = AZX_PM_OPS, + .pm = &azx_pm, }, }; diff --git a/sound/pci/hda/hda_intel_trace.h b/sound/pci/hda/hda_intel_trace.h index 73a7adfa192d..2775fa81a500 100644 --- a/sound/pci/hda/hda_intel_trace.h +++ b/sound/pci/hda/hda_intel_trace.h @@ -34,7 +34,6 @@ DEFINE_EVENT(hda_pm, azx_resume, TP_ARGS(chip) ); -#ifdef CONFIG_PM DEFINE_EVENT(hda_pm, azx_runtime_suspend, TP_PROTO(struct azx *chip), TP_ARGS(chip) @@ -44,7 +43,6 @@ DEFINE_EVENT(hda_pm, azx_runtime_resume, TP_PROTO(struct azx *chip), TP_ARGS(chip) ); -#endif #endif /* _TRACE_HDA_INTEL_H */ -- 2.9.0

3 4

[alsa-devel] [PATCH] ALSA: usb-audio: silence a static checker warning
by Dan Carpenter 29 Mar '18

29 Mar '18

We recently made "format" a u64 variable so now static checkers complain that this shift will wrap around if format is more than 31. I don't think it makes a difference for runtime, but it's simple to silence the warning. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/usb/format.c b/sound/usb/format.c index edbe67eeddfa..49e7ec6d2399 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -55,7 +55,7 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, struct uac_format_type_i_discrete_descriptor *fmt = _fmt; sample_width = fmt->bBitResolution; sample_bytes = fmt->bSubframeSize; - format = 1 << format; + format = 1ULL << format; break; }

2 1

[alsa-devel] [PATCH] pcm: ioplug: Implement proper drain behavior
by Takashi Iwai 29 Mar '18

29 Mar '18

This patch fixes the draining behavior of ioplug in the following ways: - When no draining ioplug callback is defined, implement the draining loop using snd_pcm_wait*() and sync with the drain finishes. This is equivalent with the implementation in the kernel write(). Similarly as in kernel code, for non-blocking mode, it returns immediately after setting DRAINING state. - The hw_ptr update function checks the PCM state and stops the stream if the draining finishes. - When draining ioplug callback is defined, leave the whole draining operation to it. The callback is supposed to return -EAGAIN for non-blocking case, too. - When an unexpected error happens during draining, it drops the stream, for a safety reason. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- The patch was slightly changed from the draft version. e.g. hw_ptr_update() is called at the beginning of the loop, so that it's updated for non-blocking mode, too. And, the stream is dropped in case of unexpected errors. Also, this patch requires the previous fix ("pcm: Skip avail_min check during draining"). src/pcm/pcm_ioplug.c | 76 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 67 insertions(+), 9 deletions(-) diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c index 8c0ed4836365..db64853b3136 100644 --- a/src/pcm/pcm_ioplug.c +++ b/src/pcm/pcm_ioplug.c @@ -47,6 +47,11 @@ typedef struct snd_pcm_ioplug_priv { snd_htimestamp_t trigger_tstamp; } ioplug_priv_t; +static int snd_pcm_ioplug_drop(snd_pcm_t *pcm); +static int snd_pcm_ioplug_poll_descriptors_count(snd_pcm_t *pcm); +static int snd_pcm_ioplug_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); +static int snd_pcm_ioplug_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); + /* update the hw pointer */ /* called in lock */ static void snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) @@ -57,6 +62,7 @@ static void snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) hw = io->data->callback->pointer(io->data); if (hw >= 0) { snd_pcm_uframes_t delta; + snd_pcm_uframes_t avail; if ((snd_pcm_uframes_t)hw >= io->last_hw) delta = hw - io->last_hw; @@ -67,9 +73,19 @@ static void snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm) delta = wrap_point + hw - io->last_hw; } snd_pcm_mmap_hw_forward(io->data->pcm, delta); + /* stop the stream if all samples are drained */ + if (io->data->state == SND_PCM_STATE_DRAINING) { + avail = snd_pcm_mmap_avail(pcm); + if (avail >= pcm->buffer_size) + snd_pcm_ioplug_drop(pcm); + } io->last_hw = (snd_pcm_uframes_t)hw; - } else - io->data->state = SNDRV_PCM_STATE_XRUN; + } else { + if (io->data->state == SND_PCM_STATE_DRAINING) + snd_pcm_ioplug_drop(pcm); + else + io->data->state = SNDRV_PCM_STATE_XRUN; + } } static int snd_pcm_ioplug_info(snd_pcm_t *pcm, snd_pcm_info_t *info) @@ -488,20 +504,62 @@ static int snd_pcm_ioplug_drop(snd_pcm_t *pcm) return 0; } +static int ioplug_drain_via_poll(snd_pcm_t *pcm) +{ + ioplug_priv_t *io = pcm->private_data; + + while (io->data->state == SND_PCM_STATE_DRAINING) { + snd_pcm_ioplug_hw_ptr_update(pcm); + if (io->data->state != SND_PCM_STATE_DRAINING) + break; + /* in non-blocking mode, let application to poll() by itself */ + if (io->data->nonblock) + return -EAGAIN; + if (snd_pcm_wait_nocheck(pcm, -1) < 0) + break; + } + + return 0; /* force to drop at error */ +} + /* need own locking */ static int snd_pcm_ioplug_drain(snd_pcm_t *pcm) { ioplug_priv_t *io = pcm->private_data; - int err; + int err = 0; - if (io->data->state == SND_PCM_STATE_OPEN) + snd_pcm_lock(pcm); + switch (io->data->state) { + case SND_PCM_STATE_OPEN: + case SND_PCM_STATE_DISCONNECTED: + case SND_PCM_STATE_SUSPENDED: return -EBADFD; + case SND_PCM_STATE_PREPARED: + if (pcm->stream == SND_PCM_STREAM_PLAYBACK) { + err = snd_pcm_ioplug_start(pcm); + if (err < 0) + goto unlock; + io->data->state = SND_PCM_STATE_DRAINING; + } + break; + case SND_PCM_STATE_RUNNING: + io->data->state = SND_PCM_STATE_DRAINING; + break; + } - io->data->state = SND_PCM_STATE_DRAINING; - if (io->data->callback->drain) - io->data->callback->drain(io->data); - snd_pcm_lock(pcm); - err = snd_pcm_ioplug_drop(pcm); + if (io->data->state == SND_PCM_STATE_DRAINING) { + if (io->data->callback->drain) { + snd_pcm_unlock(pcm); /* let plugin own locking */ + err = io->data->callback->drain(io->data); + snd_pcm_lock(pcm); + } else { + err = ioplug_drain_via_poll(pcm); + } + } + + unlock: + if (!err && io->data->state != SND_PCM_STATE_SETUP) + snd_pcm_ioplug_drop(pcm); snd_pcm_unlock(pcm); return err; } -- 2.16.2

1 0

[alsa-devel] [PATCH - IOPLUG DRAIN 0/2]
by twischer＠de.adit-jv.com 29 Mar '18

29 Mar '18

Hi Takashi, > Why not poll()? > IOW, why ioplug must be handled specially regarding the non-blocking >operation? The normal kernel driver behaves like that (returning > -EAGAIN, and let apps to sync with poll()). What do you think about the following solution? (I thought the whole time that you have to use snd_pcm_wait() to wait for drain in nonblocking mode but you have to use the poll_descriptors directly.) Know I am expecting that the user is calling poll() if snd_pcm_drain() returns -EAGAIN and the user has to call snd_pcm_drain() again after poll returns to check if drain is done. Thanks for your help so far. Best regards Timo

3 19