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

[alsa-devel] [RFC 0/9] ASoC/ARM: Merge the davinci and omap audio directories
by Peter Ujfalusi 26 Nov '18

26 Nov '18

Hi, This RFC series is on top of the omap-mcbsp cleanup series: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141604.h… For Texas Instruments audio support we have two directories at the moment: davinci omap In reality TI have the following SoC lines supported by Linux: daVinci OMAP Sitara Keystone We already needed to have cross directory 'links' for DRA7x/AM5 since they use McASP (davinci directory) and sDMA (omap directory). Keystone II line of SoCs are using drivers from davinci directory (McASP and EDMA). Which is kind of fine as they are in the same place. With the new AM654 (http://www.ti.com/lit/pdf/spruid7) we will have completely new DMA and there is no place to put that as it does not belong under davinci or omap, but it makes no sense to create yet another TI related directory just for the small udma-pcm. Another issue with the current support is how the Kconfigs are written. The DAI drivers are depending on the ASoC platform drivers and it is a bit of a mess at the moment. For simple-sound-card one need to know what DMA is used and then select the DAI driver (if the Kconfig is right). I have also cleaned up the Kconfig prompts and comments a bit to be more precise. As can be seen in the diffstat I tried to do the merger with minimal code change, resisting the urge to rename the davinci-i2c driver to davinci-asp. With the merger I have created a new Kconfig structure: - Submenu for TI related settings for clarity - Only the DAI drivers are selectable and the platform drivers are selected based on the available (enabled) DMA engines - The remaining ASoC machine drivers are selecting the DAIs they need - The davinci-evm is now a single entry, combining all the various daVinci EVMS it supports and selects the needed DAIs based on the enabled boards The series also includes patches to updated the arch/arm/ files (defconfigs, source files using audio Kconfig symbols). I believe with v1 all of this can be merged via ASoC tree as the chances of conflicts are low for the touched arch/arm files. But Sekhar and Tony can correct me if I'm wrong. I think I have catched all (I hope) issues regarding to Kconfig thanks to the various autobuild machines out there kindly testing my linux-next-wip branch. I would appreciate any testing comments before I send the v1! Regards, Peter --- Peter Ujfalusi (9): ASoC: ti: Merge davinci and omap directories MAINTAINERS: Add entry for sound/soc/ti and update the OMAP audio support ARM: OMAP1: Makefile: Update for new MCBSP Kconfig option ARM: OMAP2: Update for new MCBSP Kconfig option ARM: davinci: dm365-evm: Update for the new ASoC Kcofnig options ARM: omap2plus_defconfig: Update the audio options ARM: omap1_defconfig: Do not select ASoC by default ARM: davinci_all_defconfig: Update the audio options ASoC: ti: Kconfig: Remove the deprecated options MAINTAINERS | 11 +- arch/arm/configs/davinci_all_defconfig | 5 +- arch/arm/configs/omap1_defconfig | 2 - arch/arm/configs/omap2plus_defconfig | 14 +- arch/arm/mach-davinci/board-dm365-evm.c | 4 +- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 4 +- sound/soc/Kconfig | 3 +- sound/soc/Makefile | 3 +- sound/soc/davinci/Kconfig | 106 --------- sound/soc/davinci/Makefile | 16 -- sound/soc/omap/Kconfig | 120 ---------- sound/soc/omap/Makefile | 30 --- sound/soc/ti/Kconfig | 209 ++++++++++++++++++ sound/soc/ti/Makefile | 44 ++++ sound/soc/{omap => ti}/ams-delta.c | 0 sound/soc/{davinci => ti}/davinci-evm.c | 4 +- sound/soc/{davinci => ti}/davinci-i2s.c | 0 sound/soc/{davinci => ti}/davinci-i2s.h | 0 sound/soc/{davinci => ti}/davinci-mcasp.c | 14 +- sound/soc/{davinci => ti}/davinci-mcasp.h | 0 sound/soc/{davinci => ti}/davinci-vcif.c | 0 sound/soc/{davinci => ti}/edma-pcm.c | 0 sound/soc/{davinci => ti}/edma-pcm.h | 4 +- sound/soc/{omap => ti}/n810.c | 0 sound/soc/{omap => ti}/omap-abe-twl6040.c | 0 sound/soc/{omap => ti}/omap-dmic.c | 0 sound/soc/{omap => ti}/omap-dmic.h | 0 .../omap-hdmi-audio.c => ti/omap-hdmi.c} | 0 sound/soc/{omap => ti}/omap-mcbsp-priv.h | 0 sound/soc/{omap => ti}/omap-mcbsp-st.c | 0 sound/soc/{omap => ti}/omap-mcbsp.c | 0 sound/soc/{omap => ti}/omap-mcbsp.h | 0 sound/soc/{omap => ti}/omap-mcpdm.c | 0 sound/soc/{omap => ti}/omap-mcpdm.h | 0 sound/soc/{omap => ti}/omap-twl4030.c | 0 sound/soc/{omap => ti}/omap3pandora.c | 0 sound/soc/{omap => ti}/osk5912.c | 0 sound/soc/{omap => ti}/rx51.c | 0 sound/soc/{omap => ti}/sdma-pcm.c | 0 sound/soc/{omap => ti}/sdma-pcm.h | 4 +- 42 files changed, 294 insertions(+), 307 deletions(-) delete mode 100644 sound/soc/davinci/Kconfig delete mode 100644 sound/soc/davinci/Makefile delete mode 100644 sound/soc/omap/Kconfig delete mode 100644 sound/soc/omap/Makefile create mode 100644 sound/soc/ti/Kconfig create mode 100644 sound/soc/ti/Makefile rename sound/soc/{omap => ti}/ams-delta.c (100%) rename sound/soc/{davinci => ti}/davinci-evm.c (99%) rename sound/soc/{davinci => ti}/davinci-i2s.c (100%) rename sound/soc/{davinci => ti}/davinci-i2s.h (100%) rename sound/soc/{davinci => ti}/davinci-mcasp.c (99%) rename sound/soc/{davinci => ti}/davinci-mcasp.h (100%) rename sound/soc/{davinci => ti}/davinci-vcif.c (100%) rename sound/soc/{davinci => ti}/edma-pcm.c (100%) rename sound/soc/{davinci => ti}/edma-pcm.h (91%) rename sound/soc/{omap => ti}/n810.c (100%) rename sound/soc/{omap => ti}/omap-abe-twl6040.c (100%) rename sound/soc/{omap => ti}/omap-dmic.c (100%) rename sound/soc/{omap => ti}/omap-dmic.h (100%) rename sound/soc/{omap/omap-hdmi-audio.c => ti/omap-hdmi.c} (100%) rename sound/soc/{omap => ti}/omap-mcbsp-priv.h (100%) rename sound/soc/{omap => ti}/omap-mcbsp-st.c (100%) rename sound/soc/{omap => ti}/omap-mcbsp.c (100%) rename sound/soc/{omap => ti}/omap-mcbsp.h (100%) rename sound/soc/{omap => ti}/omap-mcpdm.c (100%) rename sound/soc/{omap => ti}/omap-mcpdm.h (100%) rename sound/soc/{omap => ti}/omap-twl4030.c (100%) rename sound/soc/{omap => ti}/omap3pandora.c (100%) rename sound/soc/{omap => ti}/osk5912.c (100%) rename sound/soc/{omap => ti}/rx51.c (100%) rename sound/soc/{omap => ti}/sdma-pcm.c (100%) rename sound/soc/{omap => ti}/sdma-pcm.h (85%) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

5 14

[alsa-devel] Fwd: [BUG] The infamous MOTU Ultralite * bitcrunch issue
by Stanisław Drozd 26 Nov '18

26 Nov '18

[Originally posted in alsa-user, but that list doesn't appear to be very widely used] Hello everyone, I recently updated the firmware on my UltraLite mk4 (IF YOURS IS WORKING OK, DON'T UPGRADE or you'll repeat my mistake). Current firmware on my piece is 1.3.4+232, 07/27/18 17:46:22, BIOS is Aug-04-2017 b568a4c. After the update an issue appeared - a moment after initializing the device and playing normally, it starts sounding as if it was put through a bitcruncher effect. After a longer while the output loses gain only to disappear completely after some more seconds pass (the gain change is not smooth, it seems to go away in steps). What I have tried: * Switching internal clock to LTC on the interface - would hold the sync together for a little longer; I did NOT send the actual timecode because I had trouble finding something to generate it for me * Switching sample rates - No noticeable change in behavior * Testing with speaker-test - No change in behavior, looks like this has to happen on ALSA level or lower * Changing clock source in Cadence (a JACK helper) settings and reinitializing - No effect Possible clues I saw: * dmesg started showing this when I plug the device in: [ 533.419099] usb 1-2.3: new high-speed USB device number 8 using xhci_hcd [ 533.527638] usb 1-2.3: New USB device found, idVendor=07fd, idProduct=0005, bcdDevice= 2.00 [ 533.527646] usb 1-2.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 533.527650] usb 1-2.3: Product: UltraLite-mk4 [ 533.527654] usb 1-2.3: Manufacturer: MOTU [ 533.527658] usb 1-2.3: SerialNumber: 0001f2fffe008e19 [ 534.377873] usb 1-2.3: clock source 1 is not valid, cannot use <and about 50 more lines of the clock source message> Questions: * What other places can I go to to report this? * What other settings can I tweak? Thanks, Stanislaw PS: I have a basic understanding of driver work, I think I could help with creating a patch with some guidance

1 0

[alsa-devel] [PATCH] ALSA: hda/realtek - fix the pop noise on headphone for lenovo laptops
by Hui Wang 26 Nov '18

26 Nov '18

We have several Lenovo laptops with the codec alc285, when playing sound via headphone, we can hear click/pop noise in the headphone, if we let the headphone share the DAC of NID 0x2 with the speaker, the noise disappears. The Lenovo laptops here include P52, P72, X1 yoda2 and X1 carbon. I have tried to set preferred_dacs and override_conn, but neither of them worked. Thanks for Kailang, he told me to invalidate the NID 0x3 through override_wcaps. BugLink: https://bugs.launchpad.net/bugs/1805079 Cc: <stable(a)vger.kernel.org> Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1118fd1bbf1a..e66da22272fd 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5358,6 +5358,16 @@ static void alc274_fixup_bind_dacs(struct hda_codec *codec, spec->gen.preferred_dacs = preferred_pairs; } +/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */ +static void alc285_fixup_invalidate_dacs(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action != HDA_FIXUP_ACT_PRE_PROBE) + return; + + snd_hda_override_wcaps(codec, 0x03, 0); +} + /* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c" @@ -5495,6 +5505,7 @@ enum { ALC255_FIXUP_DELL_HEADSET_MIC, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, + ALC285_FIXUP_LENOVO_HEADPHONE_NOISE, }; static const struct hda_fixup alc269_fixups[] = { @@ -6362,6 +6373,10 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, + [ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_invalidate_dacs, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -7035,6 +7050,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x12, 0x90a60130}, {0x19, 0x03a11020}, {0x21, 0x0321101f}), + SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_HEADPHONE_NOISE, + {0x12, 0x90a60130}, + {0x14, 0x90170110}, + {0x19, 0x04a11040}, + {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0288, 0x1028, "Dell", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60120}, {0x14, 0x90170110}, -- 2.17.1

2 1

Re: [alsa-devel] [LKP] [ALSA] 3a6d1980fe: kernel_BUG_at_mm/page_alloc.c
by Takashi Iwai 26 Nov '18

26 Nov '18

On Mon, 26 Nov 2018 01:28:05 +0100, kernel test robot wrote: > > FYI, we noticed the following commit (built with gcc-7): > > commit: 3a6d1980fe96dbbfe3ae58db0048867f5319cdbf ("ALSA: Replace snd_malloc_pages() and snd_free_pages() with standard helpers") > https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git for-next .... > [ 174.830284] kernel BUG at mm/page_alloc.c:2850! OK, this seem to be an issue about using __GFP_COMP and alloc_pages_exact(). I didn't hit this while testing locally maybe just because I used the buffer size in power-of-two casually. I dropped the patch until we sort this out. thanks, Takashi

1 0

[alsa-devel] [PATCH 00/10] ASoC: merge audio-graph-scu into audio-graph - step2
by Kuninori Morimoto 26 Nov '18

26 Nov '18

Hi Mark audio-graph card can handle normal sound card, and audio-graph-scu card can handle DPCM sound card. But, we can't use these feature in same time now. So, this is the time to merge audio-graph and audio-graph-scu. The patch-set are a little bit huge (and few patches are depend on posted OF patch. I'm now waiting...), thus, I separated these into few steps. These are step2 patches Kuninori Morimoto (10): ASoC: soc-core: add snd_soc_of_parse_node_prefix() ASoC: simple-scu-card: tidyup "prefix" parsing on Doc ASoC: simple-scu-card: tidyup "prefix" parsing ASoC: audio-graph-scu-card: tidyup "prefix" parsing on Doc ASoC: audio-graph-scu-card: tidyup "prefix" parsing ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing on Doc ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing ASoC: audio-graph-scu-card: tidyup asoc_simple_card_parse_daifmt() timing ASoC: audio-graph-card: tidyup typo SND_AUDIO_GRAPH_CARD ASoC: audio-graph-card: tidyup define position .../bindings/sound/audio-graph-scu-card.txt | 4 +- .../devicetree/bindings/sound/simple-scu-card.txt | 2 +- include/sound/soc.h | 6 +- sound/soc/generic/Kconfig | 2 +- sound/soc/generic/audio-graph-card.c | 10 +-- sound/soc/generic/audio-graph-scu-card.c | 71 ++++++++++------------ sound/soc/generic/simple-scu-card.c | 7 +++ sound/soc/soc-core.c | 11 ++-- 8 files changed, 59 insertions(+), 54 deletions(-) -- 2.7.4

2 22

[alsa-devel] [PATCH] ALSA: pcm: Fix starvation on down_write_nonblock()
by Chanho Min 25 Nov '18

25 Nov '18

Commit 67ec1072b053 (ALSA: pcm: Fix rwsem deadlock for non-atomic PCM stream) fixes deadlock for non-atomic PCM stream. But, This patch causes antother stuck. If writer is RT thread and reader is a normal thread, the reader thread will be difficult to get scheduled. It may not give chance to release read locks and writer gets stuck for a long time or forever if they are pinned to single cpu. To fix this, The writer gives reader a chance to be scheduled by using the minimum msleep() instaed of spinning. This is for concept, We may need to change the function name and comments or suggest another approach. Signed-off-by: Chanho Min <chanho.min(a)lge.com> --- sound/core/pcm_native.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 66c90f4..88d4aab 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -96,7 +96,7 @@ static DECLARE_RWSEM(snd_pcm_link_rwsem); static inline void down_write_nonblock(struct rw_semaphore *lock) { while (!down_write_trylock(lock)) - cond_resched(); + msleep(1); } #define PCM_LOCK_DEFAULT 0 -- 2.1.4

2 2

[alsa-devel] Fwd: [PATCH v2 01/13] conf/ucm: bytcr-rt5645: Use the generic bytcr/PlatformEnableSeq.conf
by youling 257 25 Nov '18

25 Nov '18

---------- Forwarded message --------- From: youling 257 <youling257(a)gmail.com> Date: 2018年11月24日周六下午6:42 Subject: Re: [PATCH v2 01/13] conf/ucm: bytcr-rt5645: Use the generic bytcr/PlatformEnableSeq.conf To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>, Takashi Iwai <tiwai(a)suse.de>, Hans de Goede <hdegoede(a)redhat.com>, <alsa-devel(a)vger.kernel.org> alsaucm -c chtrt5645 set _verb HiFi set _enadev Speaker ALSA lib conf.c:823:(get_char_skip_comments) Cannot access file bytcr/PlatformEnableSeq.conf ALSA lib conf.c:1877:(snd_config_load1) _toplevel_:17:18:Unexpected char ALSA lib utils.c:67:(uc_mgr_config_load) could not open configuration file /usr/share/alsa/ucm/ASUSTeKCOMPUTERINC.-X205TA-1.0-X205TA/ASUSTeKCOMPUTERINC.-X205TA-1.0-X205TA.conf ALSA lib parser.c:1427:(load_master_config) error: could not parse configuration for card ASUSTeKCOMPUTERINC.-X205TA-1.0-X205TA ALSA lib conf.c:823:(get_char_skip_comments) Cannot access file bytcr/PlatformEnableSeq.conf ALSA lib conf.c:1877:(snd_config_load1) _toplevel_:17:18:Unexpected char ALSA lib utils.c:75:(uc_mgr_config_load) could not load configuration file /usr/share/alsa/ucm/chtrt5645/HiFi.conf ALSA lib parser.c:1101:(parse_verb_file) error: failed to open verb file /usr/share/alsa/ucm/chtrt5645/HiFi.conf : -2 ALSA lib main.c:946:(snd_use_case_mgr_open) error: failed to import chtrt5645 use case configuration -22 alsaucm: error failed to open sound card chtrt5645: Invalid argument

1 0

[alsa-devel] [PATCH] ALSA: Replace snd_malloc_pages() and snd_free_pages() with standard helpers
by Takashi Iwai 24 Nov '18

24 Nov '18

snd_malloc_pages() and snd_free_pages() are merely thin wrappers of the standard page allocator / free functions. Even the arguments are compatible with some standard helpers, so there is little merit of keeping these wrappers. This patch replaces the all existing callers of snd_malloc_pages() and snd_free_pages() with the direct calls of the standard helper functions. In this version, we use a recently introduced one, alloc_pages_exact(), which suits better than the old snd_malloc_pages() implementation. Then we can avoid the waste of pages by alignment to power-of-two. Also, the __GFP_COMP flag that has been always added in the old implementation is dropped for most of callers now. The only one that may still need it is the PCM buffer allocation which can be quite large. The rest are single page allocations, so no sense to keep that flag. With these conversions, snd_malloc_pages() and snd_free_pages() are dropped altogether from the whole tree. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/memalloc.h | 4 --- sound/core/memalloc.c | 54 +++------------------------------ sound/core/pcm.c | 14 ++++----- sound/usb/usx2y/usX2Yhwdep.c | 3 +- sound/usb/usx2y/usbusx2y.c | 3 +- sound/usb/usx2y/usx2yhwdeppcm.c | 6 ++-- 6 files changed, 19 insertions(+), 65 deletions(-) diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index af3fa577fa06..c56cb2871368 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -152,9 +152,5 @@ int snd_dma_alloc_pages_fallback(int type, struct device *dev, size_t size, struct snd_dma_buffer *dmab); void snd_dma_free_pages(struct snd_dma_buffer *dmab); -/* basic memory allocation functions */ -void *snd_malloc_pages(size_t size, gfp_t gfp_flags); -void snd_free_pages(void *ptr, size_t size); - #endif /* __SOUND_MEMALLOC_H */ diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 59a4adc286ed..d12bf811e751 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -30,53 +30,6 @@ #endif #include <sound/memalloc.h> -/* - * - * Generic memory allocators - * - */ - -/** - * snd_malloc_pages - allocate pages with the given size - * @size: the size to allocate in bytes - * @gfp_flags: the allocation conditions, GFP_XXX - * - * Allocates the physically contiguous pages with the given size. - * - * Return: The pointer of the buffer, or %NULL if no enough memory. - */ -void *snd_malloc_pages(size_t size, gfp_t gfp_flags) -{ - int pg; - - if (WARN_ON(!size)) - return NULL; - if (WARN_ON(!gfp_flags)) - return NULL; - gfp_flags |= __GFP_COMP; /* compound page lets parts be mapped */ - pg = get_order(size); - return (void *) __get_free_pages(gfp_flags, pg); -} -EXPORT_SYMBOL(snd_malloc_pages); - -/** - * snd_free_pages - release the pages - * @ptr: the buffer pointer to release - * @size: the allocated buffer size - * - * Releases the buffer allocated via snd_malloc_pages(). - */ -void snd_free_pages(void *ptr, size_t size) -{ - int pg; - - if (ptr == NULL) - return; - pg = get_order(size); - free_pages((unsigned long) ptr, pg); -} -EXPORT_SYMBOL(snd_free_pages); - /* * * Bus-specific memory allocators @@ -188,8 +141,9 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, dmab->bytes = 0; switch (type) { case SNDRV_DMA_TYPE_CONTINUOUS: - dmab->area = snd_malloc_pages(size, - (__force gfp_t)(unsigned long)device); + dmab->area = alloc_pages_exact(size, + (__force gfp_t)(unsigned long)device | + __GFP_COMP); dmab->addr = 0; break; #ifdef CONFIG_HAS_DMA @@ -273,7 +227,7 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) { switch (dmab->dev.type) { case SNDRV_DMA_TYPE_CONTINUOUS: - snd_free_pages(dmab->area, dmab->bytes); + free_pages_exact(dmab->area, dmab->bytes); break; #ifdef CONFIG_HAS_DMA #ifdef CONFIG_GENERIC_ALLOCATOR diff --git a/sound/core/pcm.c b/sound/core/pcm.c index fdb9b92fc8d6..1c0ecb22b1f4 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -1004,22 +1004,22 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream, return -ENOMEM; size = PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)); - runtime->status = snd_malloc_pages(size, GFP_KERNEL); + runtime->status = alloc_pages_exact(size, GFP_KERNEL); if (runtime->status == NULL) { kfree(runtime); return -ENOMEM; } - memset((void*)runtime->status, 0, size); + memset(runtime->status, 0, size); size = PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)); - runtime->control = snd_malloc_pages(size, GFP_KERNEL); + runtime->control = alloc_pages_exact(size, GFP_KERNEL); if (runtime->control == NULL) { - snd_free_pages((void*)runtime->status, + free_pages_exact(runtime->status, PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status))); kfree(runtime); return -ENOMEM; } - memset((void*)runtime->control, 0, size); + memset(runtime->control, 0, size); init_waitqueue_head(&runtime->sleep); init_waitqueue_head(&runtime->tsleep); @@ -1045,9 +1045,9 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream) runtime = substream->runtime; if (runtime->private_free != NULL) runtime->private_free(runtime); - snd_free_pages((void*)runtime->status, + free_pages_exact(runtime->status, PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status))); - snd_free_pages((void*)runtime->control, + free_pages_exact(runtime->control, PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control))); kfree(runtime->hw_constraints.rules); /* Avoid concurrent access to runtime via PCM timer interface */ diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c index c1dd9a7b48df..bfe1108416cf 100644 --- a/sound/usb/usx2y/usX2Yhwdep.c +++ b/sound/usb/usx2y/usX2Yhwdep.c @@ -75,7 +75,8 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v if (!us428->us428ctls_sharedmem) { init_waitqueue_head(&us428->us428ctls_wait_queue_head); - if(!(us428->us428ctls_sharedmem = snd_malloc_pages(sizeof(struct us428ctls_sharedmem), GFP_KERNEL))) + us428->us428ctls_sharedmem = alloc_pages_exact(sizeof(struct us428ctls_sharedmem), GFP_KERNEL); + if (!us428->us428ctls_sharedmem) return -ENOMEM; memset(us428->us428ctls_sharedmem, -1, sizeof(struct us428ctls_sharedmem)); us428->us428ctls_sharedmem->CtlSnapShotLast = -2; diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index da4a5a541512..9f7bbed2c0f0 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c @@ -437,7 +437,8 @@ static void snd_usX2Y_card_private_free(struct snd_card *card) kfree(usX2Y(card)->In04Buf); usb_free_urb(usX2Y(card)->In04urb); if (usX2Y(card)->us428ctls_sharedmem) - snd_free_pages(usX2Y(card)->us428ctls_sharedmem, sizeof(*usX2Y(card)->us428ctls_sharedmem)); + free_pages_exact(usX2Y(card)->us428ctls_sharedmem, + sizeof(*usX2Y(card)->us428ctls_sharedmem)); if (usX2Y(card)->card_index >= 0 && usX2Y(card)->card_index < SNDRV_CARDS) snd_usX2Y_card_used[usX2Y(card)->card_index] = 0; } diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 4fd9276b8e50..4453c2b911d0 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c @@ -488,7 +488,9 @@ static int snd_usX2Y_usbpcm_prepare(struct snd_pcm_substream *substream) snd_printdd("snd_usX2Y_pcm_prepare(%p)\n", substream); if (NULL == usX2Y->hwdep_pcm_shm) { - if (NULL == (usX2Y->hwdep_pcm_shm = snd_malloc_pages(sizeof(struct snd_usX2Y_hwdep_pcm_shm), GFP_KERNEL))) + usX2Y->hwdep_pcm_shm = alloc_pages_exact(sizeof(struct snd_usX2Y_hwdep_pcm_shm), + GFP_KERNEL); + if (!usX2Y->hwdep_pcm_shm) return -ENOMEM; memset(usX2Y->hwdep_pcm_shm, 0, sizeof(struct snd_usX2Y_hwdep_pcm_shm)); } @@ -700,7 +702,7 @@ static void snd_usX2Y_hwdep_pcm_private_free(struct snd_hwdep *hwdep) { struct usX2Ydev *usX2Y = hwdep->private_data; if (NULL != usX2Y->hwdep_pcm_shm) - snd_free_pages(usX2Y->hwdep_pcm_shm, sizeof(struct snd_usX2Y_hwdep_pcm_shm)); + free_pages_exact(usX2Y->hwdep_pcm_shm, sizeof(struct snd_usX2Y_hwdep_pcm_shm)); } -- 2.19.1

3 3

[alsa-devel] [PATCH 1/2] ALSA: wss: Fix invalid snd_free_pages() at error path
by Takashi Iwai 24 Nov '18

24 Nov '18

Some spurious calls of snd_free_pages() have been overlooked and remain in the error paths of wss driver code. Since runtime->dma_area is managed by the PCM core helper, we shouldn't release manually. Drop the superfluous calls. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/wss/wss_lib.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 32453f81b95a..3a5008837576 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1531,7 +1531,6 @@ static int snd_wss_playback_open(struct snd_pcm_substream *substream) if (err < 0) { if (chip->release_dma) chip->release_dma(chip, chip->dma_private_data, chip->dma1); - snd_free_pages(runtime->dma_area, runtime->dma_bytes); return err; } chip->playback_substream = substream; @@ -1572,7 +1571,6 @@ static int snd_wss_capture_open(struct snd_pcm_substream *substream) if (err < 0) { if (chip->release_dma) chip->release_dma(chip, chip->dma_private_data, chip->dma2); - snd_free_pages(runtime->dma_area, runtime->dma_bytes); return err; } chip->capture_substream = substream; -- 2.19.1

2 3

[alsa-devel] [PATCH v3 0/3] Huawei laptops
by Ayman Bagabas 24 Nov '18

24 Nov '18

Changes from v2: * Support for Huawei MBX * Style and formating issues [PATCH v3 1/3] The first patch adds support for missing hotkeys on some models. [PATCH v3 2/3] This one enables the front speakers on the Huawei Matebook X Pro (MBXP). This solves bug 200501 https://bugzilla.kernel.org/show_bug.cgi?id=200501 It simply uses the pins configurations generated by hdajackretast using the settings posted on the bug page https://imgur.com/a/N1xsCVZ [PATCH v3 3/3] This enables the micmute LED on Huawei laptops using ACPI calls. Ayman Bagabas (3): x86: add support for Huawei WMI hotkeys. ALSA: hda: fix front speakers on Huawei MBXP. ALSA: hda: add support for Huawei WMI micmute LED drivers/platform/x86/Kconfig | 11 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/huawei_wmi.c | 236 +++++++++++++++++++ include/linux/platform_data/x86/huawei_wmi.h | 9 + sound/pci/hda/huawei_wmi_helper.c | 47 ++++ sound/pci/hda/patch_realtek.c | 29 +++ 6 files changed, 333 insertions(+) create mode 100644 drivers/platform/x86/huawei_wmi.c create mode 100644 include/linux/platform_data/x86/huawei_wmi.h create mode 100644 sound/pci/hda/huawei_wmi_helper.c -- 2.17.2

5 30