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

[alsa-devel] [PATCH 00/61] tree-wide: simplify getting .drvdata
by Wolfram Sang 20 Apr '18

20 Apr '18

I got tired of fixing this in Renesas drivers manually, so I took the big hammer. Remove this cumbersome code pattern which got copy-pasted too much already: - struct platform_device *pdev = to_platform_device(dev); - struct ep93xx_keypad *keypad = platform_get_drvdata(pdev); + struct ep93xx_keypad *keypad = dev_get_drvdata(dev); I send this out as one patch per directory per subsystem. I think they should be applied individually. If you prefer a broken out series per subsystem, I can provide this as well. Just mail me. A branch (tested by buildbot; only with all commits squashed into one commit before) can be found here: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git coccinelle/get_drvdata Open for other comments, suggestions, too, of course. Here is the cocci-script I created (after <n> iterations by manually checking samples): @@ struct device* d; identifier pdev; expression *ptr; @@ ( - struct platform_device *pdev = to_platform_device(d); | - struct platform_device *pdev; ... - pdev = to_platform_device(d); ) <... when != pdev - &pdev->dev + d ...> ptr = - platform_get_drvdata(pdev) + dev_get_drvdata(d) <... when != pdev - &pdev->dev + d ...> Kind regards, Wolfram Wolfram Sang (61): ARM: plat-samsung: simplify getting .drvdata ata: simplify getting .drvdata auxdisplay: simplify getting .drvdata bus: simplify getting .drvdata clk: samsung: simplify getting .drvdata crypto: simplify getting .drvdata dma: simplify getting .drvdata dmaengine: dw: simplify getting .drvdata dmaengine: qcom: simplify getting .drvdata gpio: simplify getting .drvdata gpu: drm: msm: simplify getting .drvdata gpu: drm: msm: adreno: simplify getting .drvdata gpu: drm: msm: disp: mdp5: simplify getting .drvdata gpu: drm: msm: dsi: simplify getting .drvdata gpu: drm: omapdrm: displays: simplify getting .drvdata gpu: drm: vc4: simplify getting .drvdata hid: simplify getting .drvdata iio: common: cros_ec_sensors: simplify getting .drvdata iio: common: hid-sensors: simplify getting .drvdata input: keyboard: simplify getting .drvdata input: misc: simplify getting .drvdata input: mouse: simplify getting .drvdata input: touchscreen: simplify getting .drvdata iommu: simplify getting .drvdata media: platform: am437x: simplify getting .drvdata media: platform: exynos4-is: simplify getting .drvdata media: platform: s5p-mfc: simplify getting .drvdata mmc: host: simplify getting .drvdata mtd: devices: simplify getting .drvdata mtd: nand: onenand: simplify getting .drvdata net: dsa: simplify getting .drvdata net: ethernet: cadence: simplify getting .drvdata net: ethernet: davicom: simplify getting .drvdata net: ethernet: smsc: simplify getting .drvdata net: ethernet: ti: simplify getting .drvdata net: ethernet: wiznet: simplify getting .drvdata perf: simplify getting .drvdata pinctrl: simplify getting .drvdata pinctrl: intel: simplify getting .drvdata platform: x86: simplify getting .drvdata power: supply: simplify getting .drvdata ptp: simplify getting .drvdata pwm: simplify getting .drvdata rtc: simplify getting .drvdata slimbus: simplify getting .drvdata spi: simplify getting .drvdata staging: greybus: simplify getting .drvdata staging: iio: adc: simplify getting .drvdata staging: nvec: simplify getting .drvdata thermal: simplify getting .drvdata thermal: int340x_thermal: simplify getting .drvdata thermal: st: simplify getting .drvdata tty: serial: simplify getting .drvdata uio: simplify getting .drvdata usb: mtu3: simplify getting .drvdata usb: phy: simplify getting .drvdata video: fbdev: simplify getting .drvdata video: fbdev: omap2: omapfb: displays: simplify getting .drvdata watchdog: simplify getting .drvdata net: dsa: simplify getting .drvdata ASoC: atmel: simplify getting .drvdata arch/arm/plat-samsung/adc.c | 3 +- drivers/ata/pata_samsung_cf.c | 8 ++--- drivers/auxdisplay/arm-charlcd.c | 6 ++-- drivers/bus/brcmstb_gisb.c | 12 +++---- drivers/clk/samsung/clk-s3c2410-dclk.c | 6 ++-- drivers/crypto/exynos-rng.c | 6 ++-- drivers/crypto/picoxcell_crypto.c | 6 ++-- drivers/dma/at_hdmac.c | 9 ++--- drivers/dma/at_xdmac.c | 9 ++--- drivers/dma/dw/platform.c | 6 ++-- drivers/dma/fsldma.c | 6 ++-- drivers/dma/idma64.c | 6 ++-- drivers/dma/qcom/hidma.c | 3 +- drivers/dma/qcom/hidma_mgmt_sys.c | 6 ++-- drivers/dma/ste_dma40.c | 12 +++---- drivers/dma/txx9dmac.c | 8 ++--- drivers/gpio/gpio-dwapb.c | 6 ++-- drivers/gpio/gpio-lynxpoint.c | 3 +- drivers/gpio/gpio-omap.c | 12 +++---- drivers/gpio/gpio-tegra.c | 6 ++-- drivers/gpio/gpio-zynq.c | 6 ++-- drivers/gpu/drm/msm/adreno/adreno_device.c | 6 ++-- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++-- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 ++-- drivers/gpu/drm/msm/msm_drv.c | 3 +- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 ++++------ drivers/gpu/drm/vc4/vc4_drv.c | 3 +- drivers/hid/hid-sensor-custom.c | 12 +++---- .../common/cros_ec_sensors/cros_ec_sensors_core.c | 6 ++-- .../iio/common/hid-sensors/hid-sensor-trigger.c | 9 ++--- drivers/input/keyboard/ep93xx_keypad.c | 10 +++--- drivers/input/keyboard/imx_keypad.c | 10 +++--- drivers/input/keyboard/lpc32xx-keys.c | 6 ++-- drivers/input/keyboard/matrix_keypad.c | 10 +++--- drivers/input/keyboard/omap4-keypad.c | 10 +++--- drivers/input/keyboard/pmic8xxx-keypad.c | 6 ++-- drivers/input/keyboard/pxa27x_keypad.c | 10 +++--- drivers/input/keyboard/samsung-keypad.c | 12 +++---- drivers/input/keyboard/snvs_pwrkey.c | 10 +++--- drivers/input/keyboard/spear-keyboard.c | 10 +++--- drivers/input/keyboard/st-keyscan.c | 6 ++-- drivers/input/keyboard/tegra-kbc.c | 10 +++--- drivers/input/misc/max77693-haptic.c | 6 ++-- drivers/input/misc/max8997_haptic.c | 3 +- drivers/input/misc/palmas-pwrbutton.c | 6 ++-- drivers/input/misc/regulator-haptic.c | 6 ++-- drivers/input/misc/twl4030-vibra.c | 3 +- drivers/input/misc/twl6040-vibra.c | 3 +- drivers/input/mouse/navpoint.c | 6 ++-- drivers/input/touchscreen/imx6ul_tsc.c | 6 ++-- drivers/iommu/qcom_iommu.c | 6 ++-- drivers/media/platform/am437x/am437x-vpfe.c | 6 ++-- drivers/media/platform/exynos4-is/media-dev.c | 6 ++-- drivers/media/platform/exynos4-is/mipi-csis.c | 6 ++-- drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 ++-- drivers/mmc/host/davinci_mmc.c | 6 ++-- drivers/mmc/host/sdhci-of-arasan.c | 6 ++-- drivers/mmc/host/wmt-sdmmc.c | 6 ++-- drivers/mtd/devices/docg3.c | 3 +- drivers/mtd/nand/onenand/samsung.c | 6 ++-- drivers/net/dsa/bcm_sf2.c | 6 ++-- drivers/net/dsa/qca8k.c | 6 ++-- drivers/net/ethernet/cadence/macb_main.c | 6 ++-- drivers/net/ethernet/davicom/dm9000.c | 6 ++-- drivers/net/ethernet/smsc/smc91x.c | 3 +- drivers/net/ethernet/ti/cpsw.c | 6 ++-- drivers/net/ethernet/ti/davinci_emac.c | 6 ++-- drivers/net/ethernet/wiznet/w5300.c | 6 ++-- drivers/perf/arm_spe_pmu.c | 6 ++-- drivers/pinctrl/intel/pinctrl-baytrail.c | 6 ++-- drivers/pinctrl/intel/pinctrl-cherryview.c | 6 ++-- drivers/pinctrl/intel/pinctrl-intel.c | 6 ++-- drivers/pinctrl/pinctrl-amd.c | 6 ++-- drivers/pinctrl/pinctrl-at91-pio4.c | 6 ++-- drivers/platform/x86/asus-laptop.c | 3 +- drivers/platform/x86/asus-wmi.c | 3 +- drivers/platform/x86/samsung-laptop.c | 3 +- drivers/power/supply/gpio-charger.c | 3 +- drivers/ptp/ptp_dte.c | 6 ++-- drivers/pwm/pwm-atmel-tcb.c | 6 ++-- drivers/pwm/pwm-rcar.c | 3 +- drivers/rtc/rtc-bq4802.c | 6 ++-- drivers/rtc/rtc-ds1216.c | 6 ++-- drivers/rtc/rtc-ds1511.c | 9 ++--- drivers/rtc/rtc-ds1553.c | 15 +++----- drivers/rtc/rtc-ds1685.c | 21 ++++------- drivers/rtc/rtc-ds1742.c | 6 ++-- drivers/rtc/rtc-lpc32xx.c | 16 ++++----- drivers/rtc/rtc-m48t59.c | 41 +++++++++------------- drivers/rtc/rtc-mv.c | 3 +- drivers/rtc/rtc-mxc.c | 21 ++++------- drivers/rtc/rtc-pcap.c | 15 +++----- drivers/rtc/rtc-sh.c | 15 +++----- drivers/rtc/rtc-stk17ta8.c | 15 +++----- drivers/rtc/rtc-test.c | 3 +- drivers/rtc/rtc-zynqmp.c | 10 +++--- drivers/slimbus/qcom-ctrl.c | 6 ++-- drivers/spi/spi-cadence.c | 6 ++-- drivers/spi/spi-zynqmp-gqspi.c | 6 ++-- drivers/staging/greybus/arche-platform.c | 3 +- drivers/staging/iio/adc/ad7606_par.c | 6 ++-- drivers/staging/nvec/nvec.c | 6 ++-- drivers/thermal/int340x_thermal/int3400_thermal.c | 9 ++--- drivers/thermal/rockchip_thermal.c | 8 ++--- drivers/thermal/spear_thermal.c | 8 ++--- drivers/thermal/st/st_thermal.c | 6 ++-- drivers/thermal/zx2967_thermal.c | 6 ++-- drivers/tty/serial/imx.c | 18 ++++------ drivers/tty/serial/qcom_geni_serial.c | 6 ++-- drivers/tty/serial/st-asc.c | 6 ++-- drivers/tty/serial/xilinx_uartps.c | 6 ++-- drivers/uio/uio_fsl_elbc_gpcm.c | 6 ++-- drivers/usb/mtu3/mtu3_plat.c | 6 ++-- drivers/usb/phy/phy-am335x.c | 6 ++-- drivers/video/fbdev/auo_k190x.c | 12 +++---- .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 18 ++++------ drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 ++-- drivers/video/fbdev/sh_mobile_meram.c | 6 ++-- drivers/watchdog/cadence_wdt.c | 6 ++-- drivers/watchdog/of_xilinx_wdt.c | 6 ++-- drivers/watchdog/wdat_wdt.c | 6 ++-- net/dsa/legacy.c | 6 ++-- sound/soc/atmel/atmel_ssc_dai.c | 6 ++-- 123 files changed, 319 insertions(+), 607 deletions(-) -- 2.11.0

3 4

[alsa-devel] [PATCH 0/7] ASoC: Intel: Replace GFP_ATOMIC with GFP_KERNEL
by Vinod Koul 20 Apr '18

20 Apr '18

Jia-Ju Bai recently fixed few Intel drivers which were using GFP_ATOMIC wrongly, this series fixes the remaining ones. Vinod Koul (7): ASoC: Intel: byt-max98090: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: bytcht_es8316: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: bytcr_rt5651: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: cht_bsw_nau8824: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_da7219_max98357a: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_rt5663_max98927: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_rt5663_rt5514_max98927: Replace GFP_ATOMIC with GFP_KERNEL sound/soc/intel/boards/byt-max98090.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- 2.7.4

2 14

[alsa-devel] [PATCH] ASoC: sh: Drop SUPERH platform dependency
by Geert Uytterhoeven 20 Apr '18

20 Apr '18

The SIU sound peripheral is used only on SuperH SH-Mobile platforms. As both SUPERH and ARCH_SHMOBILE are set for these platforms, the SUPERH dependency can be dropped. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- sound/soc/sh/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index c1b7fb91e3063f2b..0ae0800bf3a8b471 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -28,7 +28,7 @@ config SND_SOC_SH4_FSI config SND_SOC_SH4_SIU tristate - depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK + depends on ARCH_SHMOBILE && HAVE_CLK select DMA_ENGINE select DMADEVICES select SH_DMAE -- 2.7.4

2 1

[alsa-devel] Sample format changes by plugin while playing
by Robert Tiemann 20 Apr '18

20 Apr '18

Hi, I have a general question about ALSA plugins: Is it possible for an ALSA plugin to reconfigure the sample rate and sample format of its slave in such a way that the software playing through that plugin wouldn't notice? That is, given some audio stream, the plugin shall be allowed to change the sample rate and format based on control data extracted from the audio data pushed through the plugin. In my imagination, any output format changes should be completely transparent to the sound player; the player would always deliver a stream of audio data at a constant rate, and once in a while the plugin would change the hardware settings. For sure there would be an audible gap during reconfiguration, but that would be OK for me. Now, is this possible at all? Best regards, Robert

3 7

[alsa-devel] general protection fault in snd_rawmidi_ioctl_compat
by syzbot 19 Apr '18

19 Apr '18

Hello, syzbot hit the following crash on upstream commit b284d4d5a6785f8cd07eda2646a95782373cd01e (Tue Apr 10 19:25:30 2018 +0000) Merge tag 'ceph-for-4.17-rc1' of git://github.com/ceph/ceph-client syzbot dashboard link: https://syzkaller.appspot.com/bug?extid=f7a0348affc3b67bc617 Unfortunately, I don't have any reproducer for this crash yet. Raw console output: https://syzkaller.appspot.com/x/log.txt?id=5208906934517760 Kernel config: https://syzkaller.appspot.com/x/.config?id=-1223000601505858474 compiler: gcc (GCC) 8.0.1 20180301 (experimental) IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+f7a0348affc3b67bc617(a)syzkaller.appspotmail.com It will help syzbot understand when the bug is fixed. See footer for details. If you forward the report, please keep this part and the footer. kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN Dumping ftrace buffer: (ftrace buffer empty) Modules linked in: CPU: 1 PID: 21671 Comm: syz-executor7 Not tainted 4.16.0+ #17 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:snd_rawmidi_ioctl_status_x32 sound/core/rawmidi_compat.c:125 [inline] RIP: 0010:snd_rawmidi_ioctl_compat+0x51d/0xba0 sound/core/rawmidi_compat.c:168 RSP: 0018:ffff88018ccdfc08 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffc900054cb000 RDX: 000000000000000b RSI: ffffffff85a61885 RDI: 0000000000000058 RBP: ffff88018ccdfd80 R08: ffff8801af6f0740 R09: 0000000000000000 R10: 0000000000000003 R11: 0000000000000000 R12: 1ffff1003199bf83 R13: 0000000000930000 R14: ffff88018ccdfcf8 R15: 0000000000000001 FS: 00007fa64d466700(0000) GS:ffff8801db100000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fa30835b518 CR3: 00000001879ef000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: C_SYSC_ioctl fs/compat_ioctl.c:1461 [inline] compat_SyS_ioctl+0xa37/0x33b0 fs/compat_ioctl.c:1407 do_syscall_64+0x29e/0x9d0 arch/x86/entry/common.c:287 entry_SYSCALL_64_after_hwframe+0x42/0xb7 RIP: 0033:0x455259 RSP: 002b:00007fa64d465c68 EFLAGS: 00000246 ORIG_RAX: 0000000000000202 RAX: ffffffffffffffda RBX: 00007fa64d4666d4 RCX: 0000000000455259 RDX: 0000000000930000 RSI: 00000000c0305720 RDI: 0000000000000013 RBP: 000000000072bf58 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000020000180 R11: 0000000000000246 R12: 00000000ffffffff R13: 0000000000000641 R14: 00000000006fc6b8 R15: 0000000000000001 Code: df 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 1c 06 00 00 48 b8 00 00 00 00 00 fc ff df 48 8b 5b 08 48 8d 7b 58 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 e5 05 00 00 48 8b 7b 58 4c 89 f6 e8 5d cc ff RIP: snd_rawmidi_ioctl_status_x32 sound/core/rawmidi_compat.c:125 [inline] RSP: ffff88018ccdfc08 RIP: snd_rawmidi_ioctl_compat+0x51d/0xba0 sound/core/rawmidi_compat.c:168 RSP: ffff88018ccdfc08 ---[ end trace 7dcd43c411f49842 ]--- --- This bug is generated by a dumb bot. It may contain errors. See https://goo.gl/tpsmEJ for details. Direct all questions to syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. If you forgot to add the Reported-by tag, once the fix for this bug is merged into any tree, please reply to this email with: #syz fix: exact-commit-title To mark this as a duplicate of another syzbot report, please reply with: #syz dup: exact-subject-of-another-report If it's a one-off invalid bug report, please reply with: #syz invalid Note: if the crash happens again, it will cause creation of a new bug report. Note: all commands must start from beginning of the line in the email body.

2 1

[alsa-devel] [PATCH] ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled
by Hans de Goede 19 Apr '18

19 Apr '18

The sound/soc/intel/common/sst-acpi.c code only tries to load the "baytrail-pcm-audio" driver (and supporting board drivers) when SND_SST_ATOM_HIFI2_PLATFORM is not enabled, since otherwise these are handled by snd-soc-sst-atom-hifi2-platform.ko. Since these thus will never be used when SND_SST_ATOM_HIFI2_PLATFORM is enabled, building these drivers when it is enabled is useless. Add a Kconfig dependency to reflect this, so that SND_SOC_INTEL_BAYTRAIL cannot be enabled when SND_SST_ATOM_HIFI2_PLATFORM is also enabled. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/soc/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index ceb105cbd461..640f9bc9bd46 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -61,7 +61,7 @@ config SND_SOC_INTEL_HASWELL config SND_SOC_INTEL_BAYTRAIL tristate "Baytrail (legacy) Platforms" - depends on DMADEVICES && ACPI + depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n select SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_ACPI select SND_SOC_INTEL_SST_FIRMWARE -- 2.17.0

3 4

[alsa-devel] Applied "ASoC: topology: Revert recent changes while boot errors are investigated" to the asoc tree
by Mark Brown 19 Apr '18

19 Apr '18

The patch ASoC: topology: Revert recent changes while boot errors are investigated has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 291bfb928863d496e25c785e132a8fbfb32341a8 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Thu, 19 Apr 2018 12:14:10 +0100 Subject: [PATCH] ASoC: topology: Revert recent changes while boot errors are investigated Krzysztof Kozlowski reported a NULL dereference in _instantiate_card() on Odroid XU3 and XU boards which he bisected to 45f8cb57da0d7 (ASoC: core: Allow topology to override machine driver FE DAI link config). Revert that commit for now, along with f11a5c27f928 (ASoC: core: Add name prefix for machines with topology rewrites) due to dependency issues, in order to keep things booting cleanly in -next. Reported-by: Krzysztof Kozlowski <krzk(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- include/sound/soc.h | 12 ------ sound/soc/soc-core.c | 87 ++------------------------------------------ sound/soc/soc-pcm.c | 12 ------ 3 files changed, 3 insertions(+), 108 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 3676d0a8f532..ad266d7e9553 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1012,14 +1012,6 @@ struct snd_soc_platform_driver { /* platform stream compress ops */ const struct snd_compr_ops *compr_ops; - - /* this platform uses topology and ignore machine driver FEs */ - const char *ignore_machine; - const char *topology_name_prefix; - int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params); - bool use_dai_pcm_id; /* use the DAI link PCM ID as PCM device number */ - int be_pcm_base; /* base device ID for all BE PCMs */ }; struct snd_soc_dai_link_component { @@ -1126,9 +1118,6 @@ struct snd_soc_dai_link { /* pmdown_time is ignored at stop */ unsigned int ignore_pmdown_time:1; - /* Do not create a PCM for this DAI link (Backend link) */ - unsigned int ignore:1; - struct list_head list; /* DAI link list of the soc card */ struct snd_soc_dobj dobj; /* For topology */ }; @@ -1168,7 +1157,6 @@ struct snd_soc_card { const char *long_name; const char *driver_name; char dmi_longname[80]; - char topology_shortname[32]; struct device *dev; struct snd_card *snd_card; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index aa1c33b3cce0..bf7ca32ab31f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1050,9 +1050,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card, const char *platform_name; int i; - if (dai_link->ignore) - return 0; - dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name); if (soc_is_dai_link_bound(card, dai_link)) { @@ -1675,7 +1672,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int i, ret, num; + int i, ret; dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n", card->name, rtd->num, order); @@ -1721,23 +1718,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card, soc_dpcm_debugfs_add(rtd); #endif - /* - * most drivers will register their PCMs using DAI link ordering but - * topology based drivers can use the DAI link id field to set PCM - * device number and then use rtd + a base offset of the BEs. - */ - if (rtd->platform->driver->use_dai_pcm_id) { - if (rtd->dai_link->no_pcm) - num = rtd->platform->driver->be_pcm_base + rtd->num; - else - num = rtd->dai_link->id; - } else { - num = rtd->num; - } - if (cpu_dai->driver->compress_new) { /*create compress_device"*/ - ret = cpu_dai->driver->compress_new(rtd, num); + ret = cpu_dai->driver->compress_new(rtd, rtd->num); if (ret < 0) { dev_err(card->dev, "ASoC: can't create compress %s\n", dai_link->stream_name); @@ -1747,7 +1730,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, if (!dai_link->params) { /* create the pcm */ - ret = soc_new_pcm(rtd, num); + ret = soc_new_pcm(rtd, rtd->num); if (ret < 0) { dev_err(card->dev, "ASoC: can't create pcm %s :%d\n", dai_link->stream_name, ret); @@ -2093,67 +2076,6 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) EXPORT_SYMBOL_GPL(snd_soc_set_dmi_name); #endif /* CONFIG_DMI */ -static void soc_check_tplg_fes(struct snd_soc_card *card) -{ - struct snd_soc_platform *platform; - struct snd_soc_dai_link *dai_link; - int i; - - list_for_each_entry(platform, &platform_list, list) { - - /* does this platform override FEs ? */ - if (!platform->driver->ignore_machine) - continue; - - /* for this machine ? */ - if (strcmp(platform->driver->ignore_machine, - card->dev->driver->name)) - continue; - - /* machine matches, so override the rtd data */ - for (i = 0; i < card->num_links; i++) { - - dai_link = &card->dai_link[i]; - - /* ignore this FE */ - if (dai_link->dynamic) { - dai_link->ignore = true; - continue; - } - - dev_info(card->dev, "info: override FE DAI link %s\n", - card->dai_link[i].name); - - /* override platform */ - dai_link->platform_name = platform->component.name; - dai_link->cpu_dai_name = platform->component.name; - - /* convert non BE into BE */ - dai_link->no_pcm = 1; - dai_link->dpcm_playback = 1; - dai_link->dpcm_capture = 1; - - /* override any BE fixups */ - dai_link->be_hw_params_fixup = - platform->driver->be_hw_params_fixup; - - /* most BE links dont set stream name, so set it to - * dai link name if it's NULL to help bind widgets. - */ - if (!dai_link->stream_name) - dai_link->stream_name = dai_link->name; - } - - /* Inform userspace we are using alternate topology */ - if (platform->driver->topology_name_prefix) { - snprintf(card->topology_shortname, 32, "%s-%s", - platform->driver->topology_name_prefix, - card->name); - card->name = card->topology_shortname; - } - } -} - static int snd_soc_instantiate_card(struct snd_soc_card *card) { struct snd_soc_codec *codec; @@ -2164,9 +2086,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) mutex_lock(&client_mutex); mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT); - /* check whether any platform is ignore machine FE and using topology */ - soc_check_tplg_fes(card); - /* bind DAIs */ for (i = 0; i < card->num_links; i++) { ret = soc_bind_dai_link(card, &card->dai_link[i]); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 4ce489165a6d..68d9dc930096 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -909,20 +909,8 @@ int soc_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; int ret; - /* perform any topology hw_params fixups before DAI */ - if (rtd->dai_link->be_hw_params_fixup) { - ret = rtd->dai_link->be_hw_params_fixup(rtd, params); - if (ret < 0) { - dev_err(rtd->dev, - "ASoC: hw_params topology fixup failed %d\n", - ret); - return ret; - } - } - if (dai->driver->ops->hw_params) { ret = dai->driver->ops->hw_params(substream, params, dai); if (ret < 0) { -- 2.17.0

1 0

[alsa-devel] [BUG] NULL pointer on next-20180419 on Odroid XU3 (snd_soc_register_card)
by Krzysztof Kozlowski 19 Apr '18

19 Apr '18

Hi Mark and Liam, On today's next-20180419, NULL pointer exception appeared in snd_soc_instantiate_card() on Odroid XU3 and XU boards (Samsung, Exynos5422, Exynos5410, max98090 codec). Built with exynos_defconfig (ARM). I bisected it to: 45f8cb57da0d7a9ead4b39d7f5def333a5b0c08b is the first bad commit commit 45f8cb57da0d7a9ead4b39d7f5def333a5b0c08b Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Date: Tue Mar 27 14:30:40 2018 +0100 ASoC: core: Allow topology to override machine driver FE DAI link config. Machine drivers statically define a number of DAI links that currently cannot be changed or removed by topology. This means PCMs and platform components cannot be changed by topology at runtime AND machine drivers are tightly coupled to topology. This patch allows topology to override the machine driver DAI link config in order to reuse machine drivers with different topologies and platform components. The patch supports :- 1) create new FE PCMs with a topology defined PCM ID. 2) destroy existing static FE PCMs 3) change the platform component driver. 4) assign any new HW params fixups. The patch requires no changes to the machine drivers, but does add some platform component flags that the platform component driver can assign before loading topologies. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> :040000 040000 25fc03e81975655bd0f90500b2578551742a2fba 28715f6094887d961cb84b26a4d56f478c1ace89 M include :040000 040000 e387f83c522f7cfc71c0f7669752b4475e3ab55e baad16725177cc3a4bb6c70afb2416d4f1b7f620 M sound Full OOPS: [ 6.172383] max98090 5-0010: MAX98090 REVID=0x43 [ 6.182548] max98090 5-0010: use default 2.8v micbias [ 6.196790] Unable to handle kernel NULL pointer dereference at virtual address 00000004 [ 6.203639] pgd = 7cab35d7 [ 6.206125] [00000004] *pgd=00000000 [ 6.209748] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 6.214958] Modules linked in: [ 6.217982] CPU: 0 PID: 62 Comm: kworker/0:2 Not tainted 4.17.0-rc1-next-20180419 #41 [ 6.225797] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 6.231877] Workqueue: events deferred_probe_work_func [ 6.236973] PC is at snd_soc_register_card+0xacc/0x1048 [ 6.242165] LR is at 0x3 [ 6.244663] pc : [<c0783b44>] lr : [<00000003>] psr: 60000013 [ 6.250917] sp : eeb25d98 ip : 00000000 fp : ecc18800 [ 6.256113] r10: ee0ec810 r9 : 00000002 r8 : ee0eca60 [ 6.261312] r7 : ee0ec968 r6 : ecc18e14 r5 : ee0ec900 r4 : c0d73e24 [ 6.267817] r3 : 00000000 r2 : 5d521c4d r1 : ee0ecc24 r0 : 00000000 [ 6.274315] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none [ 6.281421] Control: 10c5387d Table: 4000406a DAC: 00000051 [ 6.287138] Process kworker/0:2 (pid: 62, stack limit = 0xf8128fcf) [ 6.293377] Stack: (0xeeb25d98 to 0xeeb26000) [ 6.297704] 5d80: 00000000 ee0ec890 [ 6.305868] 5da0: c1008448 ee0eca08 ee0ec898 c0284318 ee0ec984 c10804fc c0dc0a38 014080c0 [ 6.314013] 5dc0: ee0c6200 5d521c4d 00000000 ee0ec810 ee0c88d0 ee0ec810 ee05e810 ef01f7a4 [ 6.322159] 5de0: c10898e8 00000000 00000022 c0793cc0 ee0ec810 00000000 ee05e810 ee0eca60 [ 6.330304] 5e00: ef01f7a4 c07a6b80 ee05e810 ee05e810 c10898e8 fffffdfb c18136f8 c0578400 [ 6.338450] 5e20: ee05e810 c18136f4 00000000 c10b3320 c18136f8 c0575f4c 00000001 c0578a40 [ 6.346595] 5e40: c10898e8 00000000 eeb25e94 c0576240 c1008448 00000001 c0d78588 c10b3320 [ 6.354741] 5e60: c10c6d60 c0573f24 fffffff3 ee8a7ed4 ed55f3d4 5d521c4d ee05e810 ee05e810 [ 6.362886] 5e80: c1008448 ee05e844 c1064414 c0575b24 c1064414 ee05e810 00000001 5d521c4d [ 6.371031] 5ea0: ee05e810 ee05e810 c1064738 c1064414 eeb24000 c0574de4 ee05e810 c10643c8 [ 6.379177] 5ec0: c10643c8 c05753a0 ffffe000 00000000 60000013 c1064438 eeaaf100 eef65fc0 [ 6.387323] 5ee0: eeb25f1c c100846c eef69200 c1008448 c10ab850 c01471d8 00000001 00000000 [ 6.395468] 5f00: c0147114 60000093 00000000 00000000 c10aa247 eef65fc0 c0147978 c1064438 [ 6.403614] 5f20: c120f104 00000000 c0d7887c 5d521c4d eef65fc0 eeaaf100 eef65fc0 eeaaf118 [ 6.411759] 5f40: 00000008 c1005900 eef65ff4 eeb24000 eef65fc0 c01478d8 eea9f340 00000000 [ 6.419905] 5f60: ffffe000 eeb23000 eea9f340 00000000 eeb24000 eeaaf100 c01478a0 eeb23038 [ 6.428050] 5f80: eeb03ea0 c014e1f4 eeb24000 eea9f340 c014e0bc 00000000 00000000 00000000 [ 6.436195] 5fa0: 00000000 00000000 00000000 c01010b4 00000000 00000000 00000000 00000000 [ 6.444340] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 6.452486] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [ 6.460643] [<c0783b44>] (snd_soc_register_card) from [<c0793cc0>] (devm_snd_soc_register_card+0x38/0x70) [ 6.470179] [<c0793cc0>] (devm_snd_soc_register_card) from [<c07a6b80>] (odroid_audio_probe+0x1a4/0x210) [ 6.479621] [<c07a6b80>] (odroid_audio_probe) from [<c0578400>] (platform_drv_probe+0x4c/0xb0) [ 6.488193] [<c0578400>] (platform_drv_probe) from [<c0575f4c>] (driver_probe_device+0x2e0/0x4b4) [ 6.497032] [<c0575f4c>] (driver_probe_device) from [<c0573f24>] (bus_for_each_drv+0x74/0xb8) [ 6.505521] [<c0573f24>] (bus_for_each_drv) from [<c0575b24>] (__device_attach+0xd4/0x168) [ 6.513753] [<c0575b24>] (__device_attach) from [<c0574de4>] (bus_probe_device+0x88/0x90) [ 6.521898] [<c0574de4>] (bus_probe_device) from [<c05753a0>] (deferred_probe_work_func+0x64/0x18c) [ 6.530917] [<c05753a0>] (deferred_probe_work_func) from [<c01471d8>] (process_one_work+0x220/0x8e8) [ 6.540012] [<c01471d8>] (process_one_work) from [<c01478d8>] (worker_thread+0x38/0x584) [ 6.548073] [<c01478d8>] (worker_thread) from [<c014e1f4>] (kthread+0x138/0x168) [ 6.555433] [<c014e1f4>] (kthread) from [<c01010b4>] (ret_from_fork+0x14/0x20) [ 6.562616] Exception stack(0xeeb25fb0 to 0xeeb25ff8) [ 6.567633] 5fa0: 00000000 00000000 00000000 00000000 [ 6.575794] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 6.583939] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 [ 6.590521] Code: e5d83059 e3130080 1a0000ec e59b35a4 (e5932004) [ 6.596677] ---[ end trace 97faeced889b58b2 ]--- [ 6.963181] smsc95xx 1-1.1:1.0 eth0: link up, 100Mbps, full-duplex, lpa 0xC1E1 Full log is here: http://www.krzk.eu/#/builders/1/builds/1769/steps/10/logs/serial0 Bisect log: git bisect start # bad: [2754896635e43cdfaf49175a2df23c8bc0eab37a] Add linux-next specific files for 20180419 git bisect bad 2754896635e43cdfaf49175a2df23c8bc0eab37a # good: [a27fc14219f2e3c4a46ba9177b04d9b52c875532] Merge branch 'parisc-4.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux git bisect good a27fc14219f2e3c4a46ba9177b04d9b52c875532 # good: [d5d9427e3e758fdb55c71a224d587d752661c405] Merge remote-tracking branch 'v4l-dvb/master' git bisect good d5d9427e3e758fdb55c71a224d587d752661c405 # bad: [4fcbe47f55bb71b44724ec00626e28efc24b7bad] Merge remote-tracking branch 'security/next-testing' git bisect bad 4fcbe47f55bb71b44724ec00626e28efc24b7bad # good: [c0c9267abfaf150c68138271f7fe014e5002d7cf] Merge remote-tracking branch 'sound/for-next' git bisect good c0c9267abfaf150c68138271f7fe014e5002d7cf # bad: [726ada29f866aa17d76929b89dc7601300c5a1d6] Merge remote-tracking branch 'block/for-next' git bisect bad 726ada29f866aa17d76929b89dc7601300c5a1d6 # good: [651e4890930d10d009a9a8b829a7177670975ec7] ASoC: Intel: Skylake: Unify the fw ops for SKL and KBL git bisect good 651e4890930d10d009a9a8b829a7177670975ec7 # good: [28f66e6a6a2528369f22d319870fc1b619d05ca2] Merge branch 'for-4.17/block' into for-next git bisect good 28f66e6a6a2528369f22d319870fc1b619d05ca2 # bad: [24ada03555505205b0c8b8b796d52926600bf947] ASoC: topology: Fix build errors git bisect bad 24ada03555505205b0c8b8b796d52926600bf947 # bad: [45f8cb57da0d7a9ead4b39d7f5def333a5b0c08b] ASoC: core: Allow topology to override machine driver FE DAI link config. git bisect bad 45f8cb57da0d7a9ead4b39d7f5def333a5b0c08b # good: [112c60b333ec9ddc7e940116f5e9fdc0d1a9706a] ASoC: Intel: Skylake: Reset stream to link mapping git bisect good 112c60b333ec9ddc7e940116f5e9fdc0d1a9706a # good: [7b0037fa2d6048284e90de4131fc53c0ac1d4430] ASoC: nau8824: user configuration of key detection git bisect good 7b0037fa2d6048284e90de4131fc53c0ac1d4430 # first bad commit: [45f8cb57da0d7a9ead4b39d7f5def333a5b0c08b] ASoC: core: Allow topology to override machine driver FE DAI link config. krzk@PC-kkoz:~/dev/linux$ Best regards, Krzysztof

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda/realtek - set PINCFG_HEADSET_MIC to parse_flags
by Hui Wang 19 Apr '18

19 Apr '18

Otherwise, the pin will be regarded as microphone, and the jack name is "Mic Phantom", it is always on in the pulseaudio even nothing is plugged into the jack. So the UI is confusing to users since the microphone always shows up in the UI even there is no microphone plugged. After adding this flag, the jack name is "Headset Mic Phantom", then the pulseaudio can handle its detection correctly. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index aef1f52..c3b63b7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6370,6 +6370,8 @@ static const struct hda_fixup alc269_fixups[] = { { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */ { } }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MIC }, }; -- 2.7.4

2 4

[alsa-devel] [PATCH 0/2] Add support for the Axe-Fx III implicit fb setup
by Alberto Aguirre 19 Apr '18

19 Apr '18

Some consolidation of repeated code in set_sync_ep_implicit_fb_quirk and a quirk to support implicit feedback for the Axe-FX III Alberto Aguirre (2): ALSA: usb-audio: simplify set_sync_ep_implicit_fb_quirk ALSA: usb-audio: add implicit fb quirk for Axe-Fx III sound/usb/pcm.c | 56 ++++++++++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) -- 2.14.1

2 3