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

[alsa-devel] [GIT PULL] soundwire update for v5.5-rc1
by Vinod Koul 09 Nov '19

09 Nov '19

Hi Greg, Here is the soundwire updates for v5.5-rc1. I may send another pull request with more changes which are under review next week. This time we have few core changes and bunch of changes to Intel drivers. The following changes since commit 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c: Linux 5.4-rc1 (2019-09-30 10:35:40 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git tags/soundwire-5.5-rc1 for you to fetch changes up to 2e8c4ad1f04413a4a67ef10746a7566007d2ed55: soundwire: ignore uniqueID when irrelevant (2019-11-09 16:46:56 +0530) ---------------------------------------------------------------- soundwire updates for v5.5-rc1 This round we have bunch of core and Intel driver updates spearheaded by Pierre Details - Update unique id checks in core and ACPI helpers - Improvements to to Intel driver and cadence lib ---------------------------------------------------------------- Bard Liao (2): soundwire: intel: remove playback/capture stream_name soundwire: cadence_master: improve PDI allocation Pierre-Louis Bossart (14): soundwire: intel: add missing headers for cross-compilation soundwire: intel: remove X86 dependency soundwire: remove DAI_ID_RANGE definitions soundwire: cadence/intel: simplify PDI/port mapping soundwire: intel: don't filter out PDI0/1 soundwire: intel/cadence: fix startup sequence soundwire: cadence_master: add hw_reset capability in debugfs soundwire: intel: add helper for initialization soundwire: intel/cadence: add flag for interrupt enable soundwire: cadence_master: make clock stop exit configurable on init soundwire: intel: fix PDI/stream mapping for Bulk soundwire: remove bitfield for unique_id, use u8 soundwire: slave: add helper to extract slave ID soundwire: ignore uniqueID when irrelevant Vinod Koul (1): soundwire: intel: use correct header for io calls drivers/soundwire/Kconfig | 2 +- drivers/soundwire/bus.c | 7 +- drivers/soundwire/cadence_master.c | 292 +++++++++++++++++-------------------- drivers/soundwire/cadence_master.h | 39 ++--- drivers/soundwire/intel.c | 201 ++++++++----------------- drivers/soundwire/intel_init.c | 1 + drivers/soundwire/slave.c | 98 ++++++++++--- include/linux/soundwire/sdw.h | 7 +- 8 files changed, 295 insertions(+), 352 deletions(-) Thanks -- ~Vinod

2 1

[alsa-devel] [PATCH 0/3] soundwire: use UniqueID only when relevant
by Pierre-Louis Bossart 09 Nov '19

09 Nov '19

The hardware UniqueID, typically enabled with pin-strapping, is required during enumeration to avoid conflicts between devices of the same type. When there are no devices of the same type, using the UniqueID is overkill and results in a lot of probe errors due to mismatches between ACPI tables and hardware capabilities. For example it's not uncommon for BIOS vendors to copy/paste the same settings between platforms but the hardware pin-strapping is different. This is perfectly legit and permitted by MIPI specs. With this patchset, the UniqueID is only used when multiple devices of the same type are detected. The loop to detect multiple identical devices is not super efficient but with typically fewer than 4 devices per link there's no real incentive to be smarter. This change is only implemented for ACPI platforms, for DeviceTree there is no change. Pierre-Louis Bossart (3): soundwire: remove bitfield for unique_id, use u8 soundwire: slave: add helper to extract slave ID soundwire: ignore uniqueID when irrelevant drivers/soundwire/bus.c | 7 +-- drivers/soundwire/slave.c | 98 +++++++++++++++++++++++++++-------- include/linux/soundwire/sdw.h | 4 +- 3 files changed, 84 insertions(+), 25 deletions(-) -- 2.20.1

2 9

[alsa-devel] [PATCH] soundwire: intel: fix PDI/stream mapping for Bulk
by Pierre-Louis Bossart 09 Nov '19

09 Nov '19

The previous formula is incorrect for PDI0/1, the mapping is not linear but has a discontinuity between PDI1 and PDI2. This change has no effect on PCM PDIs (same mapping). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- drivers/soundwire/intel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index b403ccc832b6..c984261fcc33 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -480,7 +480,10 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) unsigned int link_id = sdw->instance; int pdi_conf = 0; - pdi->intel_alh_id = (link_id * 16) + pdi->num + 5; + /* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id * 16) + pdi->num + 3; + if (pdi->num >= 2) + pdi->intel_alh_id += 2; /* * Program stream parameters to stream SHIM register @@ -509,7 +512,10 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi) unsigned int link_id = sdw->instance; unsigned int conf; - pdi->intel_alh_id = (link_id * 16) + pdi->num + 5; + /* the Bulk and PCM streams are not contiguous */ + pdi->intel_alh_id = (link_id * 16) + pdi->num + 3; + if (pdi->num >= 2) + pdi->intel_alh_id += 2; /* Program Stream config ALH register */ conf = intel_readl(alh, SDW_ALH_STRMZCFG(pdi->intel_alh_id)); -- 2.20.1

2 3

[alsa-devel] issue with jack detect using rt5645
by Ross Zwisler 09 Nov '19

09 Nov '19

We are trying to get a piece of Google hardware which uses the rt5645 driver working correctly with newer kernels (currently one based on the latest v4.14 stable), and noticed that the following commit: commit 6b5da66322c5 ("ASoC: rt5645: read jd1_1 status for jd detection") broke jack support for our device. Basically with that patch we never correctly see a jack insertion event, and audio is never routed to the headphones. With just that one patch reverted, things work correctly on our system. The revert applies cleanly to linus/master. Here is the series where that patch was originally upstreamed: https://www.spinics.net/lists/alsa-devel/msg64331.html If we reverted that patch upstream, would it break other devices (the "GDP Win" device?) that use the rt5645 driver? If so, how would you recommend proceeding? Does anyone have one of the "GDP Win" devices so we can test that and our device and make sure whatever solution we end up coming up with works for everyone? Thanks, - Ross

5 5

[alsa-devel] [PATCH 0/8] ASoC: memalloc cleanups
by Takashi Iwai 08 Nov '19

08 Nov '19

Hi, this is a patch series for ASoC to clean up ALSA memory allocation API usages. It's based on my recent API changes found on for-next branch for 5.5 merge, so please give ACK if it's OK, so that I can merge them into my sound git tree. Basically three things: * Drop superfluous snd_pcm_sgbuf_ops_page usages * Drop snd_dma_continuous_data() macro usage for the normal continuous page allocation * Convert PCM vmalloc buffer allocation with the preallocation API Takashi === Takashi Iwai (8): ASoC: Remove superfluous snd_dma_continuous_data() ASoC: rt5514-spi: Convert to the common vmalloc memalloc ASoC: intel: Drop superfluous snd_pcm_sgbuf_ops_page ASoC: intel: Avoid non-standard macro usage ASoC: SOF: Drop superfluous snd_pcm_sgbuf_ops_page ASoC: rt5677-spi: Convert to the common vmalloc memalloc ASoC: cros_ec_codec: Convert to the common vmalloc memalloc ALSA: pcm: Unexport snd_pcm_sgbuf_ops_page include/sound/pcm.h | 8 -------- sound/core/pcm_local.h | 5 +++++ sound/core/pcm_memory.c | 3 +-- sound/soc/au1x/dma.c | 2 +- sound/soc/codecs/cros_ec_codec.c | 16 ++++++++-------- sound/soc/codecs/rt5514-spi.c | 21 +++++++++++---------- sound/soc/codecs/rt5677-spi.c | 17 ++++++++--------- sound/soc/dwc/dwc-pcm.c | 2 +- sound/soc/intel/haswell/sst-haswell-pcm.c | 12 ------------ sound/soc/intel/skylake/skl-pcm.c | 14 +------------- sound/soc/sh/dma-sh7760.c | 2 +- sound/soc/sof/pcm.c | 12 ------------ 12 files changed, 37 insertions(+), 77 deletions(-) -- 2.16.4

3 10

[alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes
by Pierre-Louis Bossart 08 Nov '19

08 Nov '19

We have a number of distros who unfortunately selected the wrong options for SOF. The first patches in this series enforce mutual exclusions, add explicit developer options and add help text to make sure SOF or SOF debug options are not selected by mistake. Patch 5..6 are a follow-up on a report from Arnd Bergman. Patches 7..11 fix mistakes with dependencies in the board Kconfig. This should not have any impact for distros but help developers trying to build a minimal config. Pierre-Louis Bossart (11): ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency ASoC: SOF: Intel: use def_tristate, avoid using select ASoC: Intel: Skylake: mark HDAudio codec support as deprecated. ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER ASoC: Intel: boards: fix configs for bxt-da7219-max98057a ASoC: Intel: boards: Geminilake is only supported by SOF ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK sound/soc/intel/Kconfig | 17 +++++++++++---- sound/soc/intel/boards/Kconfig | 37 ++++++++++++++++++++++++--------- sound/soc/intel/boards/Makefile | 2 +- sound/soc/sof/Kconfig | 27 ++++++++++++++---------- sound/soc/sof/imx/Kconfig | 8 +++++-- sound/soc/sof/intel/Kconfig | 24 +++++++++++++++++---- 6 files changed, 83 insertions(+), 32 deletions(-) -- 2.20.1

4 26

[alsa-devel] [PATCH] ASoC: wm8904: configure sysclk/FLL automatically
by Michael Walle 08 Nov '19

08 Nov '19

This adds a new mode WM8904_CLK_AUTO which automatically enables the FLL if a frequency different than the MCLK is set. These additions make the codec work with the simple-card driver in general and especially in systems where the MCLK doesn't match the requested clock. Signed-off-by: Michael Walle <michael(a)walle.cc> --- Unfortunately, I had to move wm8904_sys_sysclk() below wm8904_set_fll(). So that makes this patch a bit ugly. The added part is the WM8904_CLK_AUTO branch. sound/soc/codecs/wm8904.c | 72 ++++++++++++++++++++++++--------------- sound/soc/codecs/wm8904.h | 1 + 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index bcb3c9d5abf0..2dd7addfd1a8 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1410,34 +1410,6 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream, return 0; } - -static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id, - unsigned int freq, int dir) -{ - struct snd_soc_component *component = dai->component; - struct wm8904_priv *priv = snd_soc_component_get_drvdata(component); - - switch (clk_id) { - case WM8904_CLK_MCLK: - priv->sysclk_src = clk_id; - priv->mclk_rate = freq; - break; - - case WM8904_CLK_FLL: - priv->sysclk_src = clk_id; - break; - - default: - return -EINVAL; - } - - dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq); - - wm8904_configure_clocking(component); - - return 0; -} - static int wm8904_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct snd_soc_component *component = dai->component; @@ -1824,6 +1796,50 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source, return 0; } +static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir) +{ + struct snd_soc_component *component = dai->component; + struct wm8904_priv *priv = snd_soc_component_get_drvdata(component); + unsigned long mclk_freq; + int ret; + + switch (clk_id) { + case WM8904_CLK_AUTO: + mclk_freq = clk_get_rate(priv->mclk); + /* enable FLL if a different sysclk is desired */ + if (mclk_freq != freq) { + priv->sysclk_src = WM8904_CLK_FLL; + ret = wm8904_set_fll(dai, WM8904_FLL_MCLK, + WM8904_FLL_MCLK, + clk_get_rate(priv->mclk), freq); + if (ret) + return ret; + break; + } + clk_id = WM8904_CLK_MCLK; + /* fallthrough */ + + case WM8904_CLK_MCLK: + priv->sysclk_src = clk_id; + priv->mclk_rate = freq; + break; + + case WM8904_CLK_FLL: + priv->sysclk_src = clk_id; + break; + + default: + return -EINVAL; + } + + dev_dbg(dai->dev, "Clock source is %d at %uHz\n", clk_id, freq); + + wm8904_configure_clocking(component); + + return 0; +} + static int wm8904_digital_mute(struct snd_soc_dai *codec_dai, int mute) { struct snd_soc_component *component = codec_dai->component; diff --git a/sound/soc/codecs/wm8904.h b/sound/soc/codecs/wm8904.h index c1bca52f9927..de6340446b1f 100644 --- a/sound/soc/codecs/wm8904.h +++ b/sound/soc/codecs/wm8904.h @@ -10,6 +10,7 @@ #ifndef _WM8904_H #define _WM8904_H +#define WM8904_CLK_AUTO 0 #define WM8904_CLK_MCLK 1 #define WM8904_CLK_FLL 2 -- 2.20.1

2 2

[alsa-devel] KMSAN: uninit-value in get_min_max_with_quirks
by syzbot 08 Nov '19

08 Nov '19

Hello, syzbot found the following crash on: HEAD commit: c2453450 kmsan: kcov: prettify the code unpoisoning area->.. git tree: https://github.com/google/kmsan.git master console output: https://syzkaller.appspot.com/x/log.txt?x=119f1173600000 kernel config: https://syzkaller.appspot.com/x/.config?x=3684f3c73f43899a dashboard link: https://syzkaller.appspot.com/bug?extid=abe1ab7afc62c6bb6377 compiler: clang version 9.0.0 (/home/glider/llvm/clang 80fee25776c2fb61e74c1ecb1a523375c2500b69) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=16255fe7600000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=15e73290e00000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+abe1ab7afc62c6bb6377(a)syzkaller.appspotmail.com usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-1: Product: syz usb 1-1: Manufacturer: syz usb 1-1: SerialNumber: syz usb 1-1: 0:2 : does not exist ===================================================== BUG: KMSAN: uninit-value in get_min_max_with_quirks+0xd6f/0x2ea0 sound/usb/mixer.c:1239 CPU: 0 PID: 2859 Comm: kworker/0:2 Not tainted 5.4.0-rc3+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x191/0x1f0 lib/dump_stack.c:113 kmsan_report+0x14a/0x2f0 mm/kmsan/kmsan_report.c:109 __msan_warning+0x73/0xf0 mm/kmsan/kmsan_instr.c:245 get_min_max_with_quirks+0xd6f/0x2ea0 sound/usb/mixer.c:1239 __build_feature_ctl+0x12b9/0x29e0 sound/usb/mixer.c:1665 build_feature_ctl sound/usb/mixer.c:1709 [inline] parse_audio_feature_unit sound/usb/mixer.c:1918 [inline] parse_audio_unit+0x218c/0x7490 sound/usb/mixer.c:2753 snd_usb_mixer_controls sound/usb/mixer.c:3095 [inline] snd_usb_create_mixer+0x1d7c/0x4070 sound/usb/mixer.c:3445 usb_audio_probe+0x286b/0x3eb0 sound/usb/card.c:653 usb_probe_interface+0xd19/0x1310 drivers/usb/core/driver.c:361 really_probe+0xd91/0x1f90 drivers/base/dd.c:552 driver_probe_device+0x1ba/0x510 drivers/base/dd.c:721 __device_attach_driver+0x5b8/0x790 drivers/base/dd.c:828 bus_for_each_drv+0x28e/0x3b0 drivers/base/bus.c:430 __device_attach+0x489/0x750 drivers/base/dd.c:894 device_initial_probe+0x4a/0x60 drivers/base/dd.c:941 bus_probe_device+0x131/0x390 drivers/base/bus.c:490 device_add+0x25b5/0x2df0 drivers/base/core.c:2201 usb_set_configuration+0x309f/0x3710 drivers/usb/core/message.c:2027 generic_probe+0xe7/0x280 drivers/usb/core/generic.c:210 usb_probe_device+0x146/0x200 drivers/usb/core/driver.c:266 really_probe+0xd91/0x1f90 drivers/base/dd.c:552 driver_probe_device+0x1ba/0x510 drivers/base/dd.c:721 __device_attach_driver+0x5b8/0x790 drivers/base/dd.c:828 bus_for_each_drv+0x28e/0x3b0 drivers/base/bus.c:430 __device_attach+0x489/0x750 drivers/base/dd.c:894 device_initial_probe+0x4a/0x60 drivers/base/dd.c:941 bus_probe_device+0x131/0x390 drivers/base/bus.c:490 device_add+0x25b5/0x2df0 drivers/base/core.c:2201 usb_new_device+0x23e5/0x2fb0 drivers/usb/core/hub.c:2536 hub_port_connect drivers/usb/core/hub.c:5098 [inline] hub_port_connect_change drivers/usb/core/hub.c:5213 [inline] port_event drivers/usb/core/hub.c:5359 [inline] hub_event+0x581d/0x72f0 drivers/usb/core/hub.c:5441 process_one_work+0x1572/0x1ef0 kernel/workqueue.c:2269 worker_thread+0x111b/0x2460 kernel/workqueue.c:2415 kthread+0x4b5/0x4f0 kernel/kthread.c:256 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:355 Local variable description: ----saved@get_min_max_with_quirks Variable was created at: get_min_max_with_quirks+0xa8b/0x2ea0 sound/usb/mixer.c:1231 get_min_max_with_quirks+0xa8b/0x2ea0 sound/usb/mixer.c:1231 ===================================================== --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

1 0

[alsa-devel] [PATCH] ALSA: pcm: Yet another missing check of non-cached buffer type
by Takashi Iwai 08 Nov '19

08 Nov '19

For non-x86 architectures, SNDRV_DMA_TYPE_DEV_UC should be treated equivalent with SNDRV_DMA_TYPE_DEV, where the default mmap handler still checks only about SNDRV_DMA_TYPE_DEV. Make the check more proper. Note that all existing users of *_UC buffer types are x86-only, so this doesn't fix any bug, but just for consistency. Fixes: 42e748a0b325 ("ALSA: memalloc: Add non-cached buffer type") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_native.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 998c63192ae4..0c27009dc3df 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3416,7 +3416,8 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, #endif /* CONFIG_GENERIC_ALLOCATOR */ #ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */ if (IS_ENABLED(CONFIG_HAS_DMA) && !substream->ops->page && - substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) + (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV || + substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV_UC)) return dma_mmap_coherent(substream->dma_buffer.dev.dev, area, substream->runtime->dma_area, -- 2.16.4

1 0

[alsa-devel] [PATCH] ALSA: memalloc: Drop snd_dma_pci_data() macro
by Takashi Iwai 08 Nov '19

08 Nov '19

Now that all users have been converted, we can drop snd_dma_pci_data() macro definition. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/memalloc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index 6ada3b8ede4e..3b47832b1c1f 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -21,7 +21,6 @@ struct snd_dma_device { struct device *dev; /* generic device */ }; -#define snd_dma_pci_data(pci) (&(pci)->dev) #define snd_dma_continuous_data(x) ((struct device *)(__force unsigned long)(x)) -- 2.16.4

1 0