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

[alsa-devel] [PATCH v3 1/6] ASoC: amd:Create multiple I2S platform device endpoints
by Ravulapati Vishnu vardhan rao 07 Nov '19

07 Nov '19

Creates Platform Device endpoints for multiple I2S instances: SP and BT endpoints device. Pass PCI resources like MMIO, irq to the platform devices. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x.h | 5 +++ sound/soc/amd/raven/pci-acp3x.c | 78 +++++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..2f15fe1 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,10 +7,15 @@ #include "chip_offset_byte.h" +#define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 #define ACP3x_REG_START 0x1240000 #define ACP3x_REG_END 0x1250200 +#define ACP3x_I2STDM_REG_START 0x1242400 +#define ACP3x_I2STDM_REG_END 0x1242410 +#define ACP3x_BT_TDM_REG_START 0x1242800 +#define ACP3x_BT_TDM_REG_END 0x1242810 #define I2S_MODE 0x04 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..fe37160c 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -16,16 +16,16 @@ struct acp3x_dev_data { void __iomem *acp3x_base; bool acp3x_audio_mode; struct resource *res; - struct platform_device *pdev; + struct platform_device *pdev[ACP3x_DEVS]; }; static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { int ret; - u32 addr, val; + u32 addr, val, i; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct platform_device_info pdevinfo[ACP3x_DEVS]; unsigned int irqflags; if (pci_enable_device(pci)) { @@ -68,7 +68,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, + sizeof(struct resource) * 4, GFP_KERNEL); if (!adata->res) { ret = -ENOMEM; @@ -80,28 +80,52 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->res[0].start = addr; adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); - adata->res[1].name = "acp3x_i2s_irq"; - adata->res[1].flags = IORESOURCE_IRQ; - adata->res[1].start = pci->irq; - adata->res[1].end = pci->irq; + adata->res[1].name = "acp3x_i2s_sp"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + + adata->res[2].name = "acp3x_i2s_bt"; + adata->res[2].flags = IORESOURCE_MEM; + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; + + adata->res[3].name = "acp3x_i2s_irq"; + adata->res[3].flags = IORESOURCE_IRQ; + adata->res[3].start = pci->irq; + adata->res[3].end = adata->res[3].start; adata->acp3x_audio_mode = ACP3x_I2S_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); - pdevinfo.name = "acp3x_rv_i2s"; - pdevinfo.id = 0; - pdevinfo.parent = &pci->dev; - pdevinfo.num_res = 2; - pdevinfo.res = adata->res; - pdevinfo.data = &irqflags; - pdevinfo.size_data = sizeof(irqflags); - - adata->pdev = platform_device_register_full(&pdevinfo); - if (IS_ERR(adata->pdev)) { - dev_err(&pci->dev, "cannot register %s device\n", - pdevinfo.name); - ret = PTR_ERR(adata->pdev); - goto unmap_mmio; + pdevinfo[0].name = "acp3x_rv_i2s_dma"; + pdevinfo[0].id = 0; + pdevinfo[0].parent = &pci->dev; + pdevinfo[0].num_res = 4; + pdevinfo[0].res = &adata->res[0]; + pdevinfo[0].data = &irqflags; + pdevinfo[0].size_data = sizeof(irqflags); + + pdevinfo[1].name = "acp3x_i2s_playcap"; + pdevinfo[1].id = 0; + pdevinfo[1].parent = &pci->dev; + pdevinfo[1].num_res = 1; + pdevinfo[1].res = &adata->res[1]; + + pdevinfo[2].name = "acp3x_i2s_playcap"; + pdevinfo[2].id = 1; + pdevinfo[2].parent = &pci->dev; + pdevinfo[2].num_res = 1; + pdevinfo[2].res = &adata->res[2]; + for (i = 0; i < ACP3x_DEVS ; i++) { + adata->pdev[i] = + platform_device_register_full(&pdevinfo[i]); + IS_ERR(adata->pdev[i]) { + dev_err(&pci->dev, "cannot register %s device\n", + pdevinfo[i].name); + ret = -ENODEV; + goto unmap_mmio; + } } break; default: @@ -113,6 +137,9 @@ static int snd_acp3x_probe(struct pci_dev *pci, unmap_mmio: pci_disable_msi(pci); + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + kfree(adata->res); iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); @@ -124,9 +151,13 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { + int i; struct acp3x_dev_data *adata = pci_get_drvdata(pci); - platform_device_unregister(adata->pdev); + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { + for (i = 0 ; i < ACP3x_DEVS ; i++) + platform_device_unregister(adata->pdev[i]); + } iounmap(adata->acp3x_base); pci_disable_msi(pci); @@ -151,6 +182,7 @@ static struct pci_driver acp3x_driver = { module_pci_driver(acp3x_driver); +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_DESCRIPTION("AMD ACP3x PCI driver"); MODULE_LICENSE("GPL v2"); -- 2.7.4

1 0

[alsa-devel] UCM extensions
by Jaroslav Kysela 07 Nov '19

07 Nov '19

Hi all, I make some internal ucm code cleanups in alsa-lib and added three major extensions to allow more complex configurations which we require for the SOF kernel driver. The first thing is the added substitution for the value strings: https://github.com/alsa-project/alsa-lib/commit/f1e637b285e8e04e6761248a070… The second thing is the If block: https://github.com/alsa-project/alsa-lib/commit/985715ce8148dc7ef62c8e3d8ce… The third thing is the card / hardware like specifier passed as the ucm name to snd_use_case_mgr_open() to support multiple card instances: https://github.com/alsa-project/alsa-lib/commit/60164fc5886cdc6ca55eeed0c2e… All those patches (with other cleanups) are in the ucm2 branch on github for comments: https://github.com/alsa-project/alsa-lib/commits/ucm2 The proposed SOF UCM config diff is here: https://github.com/alsa-project/alsa-ucm-conf/commit/723b6da881721488229154… https://github.com/alsa-project/alsa-ucm-conf/commits/ucm2 I added everything to keep the interface backward compatible, so the current applications should not observe any different behavior. The applications like pulseaudio should use the 'hw:CARD_INDEX' specifier for the open call in the future and snd_use_case_parse_ctl_elem_id() helper for the element control names. If you have another ideas to address those issues, please, let me know. BTW, Mark: The SOF UCM configs relies on the driver name changes, so it might be worth to send "ASoC: intel - fix the card names" patch to 5.4 to make things stable more quickly: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?h… Thanks, Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

6 16

[alsa-devel] [PATCH] ASoC: SOF: topology: Fix bytes control size checks
by Pierre-Louis Bossart 07 Nov '19

07 Nov '19

From: Dragos Tarcatu <dragos_tarcatu(a)mentor.com> When using the example SOF amp widget topology, KASAN dumps this when the AMP bytes kcontrol gets loaded: [ 9.579548] BUG: KASAN: slab-out-of-bounds in sof_control_load+0x8cc/0xac0 [snd_sof] [ 9.588194] Write of size 40 at addr ffff8882314559dc by task systemd-udevd/2411 Fix that by rejecting the topology if the bytes data size > max_size Fixes: 311ce4fe7637d ("ASoC: SOF: Add support for loading topologies") Reviewed-by: Jaska Uimonen <jaska.uimonen(a)intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Dragos Tarcatu <dragos_tarcatu(a)mentor.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/topology.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 17fe6a1d5f3e..6096731e89ce 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1048,15 +1048,16 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp, struct soc_bytes_ext *sbe = (struct soc_bytes_ext *)kc->private_value; int max_size = sbe->max; - if (le32_to_cpu(control->priv.size) > max_size) { + /* init the get/put bytes data */ + scontrol->size = sizeof(struct sof_ipc_ctrl_data) + + le32_to_cpu(control->priv.size); + + if (scontrol->size > max_size) { dev_err(sdev->dev, "err: bytes data size %d exceeds max %d.\n", - control->priv.size, max_size); + scontrol->size, max_size); return -EINVAL; } - /* init the get/put bytes data */ - scontrol->size = sizeof(struct sof_ipc_ctrl_data) + - le32_to_cpu(control->priv.size); scontrol->control_data = kzalloc(max_size, GFP_KERNEL); cdata = scontrol->control_data; if (!scontrol->control_data) -- 2.20.1

2 6

[alsa-devel] [PATCH] ASoC: fsi: switch to yaml base Documentation
by Kuninori Morimoto 07 Nov '19

07 Nov '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch switches from .txt base to .yaml base Document for FSI. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- .../devicetree/bindings/sound/renesas,fsi.txt | 31 --------- .../devicetree/bindings/sound/renesas,fsi.yaml | 76 ++++++++++++++++++++++ 2 files changed, 76 insertions(+), 31 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.txt create mode 100644 Documentation/devicetree/bindings/sound/renesas,fsi.yaml diff --git a/Documentation/devicetree/bindings/sound/renesas,fsi.txt b/Documentation/devicetree/bindings/sound/renesas,fsi.txt deleted file mode 100644 index 0cf0f81..0000000 --- a/Documentation/devicetree/bindings/sound/renesas,fsi.txt +++ /dev/null @@ -1,31 +0,0 @@ -Renesas FSI - -Required properties: -- compatible : "renesas,fsi2-<soctype>", - "renesas,sh_fsi2" or "renesas,sh_fsi" as - fallback. - Examples with soctypes are: - - "renesas,fsi2-r8a7740" (R-Mobile A1) - - "renesas,fsi2-sh73a0" (SH-Mobile AG5) -- reg : Should contain the register physical address and length -- interrupts : Should contain FSI interrupt - -- fsia,spdif-connection : FSI is connected by S/PDIF -- fsia,stream-mode-support : FSI supports 16bit stream mode. -- fsia,use-internal-clock : FSI uses internal clock when master mode. - -- fsib,spdif-connection : same as fsia -- fsib,stream-mode-support : same as fsia -- fsib,use-internal-clock : same as fsia - -Example: - -sh_fsi2: sh_fsi2@ec230000 { - compatible = "renesas,sh_fsi2"; - reg = <0xec230000 0x400>; - interrupts = <0 146 0x4>; - - fsia,spdif-connection; - fsia,stream-mode-support; - fsia,use-internal-clock; -}; diff --git a/Documentation/devicetree/bindings/sound/renesas,fsi.yaml b/Documentation/devicetree/bindings/sound/renesas,fsi.yaml new file mode 100644 index 0000000..140a37f --- /dev/null +++ b/Documentation/devicetree/bindings/sound/renesas,fsi.yaml @@ -0,0 +1,76 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/renesas,fsi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Renesas FSI Sound Driver Device Tree Bindings + +maintainers: + - Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> + +properties: + $nodename: + pattern: "^sound@.*" + + compatible: + oneOf: + # for FSI2 SoC + - items: + - enum: + - renesas,fsi2-sh73a0 + - renesas,fsi2-r8a7740 + - enum: + - renesas,sh_fsi2 + # for Generic + - items: + - enum: + - renesas,sh_fsi + - renesas,sh_fsi2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + fsia,spdif-connection: + $ref: /schemas/types.yaml#/definitions/flag + description: FSI is connected by S/PDIF + + fsia,stream-mode-support: + $ref: /schemas/types.yaml#/definitions/flag + description: FSI supports 16bit stream mode + + fsia,use-internal-clock: + $ref: /schemas/types.yaml#/definitions/flag + description: FSI uses internal clock when master mode + + fsib,spdif-connection: + $ref: /schemas/types.yaml#/definitions/flag + description: same as fsia + + fsib,stream-mode-support: + $ref: /schemas/types.yaml#/definitions/flag + description: same as fsia + + fsib,use-internal-clock: + $ref: /schemas/types.yaml#/definitions/flag + description: same as fsia + +required: + - compatible + - reg + - interrupts + +examples: + - | + sh_fsi2: sound@ec230000 { + compatible = "renesas,fsi2-r8a7740", "renesas,sh_fsi2"; + reg = <0xec230000 0x400>; + interrupts = <0 146 0x4>; + + fsia,spdif-connection; + fsia,stream-mode-support; + fsia,use-internal-clock; + }; -- 2.7.4

3 2

[alsa-devel] [GIT PULL] ASoC fixes for v5.4
by Mark Brown 07 Nov '19

07 Nov '19

The following changes since commit 95a32c98055f664f9b3f34c41e153d4dcedd0eff: ASoC: SOF: control: return true when kcontrol values change (2019-10-18 18:09:22 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.4-rc6 for you to fetch changes up to 9508ef5a980f5d847cad9b932b6ada8f2a3466c1: ASoC: SOF: topology: Fix bytes control size checks (2019-11-06 15:31:12 +0000) ---------------------------------------------------------------- ASoC: Fixes for v5.4 These are a collection of fixes since v5.4-rc4 that have accumilated, they're all driver specific and there's nothing major in here so it's probably not essential to actually send them but I'll leave that call to you. ---------------------------------------------------------------- Actually I miseed the hdmi-codec fix, that one probably should be sent - I can split that out if needed (unfortunately it's in the middle of the branch due to a lack of topics...). Cheng-Yi Chiang (1): ASoC: rockchip: rockchip_max98090: Enable SHDN to fix headset detection Dragos Tarcatu (1): ASoC: SOF: topology: Fix bytes control size checks Jerome Brunet (1): ASoC: hdmi-codec: drop mutex locking again Jiada Wang (1): ASoC: rsnd: dma: fix SSI9 4/5/6/7 busif dma address Kai Vehmanen (1): ASoC: hdac_hda: fix race in device removal Keyon Jie (1): ASoC: SOF: Intel: hda-stream: fix the CONFIG_ prefix missing Navid Emamdoost (2): ASoC: SOF: Fix memory leak in sof_dfsentry_write ASoC: SOF: ipc: Fix memory leak in sof_set_get_large_ctrl_data Olivier Moysan (1): ASoC: stm32: sai: add restriction on mmap support Peter Ujfalusi (1): ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma names Russell King (2): ASoC: kirkwood: fix external clock probe defer ASoC: kirkwood: fix device remove ordering Stephan Gerhold (1): ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX Xiaojun Sang (1): ASoC: compress: fix unsigned integer overflow check Yong Zhi (1): ASoC: max98373: replace gpio_request with devm_gpio_request sound/core/compress_offload.c | 2 +- sound/soc/codecs/hdac_hda.c | 2 +- sound/soc/codecs/hdmi-codec.c | 12 +++++------- sound/soc/codecs/max98373.c | 4 ++-- sound/soc/codecs/msm8916-wcd-analog.c | 4 ++-- sound/soc/kirkwood/kirkwood-i2s.c | 11 ++++++----- sound/soc/rockchip/rockchip_max98090.c | 7 +++++-- sound/soc/sh/rcar/dma.c | 4 ++-- sound/soc/sof/debug.c | 6 ++++-- sound/soc/sof/intel/hda-stream.c | 4 ++-- sound/soc/sof/ipc.c | 4 +++- sound/soc/sof/topology.c | 11 ++++++----- sound/soc/stm/stm32_sai_sub.c | 12 +++++++++++- sound/soc/ti/sdma-pcm.c | 2 +- 14 files changed, 51 insertions(+), 34 deletions(-)

2 1

Re: [alsa-devel] ❌ FAIL: Test report for kernel 5.3.9-rc1-dfe283e.cki (stable)
by Jan Stancek 07 Nov '19

07 Nov '19

----- Original Message ----- > > Hello, > > We ran automated tests on a recent commit from this kernel tree: > > Kernel repo: > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git > Commit: dfe283e9fdac - Linux 5.3.9-rc1 > > The results of these automated tests are provided below. > > Overall result: FAILED (see details below) > Merge: OK > Compile: OK > Tests: FAILED > > All kernel binaries, config files, and logs are available for download here: > > https://artifacts.cki-project.org/pipelines/262380 > > One or more kernel tests failed: > > x86_64: > ❌ LTP lite > Not a 5.3 -stable regression. Failure comes from test that sanity checks all /proc files by doing 1k read from each. There are couple issues it hits wrt. snd_hda_*. Example reproducer: dd if=/sys/kernel/debug/regmap/hdaudioC0D3-hdaudio/access of=out.txt count=1 bs=1024 iflag=nonblock It's slow and triggers soft lockups [1]. And it also requires lot of memory, triggering OOMs on smaller VMs: 0x0000000024f0437b-0x000000001a32b1c8 1073745920 seq_read+0x131/0x400 pages=262144 vmalloc vpages N0=262144 I'm leaning towards skipping all regmap entries in this test. Comments are welcomed. Regards, Jan [1] [15341.137116] watchdog: BUG: soft lockup - CPU#2 stuck for 22s! [dd:636573] [15341.144141] Modules linked in: nls_utf8 isofs dummy minix binfmt_misc nfsv3 nfs_acl nfs lockd grace fscache sctp rds brd vfat fat btrfs xor zstd_compress raid6_pq zstd_decompress loop tu n ip6table_nat ip6_tables xt_conntrack iptable_filter xt_MASQUERADE xt_comment iptable_nat nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 veth bridge stp llc overlay fuse snd_hda_codec_r ealtek snd_hda_codec_generic sunrpc ledtrig_audio snd_hda_codec_hdmi snd_hda_intel snd_hda_codec edac_mce_amd kvm_amd snd_hda_core ccp snd_hwdep snd_pcm kvm snd_timer irqbypass joydev snd c rct10dif_pclmul crc32_pclmul soundcore broadcom bcm_phy_lib ghash_clmulni_intel sp5100_tco fam15h_power k10temp tg3 wmi_bmof pcspkr i2c_piix4 acpi_cpufreq ip_tables xfs libcrc32c radeon ata _generic i2c_algo_bit pata_acpi drm_kms_helper firewire_ohci ttm crc32c_intel serio_raw pata_atiixp firewire_core drm crc_itu_t wmi [last unloaded: can] [15341.223635] CPU: 2 PID: 636573 Comm: dd Tainted: G L 5.3.9-rc1-dfe283e.cki #1 [15341.232073] Hardware name: AMD Pike/Pike, BIOS RPK1506A 09/03/2014 [15341.238467] RIP: 0010:regmap_readable+0x15/0x60 [15341.242996] Code: 25 28 00 00 00 75 07 48 83 c4 10 5b 5d c3 e8 92 08 a6 ff 66 90 0f 1f 44 00 00 48 83 bf b0 01 00 00 00 74 31 8b 97 48 01 00 00 <39> f2 0f 92 c0 85 d2 0f 95 c2 20 d0 75 1 d 48 83 7f 70 00 74 01 c3 [15341.261765] RSP: 0018:ffffb3b100697dc8 EFLAGS: 00000282 ORIG_RAX: ffffffffffffff13 [15341.269330] RAX: 0000000000000000 RBX: ffff8d1a63773400 RCX: 0000000000000b41 [15341.276723] RDX: 000000000fffffff RSI: 000000000f3b4139 RDI: ffff8d1a63773400 [15341.283858] RBP: 000000000f3b4139 R08: 0000000000000000 R09: 0000000000000000 [15341.290989] R10: 000000000000000f R11: ffff8d19901fffff R12: 0000000000000079 [15341.298114] R13: 000000000f3b4139 R14: 00000000ffffffff R15: 000000000000006e [15341.305501] FS: 00007f4e067a0580(0000) GS:ffff8d1a6aa80000(0000) knlGS:0000000000000000 [15341.313583] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [15341.319322] CR2: 00007f5083682dc0 CR3: 00000001287dc000 CR4: 00000000000406e0 [15341.326462] Call Trace: [15341.328912] regmap_volatile+0x4f/0xa0 [15341.332667] regmap_access_show+0x70/0x100 [15341.336997] seq_read+0xcd/0x400 [15341.340247] full_proxy_read+0x57/0x70 [15341.343997] vfs_read+0x9d/0x150 [15341.347231] ksys_read+0x5f/0xe0 [15341.350473] do_syscall_64+0x5f/0x1a0 [15341.354166] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [15341.359216] RIP: 0033:0x7f4e066823c2 [15341.362795] Code: c0 e9 c2 fe ff ff 50 48 8d 3d c2 0d 0a 00 e8 b5 f1 01 00 0f 1f 44 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 0f 05 <48> 3d 00 f0 ff ff 77 56 c3 0f 1f 44 00 0 0 48 83 ec 28 48 89 54 24 [15341.381852] RSP: 002b:00007ffc6ad30e88 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 [15341.389427] RAX: ffffffffffffffda RBX: 0000000000000400 RCX: 00007f4e066823c2 [15341.396568] RDX: 0000000000000400 RSI: 0000561bc69f0000 RDI: 0000000000000000 [15341.403979] RBP: 0000561bc69f0000 R08: 0000561bc69efb60 R09: 00000000000000c0 [15341.411111] R10: 0000561bc69f0000 R11: 0000000000000246 R12: ffffffffffffffff [15341.418244] R13: 0000000000000000 R14: 0000000000000000 R15: ffffffffffffffff

4 9

[alsa-devel] [PATCH v2 0/2] Add definition for GPIO direction
by Matti Vaittinen 07 Nov '19

07 Nov '19

The patch series adds definitions for GPIO line directions. For occasional GPIO contributor like me it is always a pain to remember whether 1 or 0 was used for GPIO direction INPUT/OUTPUT. Judging the fact that I removed few comments like: /* Return 0 if output, 1 if input */ /* This means "out" */ return 1; /* input */ return 0; /* output */ it seems at least some others may find it hard to remember too. Adding defines for these values helps us who really have good - but short duration - memory :] This idea comes from RFC series for ROHM BD71828 PMIC and was initially discussed with Linus Walleij here: https://lore.kernel.org/lkml/c06725c3dd34118a324907137758d8b85b3d4043.camel… but as this has no dependencies to BD71828 work (which probably takes a while) I decided to make it independent series. Patches are compile-tested only. I have no HW to really test them. Thus I'd appreciate carefull review. This work is mainly about converting zeros and ones to the new defines but it wouldn't be first time I get it wrong. Changelog v2: - squashed patches 2-61 into patch 2. - dropped patch 62 (can be applied later) - rebased (cherry-picked) changes on top of GPIO devel branch. Patch 1: - adds the defines Patch 2: - convert drivers to use new defines This patch series is based on GPIO tree devel branch. --- Matti Vaittinen (2): gpio: Add definition for GPIO direction gpio: Use new GPIO_LINE_DIRECTION drivers/gpio/gpio-104-dio-48e.c | 5 ++++- drivers/gpio/gpio-104-idi-48.c | 2 +- drivers/gpio/gpio-104-idio-16.c | 4 ++-- drivers/gpio/gpio-74xx-mmio.c | 5 ++++- drivers/gpio/gpio-amd-fch.c | 2 +- drivers/gpio/gpio-aspeed.c | 7 +++---- drivers/gpio/gpio-bcm-kona.c | 6 +++--- drivers/gpio/gpio-bd70528.c | 8 +++++--- drivers/gpio/gpio-bd9571mwv.c | 4 +++- drivers/gpio/gpio-dln2.c | 6 +++--- drivers/gpio/gpio-exar.c | 5 ++++- drivers/gpio/gpio-f7188x.c | 5 ++++- drivers/gpio/gpio-gpio-mm.c | 5 ++++- drivers/gpio/gpio-htc-egpio.c | 5 ++++- drivers/gpio/gpio-ich.c | 5 ++++- drivers/gpio/gpio-kempld.c | 5 ++++- drivers/gpio/gpio-lp873x.c | 2 +- drivers/gpio/gpio-lp87565.c | 5 ++++- drivers/gpio/gpio-madera.c | 5 ++++- drivers/gpio/gpio-max3191x.c | 2 +- drivers/gpio/gpio-merrifield.c | 5 ++++- drivers/gpio/gpio-mmio.c | 21 +++++++++++++++------ drivers/gpio/gpio-mockup.c | 11 +++-------- drivers/gpio/gpio-moxtet.c | 4 ++-- drivers/gpio/gpio-mvebu.c | 5 ++++- drivers/gpio/gpio-mxs.c | 5 ++++- drivers/gpio/gpio-omap.c | 6 ++++-- drivers/gpio/gpio-pca953x.c | 5 ++++- drivers/gpio/gpio-pci-idio-16.c | 4 ++-- drivers/gpio/gpio-pcie-idio-24.c | 9 ++++++--- drivers/gpio/gpio-pisosr.c | 2 +- drivers/gpio/gpio-pl061.c | 5 ++++- drivers/gpio/gpio-raspberrypi-exp.c | 5 ++++- drivers/gpio/gpio-rcar.c | 5 ++++- drivers/gpio/gpio-reg.c | 3 ++- drivers/gpio/gpio-sa1100.c | 5 ++++- drivers/gpio/gpio-sama5d2-piobu.c | 7 ++++--- drivers/gpio/gpio-sch.c | 5 ++++- drivers/gpio/gpio-sch311x.c | 5 ++++- drivers/gpio/gpio-siox.c | 4 ++-- drivers/gpio/gpio-stmpe.c | 5 ++++- drivers/gpio/gpio-tc3589x.c | 5 ++++- drivers/gpio/gpio-tegra.c | 5 ++++- drivers/gpio/gpio-tegra186.c | 4 ++-- drivers/gpio/gpio-thunderx.c | 5 ++++- drivers/gpio/gpio-tpic2810.c | 2 +- drivers/gpio/gpio-tps65086.c | 2 +- drivers/gpio/gpio-tps65912.c | 4 ++-- drivers/gpio/gpio-tps68470.c | 6 +++--- drivers/gpio/gpio-tqmx86.c | 5 ++++- drivers/gpio/gpio-ts4900.c | 5 ++++- drivers/gpio/gpio-twl4030.c | 10 +++++----- drivers/gpio/gpio-twl6040.c | 3 +-- drivers/gpio/gpio-uniphier.c | 5 ++++- drivers/gpio/gpio-wcove.c | 7 +++++-- drivers/gpio/gpio-ws16c48.c | 5 ++++- drivers/gpio/gpio-xgene.c | 5 ++++- drivers/gpio/gpio-xra1403.c | 5 ++++- drivers/gpio/gpio-xtensa.c | 4 ++-- drivers/gpio/gpio-zynq.c | 7 +++++-- include/linux/gpio/driver.h | 3 +++ 61 files changed, 214 insertions(+), 102 deletions(-) -- 2.21.0 -- Matti Vaittinen, Linux device drivers ROHM Semiconductors, Finland SWDC Kiviharjunlenkki 1E 90220 OULU FINLAND ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ Simon says - in Latin please. ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ Thanks to Simon Glass for the translation =]

8 12

Re: [alsa-devel] [PATCH V2 1/2] ASoC: dt-bindings: fsl_asrc: add compatible string for imx8qm
by S.j. Wang 07 Nov '19

07 Nov '19

Hi Rob > > On Wed, Oct 30, 2019 at 07:41:26PM +0800, Shengjiu Wang wrote: > > In order to support the two asrc modules in imx8qm, we need to add > > compatible string "fsl,imx8qm-asrc0" and "fsl,imx8qm-asrc1" > > Are the blocks different in some way? > > If not, why do you need to distinguish them? > The internal clock mapping is different for each module. Or we can use one compatible string, but need add another property "fsl,asrc-clk-map" to distinguish the different clock map. The change is in below. Which one do you think is better? Required properties: - - compatible : Contains "fsl,imx35-asrc" or "fsl,imx53-asrc". + - compatible : Contains "fsl,imx35-asrc", "fsl,imx53-asrc", + "fsl,imx8qm-asrc". - reg : Offset and length of the register set for the device. @@ -35,6 +36,11 @@ Required properties: - fsl,asrc-width : Defines a mutual sample width used by DPCM Back Ends. + - fsl,asrc-clk-map : Defines clock map used in driver. which is required + by imx8qm + <0> - select the map for asrc0 + <1> - select the map for asrc1 + Optional properties: Best regards Wang shengjiu

1 0

[alsa-devel] [PATCH] ASoC: wm_adsp: Expose mixer control API
by David Rhodes 07 Nov '19

07 Nov '19

From: Li Xu <li.xu(a)cirrus.com> Expose mixer control API for reading and writing. The exposed API can be used by codec driver for interacting with mixer control in kernel space. This allows codec driver to implement more involved interactions with DSP firmware, such as Fast Use Case Switching. Signed-off-by: Li Xu <li.xu(a)cirrus.com> Signed-off-by: David Rhodes <david.rhodes(a)cirrus.com> --- sound/soc/codecs/wm_adsp.c | 70 +++++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm_adsp.h | 4 +++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index aa74fd1..77b8aea 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -635,6 +635,9 @@ struct wm_coeff_ctl_ops { struct wm_coeff_ctl { const char *name; const char *fw_name; + /* Subname is needed to match with firmware */ + const char *subname; + unsigned int subname_len; struct wm_adsp_alg_region alg_region; struct wm_coeff_ctl_ops ops; struct wm_adsp *dsp; @@ -1520,6 +1523,7 @@ static void wm_adsp_free_ctl_blk(struct wm_coeff_ctl *ctl) { kfree(ctl->cache); kfree(ctl->name); + kfree(ctl->subname); kfree(ctl); } @@ -1597,6 +1601,15 @@ static int wm_adsp_create_control(struct wm_adsp *dsp, ret = -ENOMEM; goto err_ctl; } + if (subname) { + ctl->subname_len = subname_len; + ctl->subname = kmemdup(subname, + strlen(subname) + 1, GFP_KERNEL); + if (!ctl->subname) { + ret = -ENOMEM; + goto err_ctl_name; + } + } ctl->enabled = 1; ctl->set = 0; ctl->ops.xget = wm_coeff_get; @@ -1610,7 +1623,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp, ctl->cache = kzalloc(ctl->len, GFP_KERNEL); if (!ctl->cache) { ret = -ENOMEM; - goto err_ctl_name; + goto err_ctl_subname; } list_add(&ctl->list, &dsp->ctl_list); @@ -1633,6 +1646,8 @@ static int wm_adsp_create_control(struct wm_adsp *dsp, err_ctl_cache: kfree(ctl->cache); +err_ctl_subname: + kfree(ctl->subname); err_ctl_name: kfree(ctl->name); err_ctl: @@ -2194,6 +2209,59 @@ static int wm_adsp_load(struct wm_adsp *dsp) return ret; } +/* + * Find wm_coeff_ctl with input name as its subname + * If not found, return NULL + */ +static struct wm_coeff_ctl *wm_adsp_get_ctl(struct wm_adsp *dsp, + const char *name) +{ + struct wm_coeff_ctl *pos, *rslt = NULL; + + list_for_each_entry(pos, &dsp->ctl_list, list) { + if (!pos->subname) + continue; + if (strncmp(pos->subname, name, pos->subname_len) == 0) { + rslt = pos; + break; + } + } + + return rslt; +} + +int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, const void *buf, + size_t len) +{ + struct wm_coeff_ctl *ctl; + + ctl = wm_adsp_get_ctl(dsp, name); + if (!ctl) + return -EINVAL; + + if (len > ctl->len) + return -EINVAL; + + return wm_coeff_write_control(ctl, buf, len); +} +EXPORT_SYMBOL_GPL(wm_adsp_write_ctl); + +int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, void *buf, + size_t len) +{ + struct wm_coeff_ctl *ctl; + + ctl = wm_adsp_get_ctl(dsp, name); + if (!ctl) + return -EINVAL; + + if (len > ctl->len) + return -EINVAL; + + return wm_coeff_read_control(ctl, buf, len); +} +EXPORT_SYMBOL_GPL(wm_adsp_read_ctl); + static void wm_adsp_ctl_fixup_base(struct wm_adsp *dsp, const struct wm_adsp_alg_region *alg_region) { diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index 5275a49..2a8cd09 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -223,5 +223,9 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream, struct snd_compr_tstamp *tstamp); int wm_adsp_compr_copy(struct snd_compr_stream *stream, char __user *buf, size_t count); +int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, const void *buf, + size_t len); +int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, void *buf, + size_t len); #endif -- 1.9.1

4 3

[alsa-devel] [PATCH 0/5] ASoC: SOF: Intel: Soundwire integration
by Pierre-Louis Bossart 06 Nov '19

06 Nov '19

This patchset applies on top of the series "[PATCH 0/4] soundwire: update ASoC interfaces". The SOF/Intel code makes use of the interfaces defined for initialization. Build support for SoundWire is not provided for now, all Soundwire-related code will be handled with a dummy fallback. We will enable SoundWire interfaces in the Kconfigs when the functionality is enabled in the soundwire tree. In short, if the interfaces are agreed on, there is no risk with the integration of these patches on the ASoC side. Pierre-Louis Bossart (5): ASoC: SOF: Intel: add SoundWire configuration interface ASoC: SOF: IPC: dai-intel: move ALH declarations in header file ASoC: SOF: Intel: hda: add SoundWire stream config/free callbacks ASoC: SOF: Intel: hda: initial SoundWire machine driver autodetect ASoC: SOF: Intel: hda: disable SoundWire interrupts on suspend include/sound/sof/dai-intel.h | 18 +-- sound/soc/sof/intel/hda-dsp.c | 2 + sound/soc/sof/intel/hda-loader.c | 13 ++ sound/soc/sof/intel/hda.c | 230 ++++++++++++++++++++++++++++++- sound/soc/sof/intel/hda.h | 44 ++++++ 5 files changed, 295 insertions(+), 12 deletions(-) -- 2.20.1

1 6