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

Re: regression with SG DMA buf allocations and IOMMU in low-mem
by Kai Vehmanen 14 Nov '22

14 Nov '22

Hi, On Fri, 4 Nov 2022, Takashi Iwai wrote: > On Fri, 04 Nov 2022 15:56:50 +0100, Kai Vehmanen wrote: > > Looking at 5.15 code, the fallback looks very different, but > > in fallback we still use the DMA mapping API via snd_dma_dev_alloc() > > so even if we go to fallback path, mapping is still ok. > > > > Any ideas which way this should be fixed? Given the many changes > > I thought it's better to ask early on the list about this. > > Hrm, that's a tough issue. Basically if dma_alloc_noncontiguous() > fails, it's really out of memory -- at least under the situation where > IOMMU is enabled. The fallback path was introduced for the case where > there is no IOMMU and noncontiguous allocation fails from the > beginning. follow-up to this problem. It turns out there was additional problem with dma_alloc_noncontiguous that led to ENOMEM much more frequently than in the past. This required following: - your rework in 5.16 to sound/core/memalloc.c for x86 DMA SG - IOMMU/DMAR enabled for the device - CONFIG_DMA_REMAP=n (default 'n' on most/all x86 systems before 5.18) ... with above combination, iommu_dma_ops in drivers/iommu/dma-iommu.c were not defined for noncontiguous alloc/free, so the dma_alloc_noncontiguous() in the end went back to plain dma_common_alloc_pages() (single contiguous alloc), which would fail very easily when system was in low-mem condition. In 5.18, this patch was added commit f5ff79fddf0efecca538046b5cc20fb3ded2ec4f Author: Christoph Hellwig <hch(a)lst.de> Date: Sat Feb 26 16:40:21 2022 +0100 dma-mapping: remove CONFIG_DMA_REMAP ... and this basicly fixes the issue again, even when IOMMU is enabled. Br, Kai

1 0

[PATCH] ALSA: memalloc: Allocate more contiguous pages for fallback case
by Takashi Iwai 14 Nov '22

14 Nov '22

Currently the fallback SG allocation tries to allocate each single page, and this tends to result in the reverse order of memory addresses when large space is available at boot, as the kernel takes a free page from the top to the bottom in the zone. The end result looks as if non-contiguous (although it actually is). What's worth is that it leads to an overflow of BDL entries for HD-audio. For avoiding such a problem, this patch modifies the allocation code slightly; now it tries to allocate the larger contiguous chunks as much as possible, then reduces to the smaller chunks only if the allocation failed -- a similar strategy as the existing snd_dma_alloc_pages_fallback() function. Along with the trick, drop the unused address array from snd_dma_sg_fallback object. It was needed in the past when dma_alloc_coherent() was used, but with the standard page allocator, it became superfluous and never referred. Fixes: a8d302a0b770 ("ALSA: memalloc: Revive x86-specific WC page allocations again") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/memalloc.c | 44 ++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index ba095558b6d1..7268304009ad 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -720,7 +720,6 @@ static const struct snd_malloc_ops snd_dma_sg_wc_ops = { struct snd_dma_sg_fallback { size_t count; struct page **pages; - dma_addr_t *addrs; }; static void __snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab, @@ -732,38 +731,49 @@ static void __snd_dma_sg_fallback_free(struct snd_dma_buffer *dmab, for (i = 0; i < sgbuf->count && sgbuf->pages[i]; i++) do_free_pages(page_address(sgbuf->pages[i]), PAGE_SIZE, wc); kvfree(sgbuf->pages); - kvfree(sgbuf->addrs); kfree(sgbuf); } static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size) { struct snd_dma_sg_fallback *sgbuf; - struct page **pages; - size_t i, count; + struct page **pagep, *curp; + size_t chunk, npages; + dma_addr_t addr; void *p; bool wc = dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK; sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL); if (!sgbuf) return NULL; - count = PAGE_ALIGN(size) >> PAGE_SHIFT; - pages = kvcalloc(count, sizeof(*pages), GFP_KERNEL); - if (!pages) - goto error; - sgbuf->pages = pages; - sgbuf->addrs = kvcalloc(count, sizeof(*sgbuf->addrs), GFP_KERNEL); - if (!sgbuf->addrs) + size = PAGE_ALIGN(size); + sgbuf->count = size >> PAGE_SHIFT; + sgbuf->pages = kvcalloc(sgbuf->count, sizeof(*sgbuf->pages), GFP_KERNEL); + if (!sgbuf->pages) goto error; - for (i = 0; i < count; sgbuf->count++, i++) { - p = do_alloc_pages(dmab->dev.dev, PAGE_SIZE, &sgbuf->addrs[i], wc); - if (!p) - goto error; - sgbuf->pages[i] = virt_to_page(p); + pagep = sgbuf->pages; + chunk = size; + while (size > 0) { + chunk = min(size, chunk); + p = do_alloc_pages(dmab->dev.dev, chunk, &addr, wc); + if (!p) { + if (chunk <= PAGE_SIZE) + goto error; + chunk >>= 1; + chunk = PAGE_SIZE << get_order(chunk); + continue; + } + + size -= chunk; + /* fill pages */ + npages = chunk >> PAGE_SHIFT; + curp = virt_to_page(p); + while (npages--) + *pagep++ = curp++; } - p = vmap(pages, count, VM_MAP, PAGE_KERNEL); + p = vmap(sgbuf->pages, sgbuf->count, VM_MAP, PAGE_KERNEL); if (!p) goto error; dmab->private_data = sgbuf; -- 2.35.3

2 1

[PATCH v2 0/2] ASoC: Intel: avs: DSP recovery and resume fixes
by Cezary Rojewski 14 Nov '22

14 Nov '22

Two fixes that are result of the recent discussions [1][2]. First adds missing locking around snd_pcm_stop() while the second fix sets substream state to DISCONNECTED if any suspend/resume related operation fails so that userspace has means to be aware that something went wrong during said operation. Changes in v2: - __snd_pcm_set_state() replaced direct assignments of PCM state [1]: https://lore.kernel.org/alsa-devel/73e6425f-8e51-e26f-ad83-ccc5df517a43@int… [2]: https://lore.kernel.org/alsa-devel/20221104131244.3920179-1-cezary.rojewski… Cezary Rojewski (2): ASoC: Intel: avs: Lock substream before snd_pcm_stop() ASoC: Intel: avs: Disconnect substream if suspend or resume fails sound/soc/intel/avs/ipc.c | 2 ++ sound/soc/intel/avs/pcm.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) -- 2.25.1

2 10

[PATCH v1] sound/pci/hda/patch_realtek: don't call alc_shutup_pins without a spec
by Daniil Tatianin 14 Nov '22

14 Nov '22

alc_shutup_pins always expects the spec to be present, so make sure it is before we call it. Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Signed-off-by: Daniil Tatianin <d-tatianin(a)yandex-team.ru> --- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 60e3bc124836..2cf4b64971d7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -939,10 +939,12 @@ static inline void alc_shutup(struct hda_codec *codec) { struct alc_spec *spec = codec->spec; + if (!spec) + return; if (!snd_hda_get_bool_hint(codec, "shutup")) return; /* disabled explicitly by hints */ - if (spec && spec->shutup) + if (spec->shutup) spec->shutup(codec); else alc_shutup_pins(codec); -- 2.25.1

2 3

[PATCH] ALSA: usb-audio: Drop snd_BUG_ON() from snd_usbmidi_output_open()
by Takashi Iwai 12 Nov '22

12 Nov '22

snd_usbmidi_output_open() has a check of the NULL port with snd_BUG_ON(). snd_BUG_ON() was used as this shouldn't have happened, but in reality, the NULL port may be seen when the device gives an invalid endpoint setup at the descriptor, hence the driver skips the allocation. That is, the check itself is valid and snd_BUG_ON() should be dropped from there. Otherwise it's confusing as if it were a real bug, as recently syzbot stumbled on it. Reported-by: syzbot+9abda841d636d86c41da(a)syzkaller.appspotmail.com Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/syzbot+9abda841d636d86c41da@syzkaller.appspotmail… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/midi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/usb/midi.c b/sound/usb/midi.c index bbff0923d264..2839f6b6f09b 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1133,10 +1133,8 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream) port = &umidi->endpoints[i].out->ports[j]; break; } - if (!port) { - snd_BUG(); + if (!port) return -ENXIO; - } substream->runtime->private_data = port; port->state = STATE_UNKNOWN; -- 2.35.3

1 0

[syzbot] WARNING in snd_usbmidi_output_open
by syzbot 12 Nov '22

12 Nov '22

Hello, syzbot found the following issue on: HEAD commit: f8f60f322f06 Add linux-next specific files for 20221111 git tree: linux-next console+strace: https://syzkaller.appspot.com/x/log.txt?x=12fe828e880000 kernel config: https://syzkaller.appspot.com/x/.config?x=85ba52c07cd97289 dashboard link: https://syzkaller.appspot.com/bug?extid=9abda841d636d86c41da compiler: gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=160e91fa880000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=161d3e69880000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/6008df424195/disk-f8f60f32.raw… vmlinux: https://storage.googleapis.com/syzbot-assets/394340525f66/vmlinux-f8f60f32.… kernel image: https://storage.googleapis.com/syzbot-assets/b13604a3343a/bzImage-f8f60f32.… IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+9abda841d636d86c41da(a)syzkaller.appspotmail.com ------------[ cut here ]------------ BUG? WARNING: CPU: 0 PID: 5267 at sound/usb/midi.c:1137 snd_usbmidi_output_open+0xd8/0x410 sound/usb/midi.c:1137 Modules linked in: CPU: 0 PID: 5267 Comm: syz-executor895 Not tainted 6.1.0-rc4-next-20221111-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 RIP: 0010:snd_usbmidi_output_open+0xd8/0x410 sound/usb/midi.c:1137 Code: 3c 02 00 0f 85 03 03 00 00 4d 8b be 10 02 00 00 4d 85 ff 0f 85 c8 00 00 00 e8 d4 92 25 fa 48 c7 c7 a0 6e f2 8a e8 02 da 04 02 <0f> 0b 41 bc fa ff ff ff e8 bb 92 25 fa 44 89 e0 48 83 c4 08 5b 5d RSP: 0018:ffffc90003b7f3a0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff888146c8d000 RCX: 0000000000000000 RDX: ffff8880245d3a80 RSI: ffffffff81624e68 RDI: fffff5200076fe66 RBP: ffff88801ed9c900 R08: 0000000000000005 R09: 0000000000000000 R10: 0000000080000000 R11: 0000000000000000 R12: ffff88814017cc00 R13: 0000000000000000 R14: ffff88802b1d5000 R15: 0000000000000000 FS: 00005555574d4300(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f6ed57c3670 CR3: 0000000076149000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> open_substream+0x41d/0x8c0 sound/core/rawmidi.c:344 rawmidi_open_priv+0x591/0x6f0 sound/core/rawmidi.c:394 snd_rawmidi_kernel_open+0x1b5/0x270 sound/core/rawmidi.c:429 midisynth_use+0xee/0x270 sound/core/seq/seq_midi.c:215 subscribe_port sound/core/seq/seq_ports.c:412 [inline] check_and_subscribe_port+0x89a/0xb80 sound/core/seq/seq_ports.c:495 snd_seq_port_connect+0x382/0x540 sound/core/seq/seq_ports.c:581 snd_seq_ioctl_subscribe_port+0x1fc/0x400 sound/core/seq/seq_clientmgr.c:1490 snd_seq_kernel_client_ctl+0x102/0x1c0 sound/core/seq/seq_clientmgr.c:2367 snd_seq_oss_midi_open+0x582/0x6e0 sound/core/seq/oss/seq_oss_midi.c:361 snd_seq_oss_synth_setup_midi+0x12d/0x530 sound/core/seq/oss/seq_oss_synth.c:269 snd_seq_oss_open+0x8b8/0xa70 sound/core/seq/oss/seq_oss_init.c:260 odev_open+0x6c/0x90 sound/core/seq/oss/seq_oss.c:128 soundcore_open+0x44e/0x620 sound/sound_core.c:593 chrdev_open+0x266/0x770 fs/char_dev.c:414 do_dentry_open+0x6cc/0x13f0 fs/open.c:882 do_open fs/namei.c:3557 [inline] path_openat+0x1bbc/0x2a50 fs/namei.c:3713 do_filp_open+0x1b6/0x400 fs/namei.c:3740 do_sys_openat2+0x16d/0x4c0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_openat fs/open.c:1342 [inline] __se_sys_openat fs/open.c:1337 [inline] __x64_sys_openat+0x13f/0x1f0 fs/open.c:1337 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f496367ae39 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 14 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffc99e01aa8 EFLAGS: 00000246 ORIG_RAX: 0000000000000101 RAX: ffffffffffffffda RBX: 00000000000f4240 RCX: 00007f496367ae39 RDX: 0000000000020983 RSI: 0000000020000080 RDI: ffffffffffffff9c RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000d066 R13: 00007ffc99e01abc R14: 00007ffc99e01ad0 R15: 00007ffc99e01ac0 </TASK> --- This report 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 issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches

3 3

[GIT PULL] ASoC fixes for v6.2-rc4
by Mark Brown 12 Nov '22

12 Nov '22

The following changes since commit e9441675edc1bb8dbfadacf68aafacca60d65a25: ASoC: SOF: Intel: hda-codec: fix possible memory leak in hda_codec_device_init() (2022-10-21 13:04:14 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.2-rc4 for you to fetch changes up to 7d945b046be3d2605dbb1806e73095aadd7ae129: ASoC: stm32: dfsdm: manage cb buffers cleanup (2022-11-09 17:56:37 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.1 A relatively large collection of fixes and new platform quirks here, they're all fairly minor though - the widest possible impact is the fix to the use of prefixes on regulator names which would have broken any device that integrates regulators with DAPM and was used in a system where it had a name prefix assigning to it. ---------------------------------------------------------------- Brent Mendelsohn (1): ASoC: amd: yc: Add Alienware m17 R5 AMD into DMI table Chen Zhongjin (2): ASoC: core: Fix use-after-free in snd_soc_exit() ASoC: soc-utils: Remove __exit for snd_soc_util_exit() Hans de Goede (1): ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01 Jason Montleon (2): ASoC: rt5514: fix legacy dai naming ASoC: rt5677: fix legacy dai naming Kai Vehmanen (1): ASoC: SOF: ipc3-topology: use old pipeline teardown flow with SOF2.1 and older Maarten Zanders (1): ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N Martin Povišer (3): ASoC: tas2770: Fix set_tdm_slot in case of single slot ASoC: tas2764: Fix set_tdm_slot in case of single slot ASoC: tas2780: Fix set_tdm_slot in case of single slot Olivier Moysan (1): ASoC: stm32: dfsdm: manage cb buffers cleanup Paul Cercueil (1): ASoC: dapm: Don't use prefix for regulator name Peter Ujfalusi (1): ASoC: SOF: topology: No need to assign core ID if token parsing failed Pierre-Louis Bossart (2): ASoC: Intel: soc-acpi: add ES83x6 support to IceLake ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake Tzung-Bi Shih (1): MAINTAINERS: update Tzung-Bi's email address Zhu Ning (1): ASoC: sof_es8336: reduce pop noise on speaker .mailmap | 1 + .../bindings/sound/google,cros-ec-codec.yaml | 2 +- .../devicetree/bindings/sound/realtek,rt1015p.yaml | 2 +- MAINTAINERS | 2 +- include/sound/sof/info.h | 4 ++ sound/hda/intel-dsp-config.c | 5 ++ sound/soc/amd/yc/acp6x-mach.c | 7 +++ sound/soc/codecs/rt5514-spi.c | 15 +++--- sound/soc/codecs/rt5677-spi.c | 19 +++---- sound/soc/codecs/tas2764.c | 19 +++---- sound/soc/codecs/tas2770.c | 20 +++----- sound/soc/codecs/tas2780.c | 19 +++---- sound/soc/fsl/fsl_asrc.c | 2 +- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_sai.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 7 +++ sound/soc/intel/boards/sof_es8336.c | 60 +++++++++++++++++----- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 13 +++++ sound/soc/soc-core.c | 17 +++++- sound/soc/soc-dapm.c | 2 +- sound/soc/soc-utils.c | 2 +- sound/soc/sof/ipc3-topology.c | 15 ++++-- sound/soc/sof/topology.c | 20 ++++---- sound/soc/stm/stm32_adfsdm.c | 11 ++++ 24 files changed, 173 insertions(+), 95 deletions(-)

2 2

[PATCH] ALSA: memalloc: Try dma_alloc_noncontiguous() at first
by Takashi Iwai 12 Nov '22

12 Nov '22

The latest fix for the non-contiguous memalloc helper changed the allocation method for a non-IOMMU system to use only the fallback allocator. This should have worked, but it caused a problem sometimes when too many non-contiguous pages are allocated that can't be treated by HD-audio controller. As a quirk workaround, go back to the original strategy: use dma_alloc_noncontiguous() at first, and apply the fallback only when it fails, but only for non-IOMMU case. We'll need a better fix in the fallback code as well, but this workaround should paper over most cases. Fixes: 9736a325137b ("ALSA: memalloc: Don't fall back for SG-buffer with IOMMU") Reported-by: Linus Torvalds <torvalds(a)linux-foundation.org> Link: https://lore.kernel.org/r/CAHk-=wgSH5ubdvt76gNwa004ooZAEJL_1Q-Fyw5M2FDdqL==… Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/memalloc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 6a81aaab25ab..ba095558b6d1 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -542,8 +542,10 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) struct sg_table *sgt; void *p; + sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir, + DEFAULT_GFP, 0); #ifdef CONFIG_SND_DMA_SGBUF - if (!get_dma_ops(dmab->dev.dev)) { + if (!sgt && !get_dma_ops(dmab->dev.dev)) { if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG) dmab->dev.type = SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK; else @@ -551,9 +553,6 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) return snd_dma_sg_fallback_alloc(dmab, size); } #endif - - sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir, - DEFAULT_GFP, 0); if (!sgt) return NULL; -- 2.35.3

1 0

Build failure with upcoming Clang 16 (-Wincompatible-function-pointer-types)
by GitHub issues - opened 12 Nov '22

12 Nov '22

alsa-project/alsa-tools issue #12 was opened from thesamesam: Clang 16 will make -Wincompatible-function-pointer-types an error by default. You can emulate this error using: * GCC via -Werror=incompatible-pointer-types (GCC lacks a more specific warning for just func. ptrs) * Clang <16 via -Werror=incompatible-function-pointer-types Originally reported downstream in Gentoo at https://bugs.gentoo.org/880997. ``` echomixer.c:2108:7: error: incompatible function pointer types passing 'void (GtkWidget *, gpointer)' (aka 'void (struct _GtkWidget *, void *)') to parameter of type 'GCallback' (aka 'void (*)(void)') [-Werror,-Wincompatible-function-pointer-types] ...gtk_signal_connect(GTK_OBJECT(menuitem), "activate", Digital_mode_activate, (gpointer)(long)i); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/gtk-2.0/gtk/gtksignal.h:51:47: note: expanded from macro 'gtk_signal_connect' gtk_signal_connect_full ((object), (name), (func), NULL, (func_data)... ^~~~~~ /usr/include/gtk-2.0/gtk/gtksignal.h:123:23: note: passing argument to parameter 'func' here GCallback func, ^ [...] ``` Full build log: https://bugs.gentoo.org/attachment.cgi?id=831477 Issue URL : https://github.com/alsa-project/alsa-tools/issues/12 Repository URL: https://github.com/alsa-project/alsa-tools

1 0

[PATCH v2] ASoC: codecs: wsa883x: use correct header file
by Randy Dunlap 11 Nov '22

11 Nov '22

Fix build errors when GPIOLIB is not set/enabled: ../sound/soc/codecs/wsa883x.c: In function 'wsa883x_probe': ../sound/soc/codecs/wsa883x.c:1394:25: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Werror=implicit-function-declaration] wsa883x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown", ../sound/soc/codecs/wsa883x.c:1395:49: error: 'GPIOD_FLAGS_BIT_NONEXCLUSIVE' undeclared (first use in this function) GPIOD_FLAGS_BIT_NONEXCLUSIVE); ../sound/soc/codecs/wsa883x.c:1414:9: error: implicit declaration of function 'gpiod_direction_output'; did you mean 'gpio_direction_output'? [-Werror=implicit-function-declaration] gpiod_direction_output(wsa883x->sd_n, 1); Fixes: 43b8c7dc85a1 ("ASoC: codecs: add wsa883x amplifier support") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Reported-by: kernel test robot <lkp(a)intel.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Banajit Goswami <bgoswami(a)quicinc.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: alsa-devel(a)alsa-project.org Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> --- v2: add the correct header file instead of messing with GPIOLIB in Kconfig sound/soc/codecs/wsa883x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -- a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -7,7 +7,7 @@ #include <linux/debugfs.h> #include <linux/delay.h> #include <linux/device.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h>

3 2