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

Re: [alsa-devel] [PATCH] ASoC: fsl_esai: Add pm runtime function
by S.j. Wang 18 Apr '19

18 Apr '19

Hi > > On Thu, Apr 18, 2019 at 02:00:12AM -0700, Nicolin Chen wrote: > > On Thu, Apr 18, 2019 at 03:29:09AM +0000, S.j. Wang wrote: > > > > In imx8 when systerm enter suspend state, the power of subsystem > > > will be off, the clock enable state will be lost and register > > > configuration > > > Just for curiosity, we had similar situation on imx6sx, so we added > > suspend/resume with regcache. Why will the clock enable state be lost > > too? Does CCM on imx8 (might not be called CCM > > though) have any difference? What about clock rate settings? > > That sounds like a bug somewhere else - I'd expect that after resume the > clocking would be restored to the state it was in before suspend. There is limitation in our internal design. That is in imx8 the power of subsystem will be disabled at suspend, include the clock state , clock rate. I should not add it in comments, please ignore them, I will change the description. This patch is to enable the pm runtime, so I think it is better to move the clock operation to pm runtime, and close the clock at suspend to reduce the power. Best regards Wang shengjiu

2 1

[alsa-devel] [PATCH] ASoC: fsl_esai: Add pm runtime function
by S.j. Wang 18 Apr '19

18 Apr '19

In imx8 when systerm enter suspend state, the power of subsystem will be off, the clock enable state will be lost and register configuration will be lost. So the driver need to enter runtime suspend state in suspend. With this implementation the suspend function almost same as runtime suspend function, so remove the suspend function, just use pm_runtime_force_suspend instead, and same for the resume function. And also need to move clock enablement to runtime resume and clock disablement to runtime suspend. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_esai.c | 141 ++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 64 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index bad0dfed6b68..b1e27db3752b 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/pm_runtime.h> #include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> @@ -466,30 +467,6 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); - int ret; - - /* - * Some platforms might use the same bit to gate all three or two of - * clocks, so keep all clocks open/close at the same time for safety - */ - ret = clk_prepare_enable(esai_priv->coreclk); - if (ret) - return ret; - if (!IS_ERR(esai_priv->spbaclk)) { - ret = clk_prepare_enable(esai_priv->spbaclk); - if (ret) - goto err_spbaclk; - } - if (!IS_ERR(esai_priv->extalclk)) { - ret = clk_prepare_enable(esai_priv->extalclk); - if (ret) - goto err_extalck; - } - if (!IS_ERR(esai_priv->fsysclk)) { - ret = clk_prepare_enable(esai_priv->fsysclk); - if (ret) - goto err_fsysclk; - } if (!dai->active) { /* Set synchronous mode */ @@ -506,16 +483,6 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, return 0; -err_fsysclk: - if (!IS_ERR(esai_priv->extalclk)) - clk_disable_unprepare(esai_priv->extalclk); -err_extalck: - if (!IS_ERR(esai_priv->spbaclk)) - clk_disable_unprepare(esai_priv->spbaclk); -err_spbaclk: - clk_disable_unprepare(esai_priv->coreclk); - - return ret; } static int fsl_esai_hw_params(struct snd_pcm_substream *substream, @@ -576,20 +543,6 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream, return 0; } -static void fsl_esai_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); - - if (!IS_ERR(esai_priv->fsysclk)) - clk_disable_unprepare(esai_priv->fsysclk); - if (!IS_ERR(esai_priv->extalclk)) - clk_disable_unprepare(esai_priv->extalclk); - if (!IS_ERR(esai_priv->spbaclk)) - clk_disable_unprepare(esai_priv->spbaclk); - clk_disable_unprepare(esai_priv->coreclk); -} - static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { @@ -658,7 +611,6 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, static const struct snd_soc_dai_ops fsl_esai_dai_ops = { .startup = fsl_esai_startup, - .shutdown = fsl_esai_shutdown, .trigger = fsl_esai_trigger, .hw_params = fsl_esai_hw_params, .set_sysclk = fsl_esai_set_dai_sysclk, @@ -947,6 +899,10 @@ static int fsl_esai_probe(struct platform_device *pdev) return ret; } + pm_runtime_enable(&pdev->dev); + + regcache_cache_only(esai_priv->regmap, true); + ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE); if (ret) dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret); @@ -954,6 +910,13 @@ static int fsl_esai_probe(struct platform_device *pdev) return ret; } +static int fsl_esai_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + + return 0; +} + static const struct of_device_id fsl_esai_dt_ids[] = { { .compatible = "fsl,imx35-esai", }, { .compatible = "fsl,vf610-esai", }, @@ -961,23 +924,37 @@ static int fsl_esai_probe(struct platform_device *pdev) }; MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids); -#ifdef CONFIG_PM_SLEEP -static int fsl_esai_suspend(struct device *dev) -{ - struct fsl_esai *esai = dev_get_drvdata(dev); - - regcache_cache_only(esai->regmap, true); - regcache_mark_dirty(esai->regmap); - - return 0; -} - -static int fsl_esai_resume(struct device *dev) +#ifdef CONFIG_PM +static int fsl_esai_runtime_resume(struct device *dev) { struct fsl_esai *esai = dev_get_drvdata(dev); int ret; + /* + * Some platforms might use the same bit to gate all three or two of + * clocks, so keep all clocks open/close at the same time for safety + */ + ret = clk_prepare_enable(esai->coreclk); + if (ret) + return ret; + if (!IS_ERR(esai->spbaclk)) { + ret = clk_prepare_enable(esai->spbaclk); + if (ret) + goto err_spbaclk; + } + if (!IS_ERR(esai->extalclk)) { + ret = clk_prepare_enable(esai->extalclk); + if (ret) + goto err_extalclk; + } + if (!IS_ERR(esai->fsysclk)) { + ret = clk_prepare_enable(esai->fsysclk); + if (ret) + goto err_fsysclk; + } + regcache_cache_only(esai->regmap, false); + regcache_mark_dirty(esai->regmap); /* FIFO reset for safety */ regmap_update_bits(esai->regmap, REG_ESAI_TFCR, @@ -987,22 +964,58 @@ static int fsl_esai_resume(struct device *dev) ret = regcache_sync(esai->regmap); if (ret) - return ret; + goto err_regcache_sync; /* FIFO reset done */ regmap_update_bits(esai->regmap, REG_ESAI_TFCR, ESAI_xFCR_xFR, 0); regmap_update_bits(esai->regmap, REG_ESAI_RFCR, ESAI_xFCR_xFR, 0); return 0; + +err_regcache_sync: + if (!IS_ERR(esai->fsysclk)) + clk_disable_unprepare(esai->fsysclk); +err_fsysclk: + if (!IS_ERR(esai->extalclk)) + clk_disable_unprepare(esai->extalclk); +err_extalclk: + if (!IS_ERR(esai->spbaclk)) + clk_disable_unprepare(esai->spbaclk); +err_spbaclk: + clk_disable_unprepare(esai->coreclk); + + return ret; +} + +static int fsl_esai_runtime_suspend(struct device *dev) +{ + struct fsl_esai *esai = dev_get_drvdata(dev); + + regcache_cache_only(esai->regmap, true); + + if (!IS_ERR(esai->fsysclk)) + clk_disable_unprepare(esai->fsysclk); + if (!IS_ERR(esai->extalclk)) + clk_disable_unprepare(esai->extalclk); + if (!IS_ERR(esai->spbaclk)) + clk_disable_unprepare(esai->spbaclk); + clk_disable_unprepare(esai->coreclk); + + return 0; } -#endif /* CONFIG_PM_SLEEP */ +#endif /* CONFIG_PM */ static const struct dev_pm_ops fsl_esai_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(fsl_esai_suspend, fsl_esai_resume) + SET_RUNTIME_PM_OPS(fsl_esai_runtime_suspend, + fsl_esai_runtime_resume, + NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; static struct platform_driver fsl_esai_driver = { .probe = fsl_esai_probe, + .remove = fsl_esai_remove, .driver = { .name = "fsl-esai-dai", .pm = &fsl_esai_pm_ops, -- 1.9.1

3 2

Re: [alsa-devel] [PATCH V3 1/2] ASoC: fsl_asrc: replace the process_option table with function
by S.j. Wang 18 Apr '19

18 Apr '19

Hi > > > On Thu, Apr 18, 2019 at 02:37:03AM +0000, S.j. Wang wrote: > > > Here: > > > > + /* Does not support cases: Tsout > 8.125 * Tsin */ > > > > + if (inrate * 8 > 65 * outrate) > > Though it might not matter any more (see my last comments), it should be > "inrate > 8.125 * outrate" in the comments. > > > > > + return -EINVAL; > > > And here: > > > > + ret = fsl_asrc_sel_proc(inrate, outrate, &pre_proc, &post_proc); > > > > + if (ret) { > > > > + pair_err("No supported pre-processing options\n"); > > > > + return ret; > > > > + } > > > > > > Instead of a general message, I was thinking of a more specific one > > > by telling users that the ratio between the two rates isn't > > > supported -- something similar to what I suggested previously: > > > > > > pair_err("Does not support %d (input) > 8.125 * %d (output)\n", > > > outrate, inrate); > > > > > > In fsl_asrc_sel_proc, we can't call the pair_err for there is no > > struct fsl_asrc_pair *pair in the argument. Do you think we need to > > add this argument? > > I's thinking of adding it to the top of fsl_asrc_config_pair() as a part of > inrate-outrate-validation, however, I found that actually we already have a > similar check in the early routine: > if ((outrate > 8000 && outrate < 30000) && > (outrate/inrate > 24 || inrate/outrate > 8)) { > pair_err("exceed supported ratio range [1/24, 8] for \ > inrate/outrate: %d/%d\n", inrate, outrate); > return -EINVAL; > } > > And this is according to IMX6DQRM: > Limited support for the case when output sampling rates is > between 8kHz and 30kHz. The limitation is the supported ratio > (Fsin/Fsout) range as between 1/24 to 8 > > This should cover your 8.125 condition already, even if having an outrate > range between [8KHz, 30KHz] check, since an outrate above 30KHz will not > have an inrate bigger than 8.125 times of it, given the maximum input rate > is 192KHz. > > So I think that we can just drop that 8.125 condition from your change and > there's no need to error out any more. > No, if outrate=8kHz, inrate > 88.2kHz, these cases are not supported. This is not covered by if ((outrate > 8000 && outrate < 30000) && (outrate/inrate > 24 || inrate/outrate > 8)) { > However, we do need a patch to fix a potential rounding issue: > - (outrate/inrate > 24 || inrate/outrate > 8)) { > + (outrate > 24 * inrate || inrate > 8 * outrate)) { > > Should fix the missing whitespace also. And it will be needed to send to > stable kernel too. Will you help submit a change? > > Thanks

2 1

Re: [alsa-devel] [PATCH V3 1/2] ASoC: fsl_asrc: replace the process_option table with function
by S.j. Wang 18 Apr '19

18 Apr '19

Hi > > Hi Shengjiu, > > This looks better. Just a couple of more small comments inline. > > On Wed, Apr 17, 2019 at 09:06:18AM +0000, S.j. Wang wrote: > > > +static int fsl_asrc_sel_proc(int inrate, int outrate, int *pre_proc, > > + int *post_proc) > > Just a nit: it looks better by grouping them two-two. > > static int fsl_asrc_sel_proc(int inrate, int outrate, > int *pre_proc, int *post_proc) > > > + /* Condition for selection of post-processing */ > > + post_proc_cond2 = (inrate * 15 > outrate * 16 && outrate < 56000) || > > + (inrate > 56000 && outrate < 56000); > > Could align the indentation: > post_proc_cond2 = (inrate * 15 > outrate * 16 && outrate < 56000) || > (inrate > 56000 && outrate < 56000); > > Here: > > + /* Does not support cases: Tsout > 8.125 * Tsin */ > > + if (inrate * 8 > 65 * outrate) > > + return -EINVAL; > And here: > > + ret = fsl_asrc_sel_proc(inrate, outrate, &pre_proc, &post_proc); > > + if (ret) { > > + pair_err("No supported pre-processing options\n"); > > + return ret; > > + } > > Instead of a general message, I was thinking of a more specific one by > telling users that the ratio between the two rates isn't supported -- > something similar to what I suggested previously: > > pair_err("Does not support %d (input) > 8.125 * %d (output)\n", > outrate, inrate); > In fsl_asrc_sel_proc, we can't call the pair_err for there is no struct fsl_asrc_pair *pair in the argument. Do you think we need to add this argument? > Thanks > Nicolin

2 1

[alsa-devel] alsa return codes
by Hector Valdez 18 Apr '19

18 Apr '19

Hi, I am trying to figure out what the error/return codes are for ALSA (advanced linux sound architecture). I have had no luck searching the web. I am seeing the below messages: arecord0 has exited with return code -12. arecord1 has exited with return code -12. aplay has exited with return code -12. Thanks, Hector

3 2

[alsa-devel] [ALSA] feb689025f: WARNING:possible_recursive_locking_detected
by kernel test robot 18 Apr '19

18 Apr '19

FYI, we noticed the following commit (built with gcc-5): commit: feb689025fbb6f0aa6297d3ddf97de945ea4ad32 ("ALSA: seq: Protect in-kernel ioctl calls with mutex") https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git for-next in testcase: trinity with following parameters: runtime: 300s test-description: Trinity is a linux system call fuzz tester. test-url: http://codemonkey.org.uk/projects/trinity/ on test machine: qemu-system-x86_64 -enable-kvm -cpu SandyBridge -smp 2 -m 8G caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace): +-------------------------------------------------+------------+------------+ | | f823b8a755 | feb689025f | +-------------------------------------------------+------------+------------+ | boot_successes | 0 | 0 | | boot_failures | 8 | 4 | | BUG:kernel_reboot-without-warning_in_test_stage | 8 | | | WARNING:possible_recursive_locking_detected | 0 | 4 | +-------------------------------------------------+------------+------------+ If you fix the issue, kindly add following tag Reported-by: kernel test robot <rong.a.chen(a)intel.com> [ 17.585148] WARNING: possible recursive locking detected [ 17.585148] 5.1.0-rc1-00023-gfeb6890 #1 Not tainted [ 17.585148] -------------------------------------------- [ 17.585148] modprobe/226 is trying to acquire lock: [ 17.585148] (____ptrval____) (&client->ioctl_mutex){+.+.}, at: snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] [ 17.585148] but task is already holding lock: [ 17.585148] (____ptrval____) (&client->ioctl_mutex){+.+.}, at: snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] [ 17.585148] other info that might help us debug this: [ 17.585148] Possible unsafe locking scenario: [ 17.585148] [ 17.585148] CPU0 [ 17.585148] ---- [ 17.585148] lock(&client->ioctl_mutex); [ 17.585148] lock(&client->ioctl_mutex); [ 17.585148] [ 17.585148] *** DEADLOCK *** [ 17.585148] [ 17.585148] May be due to missing lock nesting notation [ 17.585148] [ 17.585148] 2 locks held by modprobe/226: [ 17.585148] #0: (____ptrval____) (&client->ioctl_mutex){+.+.}, at: snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] #1: (____ptrval____) (&grp->list_mutex/1){.+.+}, at: snd_seq_deliver_event+0x1f3/0x260 [ 17.585148] [ 17.585148] stack backtrace: [ 17.585148] CPU: 0 PID: 226 Comm: modprobe Not tainted 5.1.0-rc1-00023-gfeb6890 #1 [ 17.585148] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 [ 17.585148] Call Trace: [ 17.585148] __lock_acquire+0x2de/0x1120 [ 17.585148] lock_acquire+0xae/0x150 [ 17.585148] ? snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] ? snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] __mutex_lock+0x73/0x590 [ 17.585148] ? snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] ? snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] ? snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] snd_seq_kernel_client_ctl+0x71/0x90 [ 17.585148] receive_announce+0x40/0x60 [ 17.585148] receive_announce+0x35/0x40 [ 17.585148] snd_seq_deliver_single_event+0x101/0x210 [ 17.585148] snd_seq_deliver_event+0x11e/0x260 [ 17.585148] snd_seq_kernel_client_dispatch+0x5f/0x70 [ 17.585148] snd_seq_system_broadcast+0x62/0x70 [ 17.585148] snd_seq_ioctl_create_port+0x65/0x110 [ 17.585148] snd_seq_kernel_client_ctl+0x7a/0x90 [ 17.585148] create_port+0x10d/0x136 [snd_seq_dummy] [ 17.585148] ? dummy_free+0x10/0x10 [snd_seq_dummy] [ 17.585148] ? 0xffffffffa0000000 [ 17.585148] alsa_seq_dummy_init+0x4f/0xeca [snd_seq_dummy] [ 17.585148] ? create_port+0x136/0x136 [snd_seq_dummy] [ 17.585148] do_one_initcall+0x66/0x234 [ 17.585148] ? do_init_module+0x21/0x43d [ 17.585148] ? rcu_read_lock_sched_held+0x2e/0x60 [ 17.585148] ? kmem_cache_alloc_trace+0x172/0x280 [ 17.585148] ? do_init_module+0x21/0x43d [ 17.585148] do_init_module+0x58/0x43d [ 17.585148] load_module+0x15cb/0x1b50 [ 17.585148] ? kernel_read+0x25/0x40 [ 17.585148] ? __do_sys_finit_module+0xa8/0xb0 [ 17.585148] __do_sys_finit_module+0xa8/0xb0 [ 17.585148] do_syscall_64+0x4b/0x4c0 [ 17.585148] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 17.585148] RIP: 0033:0x7f52758cb229 [ 17.585148] Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 3f 4c 2b 00 f7 d8 64 89 01 48 [ 17.585148] RSP: 002b:00007ffdbeb1a4a8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 17.585148] RAX: ffffffffffffffda RBX: 000055620d2944d0 RCX: 00007f52758cb229 [ 17.585148] RDX: 0000000000000000 RSI: 000055620c571638 RDI: 0000000000000000 [ 17.585148] RBP: 000055620c571638 R08: 0000000000000000 R09: 000055620d293290 [ 17.585148] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 [ 17.585148] R13: 000055620d294580 R14: 0000000000040000 R15: 0000000000000000 [ 17.758439] Segment Routing with IPv6 [ 17.760350] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver [ 17.763895] 9pnet: Installing 9P2000 support [ 17.766159] start plist test [ 17.770969] end plist test [ 17.773352] ... APIC ID: 00000000 (0) [ 17.774143] ... APIC VERSION: 00050014 [ 17.774143] 0000000000000000000000000000000000000000000000000000000000000000 [ 17.774143] 0000000000000000000000000000000000000000000000000000000000000000 [ 17.774143] 0000000000000000000000000000000000000000000000000000000000001000 [ 17.786873] number of MP IRQ sources: 15. [ 17.800175] number of IO-APIC #0 registers: 24. [ 17.802406] testing the IO APIC....................... [ 17.804942] IO APIC #0...... [ 17.806554] .... register #00: 00000000 [ 17.808477] ....... : physical APIC id: 00 [ 17.820300] ....... : Delivery Type: 0 [ 17.822419] ....... : LTS : 0 [ 17.824383] .... register #01: 00170011 [ 17.826323] ....... : max redirection entries: 17 [ 17.828826] ....... : PRQ implemented: 0 [ 17.843383] ....... : IO APIC version: 11 [ 17.845625] .... register #02: 00000000 [ 17.847635] ....... : arbitration: 00 [ 17.849577] .... IRQ redirection table: [ 17.851562] IOAPIC 0: [ 17.852949] pin00, disabled, edge , high, V(00), IRR(0), S(0), physical, D(00), M(0) [ 17.858011] pin01, enabled , edge , high, V(22), IRR(0), S(0), physical, D(00), M(0) [ 17.861853] pin02, enabled , edge , high, V(30), IRR(0), S(0), physical, D(00), M(0) [ 17.875020] pin03, disabled, edge , high, V(00), IRR(0), S(0), physical, D(00), M(0) To reproduce: # build kernel cd linux cp config-5.1.0-rc1-00023-gfeb6890 .config make HOSTCC=gcc-5 CC=gcc-5 ARCH=x86_64 olddefconfig make HOSTCC=gcc-5 CC=gcc-5 ARCH=x86_64 prepare make HOSTCC=gcc-5 CC=gcc-5 ARCH=x86_64 modules_prepare make HOSTCC=gcc-5 CC=gcc-5 ARCH=x86_64 SHELL=/bin/bash make HOSTCC=gcc-5 CC=gcc-5 ARCH=x86_64 bzImage git clone https://github.com/intel/lkp-tests.git cd lkp-tests bin/lkp qemu -k <bzImage> job-script # job-script is attached in this email Thanks, Rong Chen

2 1

[alsa-devel] [PATCH 0/7][RFC] ASoC: modern style CPU
by Kuninori Morimoto 18 Apr '19

18 Apr '19

Hi Mark These are RFC of modern style CPU support. modern style dai_link needs CPU/Codec/Platform array and its size, but it will be very ugly code. To avoid it, 3) adds macro. 4) - 7) are sample code for switching to modern style dai_link. 4), 5) are good sample for single CPU/Codec/Platform. 6), 7) are good sample for multi Codec. Almost all sound cards will get similar patch. I think these can work, but I can't test these. So, it is very useful if someone can test these. If these are all OK (= test/review), I can post patch-set for all sound cards. 1) ASoC: soc-core: use snd_soc_dai_link_component for CPU 2) ASoC: simple-card: support snd_soc_dai_link_component style for cpu 3) ASoC: soc.h: add sound dai_link connection macro 4) ASoC: samsung: smdk_wm8580: use modern dai_link style 5) ASoC: samsung: smdk_wm8994: use modern dai_link style 6) ASoC: mediatek: mt8173-rt5650-rt5676: use modern dai_link style 7) ASoC: mediatek: mt8173-rt5650-rt5514: use modern dai_link style Thank you for your help !! Best regards --- Kuninori Morimoto

3 16

[alsa-devel] [PATCH -next] ALSA: ps3: Remove set but not used variables 'start_vaddr' and 'pcm_index'
by Yue Haibing 17 Apr '19

17 Apr '19

From: YueHaibing <yuehaibing(a)huawei.com> Fixes gcc '-Wunused-but-set-variable' warnings: sound/ppc/snd_ps3.c: In function 'snd_ps3_program_dma': sound/ppc/snd_ps3.c:236:8: warning: variable 'start_vaddr' set but not used [-Wunused-but-set-variable] sound/ppc/snd_ps3.c: In function 'snd_ps3_pcm_open': sound/ppc/snd_ps3.c:529:6: warning: variable 'pcm_index' set but not used [-Wunused-but-set-variable] They are never used and can be removed. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/ppc/snd_ps3.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 521236e..f77a0d5 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -233,7 +233,6 @@ static int snd_ps3_program_dma(struct snd_ps3_card_info *card, int fill_stages, dma_ch, stage; enum snd_ps3_ch ch; uint32_t ch0_kick_event = 0; /* initialize to mute gcc */ - void *start_vaddr; unsigned long irqsave; int silent = 0; @@ -257,7 +256,6 @@ static int snd_ps3_program_dma(struct snd_ps3_card_info *card, fill_stages = 4; spin_lock_irqsave(&card->dma_lock, irqsave); for (ch = 0; ch < 2; ch++) { - start_vaddr = card->dma_next_transfer_vaddr[0]; for (stage = 0; stage < fill_stages; stage++) { dma_ch = stage * 2 + ch; if (silent) @@ -526,9 +524,7 @@ static int snd_ps3_pcm_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_ps3_card_info *card = snd_pcm_substream_chip(substream); - int pcm_index; - pcm_index = substream->pcm->device; /* to retrieve substream/runtime in interrupt handler */ card->substream = substream; -- 2.7.4

3 2

[alsa-devel] [PATCH V3 0/2] Support more sample rate in asrc
by S.j. Wang 17 Apr '19

17 Apr '19

Support more sample rate in asrc Shengjiu Wang (2): ASoC: fsl_asrc: replace the process_option table with function ASoC: fsl_asrc: Unify the supported input and output rate Changes in v3 - remove FSL_ASRC_RATES - refine fsl_asrc_sel_proc according to comments Changes in v2 - add more comments in code - add commit "Unify the supported input and output rate" sound/soc/fsl/fsl_asrc.c | 108 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 32 deletions(-) -- 1.9.1

2 3

[alsa-devel] [PATCH 1/2] dt-bindings: sound: Convert Allwinner SPDIF binding to YAML
by Maxime Ripard 17 Apr '19

17 Apr '19

The Allwinner SoCs feature an SPDIF controller across multiple SoC generations. However, earlier generations were a bit simpler than the subsequent ones, and for example would always have RX and TX capabilities, and no reset lines. In order to express this, let's create two YAML schemas instead of the free form text we had before. Signed-off-by: Maxime Ripard <maxime.ripard(a)bootlin.com> --- Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- Documentation/devicetree/bindings/sound/allwinner,sun6i-a31-spdif.yaml | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt | 42 +----------------------------------- 3 files changed, 159 insertions(+), 42 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun6i-a31-spdif.yaml delete mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml new file mode 100644 index 000000000000..f2e97f250519 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml @@ -0,0 +1,73 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/allwinner,sun4i-a10-spdif.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A10 S/PDIF Controller Device Tree Bindings + +maintainers: + - Chen-Yu Tsai <wens(a)csie.org> + - Liam Girdwood <lgirdwood(a)gmail.com> + - Mark Brown <broonie(a)kernel.org> + - Maxime Ripard <maxime.ripard(a)bootlin.com> + +properties: + "#sound-dai-cells": + const: 0 + + compatible: + const: allwinner,sun4i-a10-spdif + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: apb + - const: spdif + + dmas: + items: + - description: RX DMA Channel + - description: TX DMA Channel + + dma-names: + items: + - const: rx + - const: tx + +required: + - "#sound-dai-cells" + - compatible + - reg + - interrupts + - clocks + - clock-names + - dmas + - dma-names + +additionalProperties: false + +examples: + - | + spdif: spdif@1c21000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun4i-a10-spdif"; + reg = <0x01c21000 0x40>; + interrupts = <13>; + clocks = <&apb0_gates 1>, <&spdif_clk>; + clock-names = "apb", "spdif"; + dmas = <&dma 0 2>, <&dma 0 2>; + dma-names = "rx", "tx"; + }; + +... diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun6i-a31-spdif.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun6i-a31-spdif.yaml new file mode 100644 index 000000000000..7329d9fcf34c --- /dev/null +++ b/Documentation/devicetree/bindings/sound/allwinner,sun6i-a31-spdif.yaml @@ -0,0 +1,86 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/allwinner,sun6i-a31-spdif.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner A31 S/PDIF Controller Device Tree Bindings + +maintainers: + - Chen-Yu Tsai <wens(a)csie.org> + - Liam Girdwood <lgirdwood(a)gmail.com> + - Mark Brown <broonie(a)kernel.org> + - Maxime Ripard <maxime.ripard(a)bootlin.com> + +properties: + "#sound-dai-cells": + const: 0 + + compatible: + oneOf: + - const: allwinner,sun6i-a31-spdif + - const: allwinner,sun8i-h3-spdif + - items: + - const: allwinner,sun8i-a83t-spdif + - const: allwinner,sun8i-h3-spdif + - items: + - const: allwinner,sun50i-a64-spdif + - const: allwinner,sun8i-h3-spdif + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: apb + - const: spdif + + dmas: + items: + - description: RX DMA Channel + - description: TX DMA Channel + + dma-names: + items: + - const: rx + - const: tx + + resets: + maxItems: 1 + +required: + - "#sound-dai-cells" + - compatible + - reg + - interrupts + - clocks + - clock-names + - dmas + - dma-names + - resets + +additionalProperties: false + +examples: + - | + spdif: spdif@1c21000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun6i-a31-spdif"; + reg = <0x01c21000 0x400>; + interrupts = <0 12 4>; + clocks = <&ccu 62>, <&ccu 99>; + clock-names = "apb", "spdif"; + resets = <&ccu 43>; + dmas = <&dma 2>, <&dma 2>; + dma-names = "rx", "tx"; + }; + +... diff --git a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt b/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt deleted file mode 100644 index 0c64a209c2e9..000000000000 --- a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt +++ /dev/null @@ -1,42 +0,0 @@ -Allwinner Sony/Philips Digital Interface Format (S/PDIF) Controller - -The Allwinner S/PDIF audio block is a transceiver that allows the -processor to receive and transmit digital audio via an coaxial cable or -a fibre cable. -For now only playback is supported. - -Required properties: - - - compatible : should be one of the following: - - "allwinner,sun4i-a10-spdif": for the Allwinner A10 SoC - - "allwinner,sun6i-a31-spdif": for the Allwinner A31 SoC - - "allwinner,sun8i-h3-spdif": for the Allwinner H3 SoC - - - reg : Offset and length of the register set for the device. - - - interrupts : Contains the spdif interrupt. - - - dmas : Generic dma devicetree binding as described in - Documentation/devicetree/bindings/dma/dma.txt. - - - dma-names : Two dmas have to be defined, "tx" and "rx". - - - clocks : Contains an entry for each entry in clock-names. - - - clock-names : Includes the following entries: - "apb" clock for the spdif bus. - "spdif" clock for spdif controller. - - - resets : reset specifier for the ahb reset (A31 and newer only) - -Example: - -spdif: spdif@1c21000 { - compatible = "allwinner,sun4i-a10-spdif"; - reg = <0x01c21000 0x40>; - interrupts = <13>; - clocks = <&apb0_gates 1>, <&spdif_clk>; - clock-names = "apb", "spdif"; - dmas = <&dma 0 2>, <&dma 0 2>; - dma-names = "rx", "tx"; -}; base-commit: f9221a7a1014d8a047b277a73289678646ddc110 -- git-series 0.9.1

2 9