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

[alsa-devel] [PATCH v2 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support
by Srinivas Kandagatla 09 Aug '19

09 Aug '19

This patchset adds support to WSA8810/WSA8815 Class-D Smart Speaker Amplifier which is SoundWire interfaced. This also adds support to some missing bits in SoundWire bus layer like Device Tree support and module_sdw_driver macro. This patchset along with DB845c machine driver and WCD934x codec driver has been tested on SDM845 SoC based DragonBoard DB845c with two WSA8810 speakers. Most of the code in this driver is rework of Qualcomm downstream drivers used in Andriod. Credits to Banajit Goswami and Patrick Lai's Team. TODO: Add thermal sensor support in WSA881x. This patchset also depends on the soundwire Kconfig patch https://lkml.org/lkml/2019/7/18/834 from Pierre Thanks, srini Changes since v1 RFC: - bindings document renamed to slave.txt - fix error code from dt slave parsing Srinivas Kandagatla (4): dt-bindings: soundwire: add slave bindings soundwire: core: add device tree support for slave devices dt-bindings: ASoC: Add WSA881x bindings ASoC: codecs: add wsa881x amplifier support .../bindings/sound/qcom,wsa881x.txt | 27 + .../devicetree/bindings/soundwire/slave.txt | 46 + drivers/soundwire/bus.c | 2 + drivers/soundwire/bus.h | 1 + drivers/soundwire/slave.c | 47 + sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wsa881x.c | 1160 +++++++++++++++++ 8 files changed, 1295 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.txt create mode 100644 Documentation/devicetree/bindings/soundwire/slave.txt create mode 100644 sound/soc/codecs/wsa881x.c -- 2.21.0

4 20

[alsa-devel] jack plugin freezes mpv.
by GitHub issues - opened 09 Aug '19

09 Aug '19

alsa-project/alsa-plugins issue #1 was opened from crocket: I'm using alsa-plugin-1.1.8 `mpv --audio-device=alsa/plug:rawjack /path/to/musicfile` freezes mpv. mpv doesn't freeze only when it plays a wav file. I have to press Ctrl+C twice to kill mpv. Issue URL : https://github.com/alsa-project/alsa-plugins/issues/1 Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[alsa-devel] [PATCH] soundwire: fix regmap dependencies and align with other serial links
by Pierre-Louis Bossart 09 Aug '19

09 Aug '19

The existing code has a mixed select/depend usage which makes no sense. config SOUNDWIRE_BUS tristate select REGMAP_SOUNDWIRE config REGMAP_SOUNDWIRE tristate depends on SOUNDWIRE_BUS Let's remove one layer of Kconfig definitions and align with the solutions used by all other serial links. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- drivers/base/regmap/Kconfig | 2 +- drivers/soundwire/Kconfig | 7 +------ drivers/soundwire/Makefile | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index 6ad5ef48b61e..8cd2ac650b50 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -44,7 +44,7 @@ config REGMAP_IRQ config REGMAP_SOUNDWIRE tristate - depends on SOUNDWIRE_BUS + depends on SOUNDWIRE config REGMAP_SCCB tristate diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig index 3a01cfd70fdc..f518273cfbe3 100644 --- a/drivers/soundwire/Kconfig +++ b/drivers/soundwire/Kconfig @@ -4,7 +4,7 @@ # menuconfig SOUNDWIRE - bool "SoundWire support" + tristate "SoundWire support" help SoundWire is a 2-Pin interface with data and clock line ratified by the MIPI Alliance. SoundWire is used for transporting data @@ -17,17 +17,12 @@ if SOUNDWIRE comment "SoundWire Devices" -config SOUNDWIRE_BUS - tristate - select REGMAP_SOUNDWIRE - config SOUNDWIRE_CADENCE tristate config SOUNDWIRE_INTEL tristate "Intel SoundWire Master driver" select SOUNDWIRE_CADENCE - select SOUNDWIRE_BUS depends on X86 && ACPI && SND_SOC help SoundWire Intel Master driver. diff --git a/drivers/soundwire/Makefile b/drivers/soundwire/Makefile index fd99a831b92a..45b7e5001653 100644 --- a/drivers/soundwire/Makefile +++ b/drivers/soundwire/Makefile @@ -5,7 +5,7 @@ #Bus Objs soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o -obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o +obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o #Cadence Objs soundwire-cadence-objs := cadence_master.o -- 2.20.1

5 7

[alsa-devel] [asoc:for-5.4 195/195] sound/soc/sof/intel/hda-ctrl.c:257:8: error: 'struct hdac_bus' has no member named 'io_ops'; did you mean 'ops'?
by kbuild test robot 09 Aug '19

09 Aug '19

tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/broonie/sound.git for-5.4 head: c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 commit: c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 [195/195] Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4 config: i386-randconfig-b003-201931 (attached as .config) compiler: gcc-7 (Debian 7.4.0-10) 7.4.0 reproduce: git checkout c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 # save the attached .config to linux build tree make ARCH=i386 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): sound/soc/sof/intel/hda-ctrl.c: In function 'hda_dsp_ctrl_init_chip': >> sound/soc/sof/intel/hda-ctrl.c:257:8: error: 'struct hdac_bus' has no member named 'io_ops'; did you mean 'ops'? bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); ^~~~~~ ops vim +257 sound/soc/sof/intel/hda-ctrl.c be1b577d01787c Zhu Yingjiang 2019-05-24 240 be1b577d01787c Zhu Yingjiang 2019-05-24 241 /* enable CIE and GIE interrupts */ be1b577d01787c Zhu Yingjiang 2019-05-24 242 snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL, be1b577d01787c Zhu Yingjiang 2019-05-24 243 SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN, be1b577d01787c Zhu Yingjiang 2019-05-24 244 SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN); be1b577d01787c Zhu Yingjiang 2019-05-24 245 be1b577d01787c Zhu Yingjiang 2019-05-24 246 /* program the position buffer */ be1b577d01787c Zhu Yingjiang 2019-05-24 247 if (bus->use_posbuf && bus->posbuf.addr) { 061edb23250579 Zhu Yingjiang 2019-07-22 248 snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, SOF_HDA_ADSP_DPLBASE, 061edb23250579 Zhu Yingjiang 2019-07-22 249 (u32)bus->posbuf.addr); 061edb23250579 Zhu Yingjiang 2019-07-22 250 snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, SOF_HDA_ADSP_DPUBASE, be1b577d01787c Zhu Yingjiang 2019-05-24 251 upper_32_bits(bus->posbuf.addr)); be1b577d01787c Zhu Yingjiang 2019-05-24 252 } be1b577d01787c Zhu Yingjiang 2019-05-24 253 d06973515f95ac Zhu Yingjiang 2019-07-22 254 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) d06973515f95ac Zhu Yingjiang 2019-07-22 255 /* Reset stream-to-link mapping */ d06973515f95ac Zhu Yingjiang 2019-07-22 256 list_for_each_entry(hlink, &bus->hlink_list, list) d06973515f95ac Zhu Yingjiang 2019-07-22 @257 bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); d06973515f95ac Zhu Yingjiang 2019-07-22 258 #endif d06973515f95ac Zhu Yingjiang 2019-07-22 259 be1b577d01787c Zhu Yingjiang 2019-05-24 260 bus->chip_init = true; be1b577d01787c Zhu Yingjiang 2019-05-24 261 be1b577d01787c Zhu Yingjiang 2019-05-24 262 hda_dsp_ctrl_misc_clock_gating(sdev, true); be1b577d01787c Zhu Yingjiang 2019-05-24 263 be1b577d01787c Zhu Yingjiang 2019-05-24 264 return ret; be1b577d01787c Zhu Yingjiang 2019-05-24 265 } 13063a2ccf79d2 Zhu Yingjiang 2019-06-12 266 :::::: The code at line 257 was first introduced by commit :::::: d06973515f95ac74d68fb3e1f1fb4b055531296c ASoC: SOF: Intel: hda: use SOF defined init chip in resume :::::: TO: Zhu Yingjiang <yingjiang.zhu(a)linux.intel.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:for-5.4 195/195] sound/soc/sof/intel/hda-dsp.c:360:22: error: 'hlink' undeclared
by kbuild test robot 09 Aug '19

09 Aug '19

tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/broonie/sound.git for-5.4 head: c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 commit: c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 [195/195] Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4 config: sparc64-allmodconfig (attached as .config) compiler: sparc64-linux-gcc (GCC) 7.4.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 # save the attached .config to linux build tree GCC_VERSION=7.4.0 make.cross ARCH=sparc64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All error/warnings (new ones prefixed by >>): In file included from include/linux/kobject.h:19:0, from include/linux/device.h:16, from include/sound/hdaudio.h:9, from include/sound/hdaudio_ext.h:5, from sound/soc/sof/intel/hda-dsp.c:18: sound/soc/sof/intel/hda-dsp.c: In function 'hda_resume': >> sound/soc/sof/intel/hda-dsp.c:360:22: error: 'hlink' undeclared (first use in this function) list_for_each_entry(hlink, &bus->hlink_list, list) ^ include/linux/list.h:577:7: note: in definition of macro 'list_for_each_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^~~ sound/soc/sof/intel/hda-dsp.c:360:22: note: each undeclared identifier is reported only once for each function it appears in list_for_each_entry(hlink, &bus->hlink_list, list) ^ include/linux/list.h:577:7: note: in definition of macro 'list_for_each_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^~~ In file included from include/linux/list.h:9:0, from include/linux/kobject.h:19, from include/linux/device.h:16, from include/sound/hdaudio.h:9, from include/sound/hdaudio_ext.h:5, from sound/soc/sof/intel/hda-dsp.c:18: >> sound/soc/sof/intel/hda-dsp.c:360:30: error: 'bus' undeclared (first use in this function) list_for_each_entry(hlink, &bus->hlink_list, list) ^ include/linux/kernel.h:972:26: note: in definition of macro 'container_of' void *__mptr = (void *)(ptr); \ ^~~ include/linux/list.h:490:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^~~~~~~~~~ include/linux/list.h:577:13: note: in expansion of macro 'list_first_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^~~~~~~~~~~~~~~~ >> sound/soc/sof/intel/hda-dsp.c:360:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(hlink, &bus->hlink_list, list) ^~~~~~~~~~~~~~~~~~~ >> sound/soc/sof/intel/hda-dsp.c:364:2: error: #else without #if #else ^~~~ >> sound/soc/sof/intel/hda-dsp.c:390:2: error: #endif without #if #endif ^~~~~ vim +/hlink +360 sound/soc/sof/intel/hda-dsp.c 747503b1813a3e Liam Girdwood 2019-04-12 334 fd15f2f5e27214 Rander Wang 2019-07-22 335 static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 747503b1813a3e Liam Girdwood 2019-04-12 336 { 747503b1813a3e Liam Girdwood 2019-04-12 337 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) 747503b1813a3e Liam Girdwood 2019-04-12 338 struct hdac_bus *bus = sof_to_bus(sdev); 747503b1813a3e Liam Girdwood 2019-04-12 339 struct hdac_ext_link *hlink = NULL; 747503b1813a3e Liam Girdwood 2019-04-12 340 #endif 747503b1813a3e Liam Girdwood 2019-04-12 341 int ret; 747503b1813a3e Liam Girdwood 2019-04-12 342 747503b1813a3e Liam Girdwood 2019-04-12 343 /* 747503b1813a3e Liam Girdwood 2019-04-12 344 * clear TCSEL to clear playback on some HD Audio 747503b1813a3e Liam Girdwood 2019-04-12 345 * codecs. PCI TCSEL is defined in the Intel manuals. 747503b1813a3e Liam Girdwood 2019-04-12 346 */ 747503b1813a3e Liam Girdwood 2019-04-12 347 snd_sof_pci_update_bits(sdev, PCI_TCSEL, 0x07, 0); 747503b1813a3e Liam Girdwood 2019-04-12 348 747503b1813a3e Liam Girdwood 2019-04-12 349 /* reset and start hda controller */ 747503b1813a3e Liam Girdwood 2019-04-12 350 ret = hda_dsp_ctrl_init_chip(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 351 if (ret < 0) { 747503b1813a3e Liam Girdwood 2019-04-12 352 dev_err(sdev->dev, 747503b1813a3e Liam Girdwood 2019-04-12 353 "error: failed to start controller after resume\n"); 747503b1813a3e Liam Girdwood 2019-04-12 354 return ret; 747503b1813a3e Liam Girdwood 2019-04-12 355 } 747503b1813a3e Liam Girdwood 2019-04-12 356 747503b1813a3e Liam Girdwood 2019-04-12 357 hda_dsp_ctrl_misc_clock_gating(sdev, false); 747503b1813a3e Liam Girdwood 2019-04-12 358 747503b1813a3e Liam Girdwood 2019-04-12 359 /* Reset stream-to-link mapping */ 747503b1813a3e Liam Girdwood 2019-04-12 @360 list_for_each_entry(hlink, &bus->hlink_list, list) 19abfefd4c7604 Takashi Iwai 2019-08-07 361 writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); 747503b1813a3e Liam Girdwood 2019-04-12 362 747503b1813a3e Liam Girdwood 2019-04-12 363 hda_dsp_ctrl_misc_clock_gating(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 @364 #else 747503b1813a3e Liam Girdwood 2019-04-12 365 747503b1813a3e Liam Girdwood 2019-04-12 366 hda_dsp_ctrl_misc_clock_gating(sdev, false); 747503b1813a3e Liam Girdwood 2019-04-12 367 747503b1813a3e Liam Girdwood 2019-04-12 368 /* reset controller */ 747503b1813a3e Liam Girdwood 2019-04-12 369 ret = hda_dsp_ctrl_link_reset(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 370 if (ret < 0) { 747503b1813a3e Liam Girdwood 2019-04-12 371 dev_err(sdev->dev, 747503b1813a3e Liam Girdwood 2019-04-12 372 "error: failed to reset controller during resume\n"); 747503b1813a3e Liam Girdwood 2019-04-12 373 return ret; 747503b1813a3e Liam Girdwood 2019-04-12 374 } 747503b1813a3e Liam Girdwood 2019-04-12 375 747503b1813a3e Liam Girdwood 2019-04-12 376 /* take controller out of reset */ 747503b1813a3e Liam Girdwood 2019-04-12 377 ret = hda_dsp_ctrl_link_reset(sdev, false); 747503b1813a3e Liam Girdwood 2019-04-12 378 if (ret < 0) { 747503b1813a3e Liam Girdwood 2019-04-12 379 dev_err(sdev->dev, 747503b1813a3e Liam Girdwood 2019-04-12 380 "error: failed to ready controller during resume\n"); 747503b1813a3e Liam Girdwood 2019-04-12 381 return ret; 747503b1813a3e Liam Girdwood 2019-04-12 382 } 747503b1813a3e Liam Girdwood 2019-04-12 383 747503b1813a3e Liam Girdwood 2019-04-12 384 /* enable hda bus irq */ 747503b1813a3e Liam Girdwood 2019-04-12 385 snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL, 747503b1813a3e Liam Girdwood 2019-04-12 386 SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN, 747503b1813a3e Liam Girdwood 2019-04-12 387 SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN); 747503b1813a3e Liam Girdwood 2019-04-12 388 747503b1813a3e Liam Girdwood 2019-04-12 389 hda_dsp_ctrl_misc_clock_gating(sdev, true); 24b6ff686fce80 Zhu Yingjiang 2019-06-12 @390 #endif 747503b1813a3e Liam Girdwood 2019-04-12 391 747503b1813a3e Liam Girdwood 2019-04-12 392 /* enable ppcap interrupt */ 747503b1813a3e Liam Girdwood 2019-04-12 393 hda_dsp_ctrl_ppcap_enable(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 394 hda_dsp_ctrl_ppcap_int_enable(sdev, true); 747503b1813a3e Liam Girdwood 2019-04-12 395 :::::: The code at line 360 was first introduced by commit :::::: 747503b1813a3e6e4c52d9c0b4bd462b64940940 ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations :::::: TO: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [sound:topic/hda-bus-ops-cleanup 2/3] sound/hda/hdac_bus.c:228:6: error: implicit declaration of function 'readl'; did you mean 'd_real'?
by kbuild test robot 09 Aug '19

09 Aug '19

tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-bus-ops-cleanup head: d4ff1b3917a529bdc75592af6b1504ad6c4029f7 commit: 19abfefd4c7604993d1c31e098a3f48bdafe334d [2/3] ALSA: hda: Direct MMIO accesses config: arm-defconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 7.4.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 19abfefd4c7604993d1c31e098a3f48bdafe334d # save the attached .config to linux build tree GCC_VERSION=7.4.0 make.cross ARCH=arm If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): sound/hda/hdac_bus.c: In function 'snd_hdac_aligned_read': >> sound/hda/hdac_bus.c:228:6: error: implicit declaration of function 'readl'; did you mean 'd_real'? [-Werror=implicit-function-declaration] v = readl(aligned_addr); ^~~~~ d_real sound/hda/hdac_bus.c: In function 'snd_hdac_aligned_write': >> sound/hda/hdac_bus.c:244:2: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration] writel(v, aligned_addr); ^~~~~~ cc1: some warnings being treated as errors vim +228 sound/hda/hdac_bus.c 218 219 #ifdef CONFIG_SND_HDA_ALIGNED_MMIO 220 /* Helpers for aligned read/write of mmio space, for Tegra */ 221 unsigned int snd_hdac_aligned_read(void __iomem *addr, unsigned int mask) 222 { 223 void __iomem *aligned_addr = 224 (void __iomem *)((unsigned long)(addr) & ~0x3); 225 unsigned int shift = ((unsigned long)(addr) & 0x3) << 3; 226 unsigned int v; 227 > 228 v = readl(aligned_addr); 229 return (v >> shift) & mask; 230 } 231 EXPORT_SYMBOL_GPL(snd_hdac_aligned_read); 232 233 void snd_hdac_aligned_write(unsigned int val, void __iomem *addr, 234 unsigned int mask) 235 { 236 void __iomem *aligned_addr = 237 (void __iomem *)((unsigned long)(addr) & ~0x3); 238 unsigned int shift = ((unsigned long)(addr) & 0x3) << 3; 239 unsigned int v; 240 241 v = readl(aligned_addr); 242 v &= ~(mask << shift); 243 v |= val << shift; > 244 writel(v, aligned_addr); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: sof: Fix warning when IPC flood test is not enabled
by Mark Brown 09 Aug '19

09 Aug '19

dentry is only used when the flood test is done so move the declaration of the variable inside the ifdef for the flood test. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sof/debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c index 40940b2fe9d5..54cd431faab7 100644 --- a/sound/soc/sof/debug.c +++ b/sound/soc/sof/debug.c @@ -221,7 +221,6 @@ static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer, { struct snd_sof_dfsentry *dfse = file->private_data; struct snd_sof_dev *sdev = dfse->sdev; - struct dentry *dentry; loff_t pos = *ppos; size_t size_ret; int skip = 0; @@ -229,6 +228,8 @@ static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer, u8 *buf; #if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST) + struct dentry *dentry; + dentry = file->f_path.dentry; if ((!strcmp(dentry->d_name.name, "ipc_flood_count") || !strcmp(dentry->d_name.name, "ipc_flood_duration_ms")) && -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: hdac_hda: fix page fault issue by removing race
by Pierre-Louis Bossart 08 Aug '19

08 Aug '19

From: Keyon Jie <yang.jie(a)linux.intel.com> There is a race between hda codec device removing and the jack-detecting work, which will lead to a page fault issue as the latter work is accessing codec device which could be already removed. Here add the cancellation of jack-detecting work before codecs are actually removed to avoid the race and fix the issue. Bug: https://github.com/thesofproject/linux/issues/1067 Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/hdac_hda.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c index 7d4940256914..91242b6f8ea7 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -495,6 +495,10 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) static int hdac_hda_dev_remove(struct hdac_device *hdev) { + struct hdac_hda_priv *hda_pvt; + + hda_pvt = dev_get_drvdata(&hdev->dev); + cancel_delayed_work_sync(&hda_pvt->codec.jackpoll_work); return 0; } -- 2.20.1

2 1

[alsa-devel] [PATCH -next] ASoC: tscs454: remove unused variable 'PLL_48K_RATE'
by YueHaibing 08 Aug '19

08 Aug '19

The global variable 'PLL_48K_RATE' is never used so just remove it. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/tscs454.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/tscs454.c b/sound/soc/codecs/tscs454.c index 93d84e5..c3587af 100644 --- a/sound/soc/codecs/tscs454.c +++ b/sound/soc/codecs/tscs454.c @@ -22,7 +22,6 @@ #include "tscs454.h" -static const unsigned int PLL_48K_RATE = (48000 * 256); static const unsigned int PLL_44_1K_RATE = (44100 * 256); #define COEFF_SIZE 3 -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: soc-core: fix module_put() warning in soc_cleanup_component
by Pierre-Louis Bossart 08 Aug '19

08 Aug '19

The recent changes introduce warnings in the SOF load/unload module tests. The code does not seem balanced with a confusion between _close() and _remove() macros. Using _remove() fixes the issue and removes the warning. Suggested-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Fixes: 4a81e8f30d0b4 ('ASoC: soc-component: add snd_soc_component_get/put()') Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- Full trace for reference: [ 98.735393] WARNING: CPU: 3 PID: 1397 at kernel/module.c:1137 module_put+0x83/0x90 [ 98.735393] Modules linked in: snd_soc_cnl_rt700 soundwire_intel soundwire_cadence snd_soc_dmic snd_sof_pci(-) snd_sof_intel_hda_common soundwire_intel_init snd_sof_acpi snd_sof_intel_byt snd_soc_acpi_intel_match snd_sof_intel_bdw snd_sof_intel_ipc snd_sof snd_sof_xtensa_dsp snd_soc_acpi snd_soc_rt700 regmap_sdw soundwire_bus snd_soc_max98357a snd_soc_wm8804_i2c snd_soc_wm8804 snd_soc_pcm512x_i2c snd_soc_pcm512x snd_soc_rt5640 snd_soc_rl6231 snd_soc_rt286 snd_soc_rl6347a snd_soc_core snd_pcm snd_seq snd_seq_device snd_timer snd soundcore wmi_bmof asix usbnet x86_pkg_temp_thermal intel_powerclamp i915 i2c_algo_bit mei_me mei drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops iwlwifi drm wmi efivarfs sdhci_pci intel_lpss_pci xhci_pci cqhci intel_lpss sdhci mfd_core xhci_hcd [ 98.735410] CPU: 3 PID: 1397 Comm: rmmod Not tainted 5.3.0-rc3-test+ #122 [ 98.735411] Hardware name: Intel Corporation Ice Lake Client Platform/IceLake<DETAILS REMOVED> [ 98.735413] RIP: 0010:module_put+0x83/0x90 [ 98.735414] Code: 48 83 c5 18 4c 89 e2 48 89 de e8 68 1c b1 00 48 8b 45 00 48 85 c0 75 e4 5b 5d 41 5c c3 c3 48 c7 c7 20 f9 7b 9d e8 d6 97 fc ff <0f> 0b eb 9c 66 0f 1f 84 00 00 00 00 00 53 48 89 f3 e8 67 ff ff ff [ 98.735415] RSP: 0018:ffffa88200a33c80 EFLAGS: 00010246 [ 98.735416] RAX: 0000000000000024 RBX: ffffffffc0754280 RCX: 0000000000000000 [ 98.735417] RDX: 0000000000000000 RSI: ffff8cc167ed63d8 RDI: ffff8cc167ed63d8 [ 98.735417] RBP: ffff8cc162cc0028 R08: 000000000000041d R09: 0000000000000004 [ 98.735418] R10: 0000000000000000 R11: 0000000000000001 R12: ffff8cc1456fceb0 [ 98.735419] R13: 0000000000000000 R14: 0000000000000001 R15: ffffffff9d7d85c5 [ 98.735420] FS: 00007fe72a461740(0000) GS:ffff8cc167ec0000(0000) knlGS:0000000000000000 [ 98.735420] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 98.735421] CR2: 000056509f6f2fe4 CR3: 0000000268d8a005 CR4: 0000000000760ee0 [ 98.735422] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 98.735422] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 98.735423] PKRU: 55555554 [ 98.735423] Call Trace: [ 98.735430] soc_remove_link_components.isra.50+0x56/0x70 [snd_soc_core] [ 98.735434] snd_soc_unbind_card.part.52+0x75/0xf0 [snd_soc_core] [ 98.735437] snd_soc_unregister_card+0x8d/0x90 [snd_soc_core] [ 98.735441] release_nodes+0x1ae/0x200 [ 98.735443] device_release_driver_internal+0xe3/0x1b0 [ 98.735445] bus_remove_device+0xd6/0x140 [ 98.735447] device_del+0x167/0x380 [ 98.735449] platform_device_del.part.16+0xe/0x60 [ 98.735451] platform_device_unregister+0x17/0x30 [ 98.735453] snd_sof_device_remove+0x44/0x80 [snd_sof] [ 98.735455] sof_pci_remove+0x10/0x30 [snd_sof_pci] [ 98.735457] pci_device_remove+0x36/0xb0 [ 98.735459] device_release_driver_internal+0xd3/0x1b0 [ 98.735460] driver_detach+0x37/0x6b [ 98.735461] bus_remove_driver+0x6f/0xc1 [ 98.735462] pci_unregister_driver+0x31/0x90 sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bb1e9e2c4ff4..00e8ad122ce7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -924,7 +924,7 @@ static void soc_cleanup_component(struct snd_soc_component *component) snd_soc_dapm_free(snd_soc_component_get_dapm(component)); soc_cleanup_component_debugfs(component); component->card = NULL; - snd_soc_component_module_put_when_close(component); + snd_soc_component_module_put_when_remove(component); } static void soc_remove_component(struct snd_soc_component *component) -- 2.20.1

3 2