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

[alsa-devel] [PATCH] ALSA: hda: Add Lenovo C50 All in one to the power_save blacklist
by Hans de Goede 13 May '18

13 May '18

Power-saving is causing loud plops on the Lenovo C50 All in one, add it to the blacklist. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1572975 Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0981c3c64d87..9a16af179503 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2214,6 +2214,8 @@ static struct snd_pci_quirk power_save_blacklist[] = { SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0), /* https://bugzilla.kernel.org/show_bug.cgi?id=199607 */ SND_PCI_QUIRK(0x8086, 0x2057, "Intel NUC5i7RYB", 0), + /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */ + SND_PCI_QUIRK(0x17aa, 0x36a7, "Lenovo C50 All in one", 0), /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */ SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0), {} -- 2.17.0

2 6

[alsa-devel] [PATCH] ALSA: usb-audio: add boot quirk for Axe-Fx III
by Alberto Aguirre 13 May '18

13 May '18

Wait for Axe-Fx III to fully bootup before initializing card. Signed-off-by: Alberto Aguirre <albaguirre(a)gmail.com> --- sound/usb/quirks.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 5681767cc0d5..f4b69173682c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -851,6 +851,36 @@ static int snd_usb_mbox2_boot_quirk(struct usb_device *dev) return 0; /* Successful boot */ } +static int snd_usb_axefx3_boot_quirk(struct usb_device *dev) +{ + int err; + + dev_dbg(&dev->dev, "Waiting for Axe-Fx III to boot up...\n"); + + /* If the Axe-Fx III has not fully booted, it will timeout when trying + * to enable the audio streaming interface. A more generous timeout is + * used here to detect when the Axe-Fx III has finished booting as the + * set interface message will be acked once it has + */ + err = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), + USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE, + 1, 1, NULL, 0, 120000); + if (err < 0) { + dev_err(&dev->dev, + "failed waiting for Axe-Fx III to boot: %d\n", err); + return err; + } + + dev_dbg(&dev->dev, "Axe-Fx III is now ready\n"); + + err = usb_set_interface(dev, 1, 0); + if (err < 0) + dev_dbg(&dev->dev, + "error stopping Axe-Fx III interface: %d\n", err); + + return 0; +} + /* * Setup quirks */ @@ -1026,6 +1056,8 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, return snd_usb_fasttrackpro_boot_quirk(dev); case USB_ID(0x047f, 0xc010): /* Plantronics Gamecom 780 */ return snd_usb_gamecon780_boot_quirk(dev); + case USB_ID(0x2466, 0x8010): /* Fractal Audio Axe-Fx 3 */ + return snd_usb_axefx3_boot_quirk(dev); } return 0; -- 2.17.0

2 1

[alsa-devel] [PATCH v4] ALSA: core api: define offsets for TLV items
by Ranjani Sridharan 13 May '18

13 May '18

Currently, there are no pre-defined accessors for the elements in topology TLV data. In the absence of such offsets, the tlv data will have to be decoded using hardwired offset numbers 0-N depending on the type of TLV. This patch defines accessor offsets for the type, length, min and mute/step items in TLV data for DB_SCALE type tlv's. These will be used by drivers to decode the TLV data while loading topology thereby improving code readability. The type and len offsets are common for all TLV types. The min and step/mute offsets are specific to DB_SCALE tlv type. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: v4: change placement of tlv accessor offsets include/uapi/sound/tlv.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/uapi/sound/tlv.h b/include/uapi/sound/tlv.h index be5371f09a62..e3437e96519a 100644 --- a/include/uapi/sound/tlv.h +++ b/include/uapi/sound/tlv.h @@ -42,6 +42,10 @@ #define SNDRV_CTL_TLVD_LENGTH(...) \ ((unsigned int)sizeof((const unsigned int[]) { __VA_ARGS__ })) +/* Accessor offsets for TLV data items */ +#define SNDRV_CTL_TLVO_TYPE 0 +#define SNDRV_CTL_TLVO_LEN 1 + #define SNDRV_CTL_TLVD_CONTAINER_ITEM(...) \ SNDRV_CTL_TLVD_ITEM(SNDRV_CTL_TLVT_CONTAINER, __VA_ARGS__) #define SNDRV_CTL_TLVD_DECLARE_CONTAINER(name, ...) \ @@ -61,6 +65,10 @@ SNDRV_CTL_TLVD_DB_SCALE_ITEM(min, step, mute) \ } +/* Accessor offsets for min, mute and step items in dB scale type TLV */ +#define SNDRV_CTL_TLVO_DB_SCALE_MIN 2 +#define SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP 3 + /* dB scale specified with min/max values instead of step */ #define SNDRV_CTL_TLVD_DB_MINMAX_ITEM(min_dB, max_dB) \ SNDRV_CTL_TLVD_ITEM(SNDRV_CTL_TLVT_DB_MINMAX, (min_dB), (max_dB)) -- 2.14.1

3 2

[alsa-devel] [GIT PULL] soundwire updates
by Vinod 13 May '18

13 May '18

Hi Greg, As discussed here is the pull request containing SoundWire streaming patches and email update patch for me. I have added Mark's Ack on ASoC patch as well. The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git next for you to fetch changes up to c46302ec554c575e79d791c7c84fd4c795e97680: soundwire: intel: Add audio DAI ops (2018-05-11 21:48:07 +0530) ---------------------------------------------------------------- Sanyog Kale (7): Documentation: soundwire: Add more documentation soundwire: Add support for SoundWire stream management soundwire: Add support for port management soundwire: Add Master and Slave port programming soundwire: Add helpers for ports operations soundwire: Add bank switch routine soundwire: Add stream configuration APIs Shreyas NC (2): ASoC: Add SoundWire stream programming interface soundwire: Remove cdns_master_ops Vinod Koul (5): soundwire: Update email address for Vinod soundwire: cdns: Add port routines soundwire: cdns: Add stream routines soundwire: intel: Add stream initialization soundwire: intel: Add audio DAI ops .../driver-api/soundwire/error_handling.rst | 65 + Documentation/driver-api/soundwire/index.rst | 3 + Documentation/driver-api/soundwire/locking.rst | 106 ++ Documentation/driver-api/soundwire/stream.rst | 372 +++++ MAINTAINERS | 2 +- drivers/soundwire/Kconfig | 2 +- drivers/soundwire/Makefile | 2 +- drivers/soundwire/bus.c | 43 + drivers/soundwire/bus.h | 72 + drivers/soundwire/cadence_master.c | 451 +++++- drivers/soundwire/cadence_master.h | 151 ++ drivers/soundwire/intel.c | 525 ++++++- drivers/soundwire/intel.h | 4 + drivers/soundwire/intel_init.c | 3 + drivers/soundwire/stream.c | 1479 ++++++++++++++++++++ include/linux/soundwire/sdw.h | 332 ++++- include/linux/soundwire/sdw_intel.h | 14 + include/sound/soc-dai.h | 23 + 18 files changed, 3634 insertions(+), 15 deletions(-) create mode 100644 Documentation/driver-api/soundwire/error_handling.rst create mode 100644 Documentation/driver-api/soundwire/locking.rst create mode 100644 Documentation/driver-api/soundwire/stream.rst create mode 100644 drivers/soundwire/stream.c Thanks -- ~Vinod

2 3

[alsa-devel] KASAN: null-ptr-deref Write in linear_transfer
by syzbot 13 May '18

13 May '18

Hello, syzkaller hit the following crash on 30a7acd573899fd8b8ac39236eff6468b195ac7d git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master compiler: gcc (GCC) 7.1.1 20170620 .config is attached Raw console output is attached. C reproducer is attached syzkaller reproducer is attached. See https://goo.gl/kgGztJ for information about syzkaller reproducers IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+a8f5641f452c7e6abf03(a)syzkaller.appspotmail.com It will help syzbot understand when the bug is fixed. See footer for details. If you forward the report, please keep this part and the footer. ================================================================== BUG: KASAN: null-ptr-deref in memcpy include/linux/string.h:344 [inline] BUG: KASAN: null-ptr-deref in do_convert sound/core/oss/linear.c:52 [inline] BUG: KASAN: null-ptr-deref in convert sound/core/oss/linear.c:81 [inline] BUG: KASAN: null-ptr-deref in linear_transfer+0x634/0x900 sound/core/oss/linear.c:110 Write of size 2 at addr (null) by task syzkaller360172/7860 CPU: 0 PID: 7860 Comm: syzkaller360172 Not tainted 4.15.0-rc6+ #155 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:53 kasan_report_error mm/kasan/report.c:349 [inline] kasan_report+0x13b/0x340 mm/kasan/report.c:409 check_memory_region_inline mm/kasan/kasan.c:260 [inline] check_memory_region+0x137/0x190 mm/kasan/kasan.c:267 memcpy+0x37/0x50 mm/kasan/kasan.c:303 memcpy include/linux/string.h:344 [inline] do_convert sound/core/oss/linear.c:52 [inline] convert sound/core/oss/linear.c:81 [inline] linear_transfer+0x634/0x900 sound/core/oss/linear.c:110 snd_pcm_plug_write_transfer+0x22d/0x420 sound/core/oss/pcm_plugin.c:611 snd_pcm_oss_write2+0x260/0x420 sound/core/oss/pcm_oss.c:1311 snd_pcm_oss_sync1+0x1cc/0x550 sound/core/oss/pcm_oss.c:1530 snd_pcm_oss_sync+0x5b6/0x830 sound/core/oss/pcm_oss.c:1604 snd_pcm_oss_release+0x20b/0x280 sound/core/oss/pcm_oss.c:2431 __fput+0x327/0x7e0 fs/file_table.c:210 ____fput+0x15/0x20 fs/file_table.c:244 task_work_run+0x199/0x270 kernel/task_work.c:113 exit_task_work include/linux/task_work.h:22 [inline] do_exit+0x9bb/0x1ad0 kernel/exit.c:865 do_group_exit+0x149/0x400 kernel/exit.c:968 get_signal+0x73f/0x16c0 kernel/signal.c:2335 do_signal+0x90/0x1eb0 arch/x86/kernel/signal.c:809 exit_to_usermode_loop+0x214/0x310 arch/x86/entry/common.c:158 prepare_exit_to_usermode arch/x86/entry/common.c:195 [inline] syscall_return_slowpath arch/x86/entry/common.c:264 [inline] do_syscall_32_irqs_on arch/x86/entry/common.c:333 [inline] do_fast_syscall_32+0xbfd/0xf9d arch/x86/entry/common.c:389 entry_SYSENTER_compat+0x54/0x63 arch/x86/entry/entry_64_compat.S:129 RIP: 0023:0xf7fcac79 RSP: 002b:00000000f7f8412c EFLAGS: 00000292 ORIG_RAX: 00000000000000f0 RAX: fffffffffffffe00 RBX: 00000000080fd024 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 00000000080fd024 RBP: 0000000000000001 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 ================================================================== Kernel panic - not syncing: panic_on_warn set ... CPU: 0 PID: 7860 Comm: syzkaller360172 Tainted: G B 4.15.0-rc6+ #155 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:53 panic+0x1e4/0x41c kernel/panic.c:183 kasan_end_report+0x50/0x50 mm/kasan/report.c:176 kasan_report_error mm/kasan/report.c:356 [inline] kasan_report+0x144/0x340 mm/kasan/report.c:409 check_memory_region_inline mm/kasan/kasan.c:260 [inline] check_memory_region+0x137/0x190 mm/kasan/kasan.c:267 memcpy+0x37/0x50 mm/kasan/kasan.c:303 memcpy include/linux/string.h:344 [inline] do_convert sound/core/oss/linear.c:52 [inline] convert sound/core/oss/linear.c:81 [inline] linear_transfer+0x634/0x900 sound/core/oss/linear.c:110 snd_pcm_plug_write_transfer+0x22d/0x420 sound/core/oss/pcm_plugin.c:611 snd_pcm_oss_write2+0x260/0x420 sound/core/oss/pcm_oss.c:1311 snd_pcm_oss_sync1+0x1cc/0x550 sound/core/oss/pcm_oss.c:1530 snd_pcm_oss_sync+0x5b6/0x830 sound/core/oss/pcm_oss.c:1604 snd_pcm_oss_release+0x20b/0x280 sound/core/oss/pcm_oss.c:2431 __fput+0x327/0x7e0 fs/file_table.c:210 ____fput+0x15/0x20 fs/file_table.c:244 task_work_run+0x199/0x270 kernel/task_work.c:113 exit_task_work include/linux/task_work.h:22 [inline] do_exit+0x9bb/0x1ad0 kernel/exit.c:865 do_group_exit+0x149/0x400 kernel/exit.c:968 get_signal+0x73f/0x16c0 kernel/signal.c:2335 do_signal+0x90/0x1eb0 arch/x86/kernel/signal.c:809 exit_to_usermode_loop+0x214/0x310 arch/x86/entry/common.c:158 prepare_exit_to_usermode arch/x86/entry/common.c:195 [inline] syscall_return_slowpath arch/x86/entry/common.c:264 [inline] do_syscall_32_irqs_on arch/x86/entry/common.c:333 [inline] do_fast_syscall_32+0xbfd/0xf9d arch/x86/entry/common.c:389 entry_SYSENTER_compat+0x54/0x63 arch/x86/entry/entry_64_compat.S:129 RIP: 0023:0xf7fcac79 RSP: 002b:00000000f7f8412c EFLAGS: 00000292 ORIG_RAX: 00000000000000f0 RAX: fffffffffffffe00 RBX: 00000000080fd024 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 00000000080fd024 RBP: 0000000000000001 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Dumping ftrace buffer: (ftrace buffer empty) Kernel Offset: disabled Rebooting in 86400 seconds.. --- This bug is generated by a dumb bot. It may contain errors. See https://goo.gl/tpsmEJ for details. Direct all questions to syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. If you forgot to add the Reported-by tag, once the fix for this bug is merged into any tree, please reply to this email with: #syz fix: exact-commit-title If you want to test a patch for this bug, please reply with: #syz test: git://repo/address.git branch and provide the patch inline or as an attachment. To mark this as a duplicate of another syzbot report, please reply with: #syz dup: exact-subject-of-another-report If it's a one-off invalid bug report, please reply with: #syz invalid Note: if the crash happens again, it will cause creation of a new bug report. Note: all commands must start from beginning of the line in the email body.

3 4

[alsa-devel] [PATCH v5 00/13] ALSA: hda/ca0132: Patch Series for Recon3Di and Sound Blaster Z Support
by Connor McAdams 13 May '18

13 May '18

This patchset adds support for the Sound Blaster Z and the Recon3Di. In order to figure out how to get these cards to work, I made a program called QemuHDADump[1], which uses the trace function of qemu to see interactions with the memory mapped pci BAR space of the card being used in the virtual machine. With this, I obtain the CORB buffer location to get the command verbs, and then dump them each time the buffer rolls over. This program may be useful for fixing other HDA related driver issues where there is no documentation for the device. So far, I have been able to get all features supported on the Sound Blaster Z and the Recon3Di. All output and input effects work, all inputs and outputs work, and just about anything else I can think of. I have also added new controls in order to select the new inputs and outputs, as well as controls to change the effect levels and presets. I have also added the ability to use firmware taken from the Windows drivers of both the Sound Blaster Z and Recon3Di. I am trying to get into contact with Creative to get permission to redistribute these along with the current file included with the Chromebook, but they have not been very responsive. Luckily, the cards work with the Chromebook firmware just fine, although I believe there has to be a reason they have different firmware in Windows. I will not link to the firmwares here, but if you look up my thread on Creative Labs forums, you will find the link to download the firmwares there. I am willing to help get the other non-working cards such as the ZxR and the newer AE-5 working too, but I will need someone willing to run QemuHDADump in a virtual machine in order to get the commands. So, in summary: -This patchset makes the cards work better than they did before (they really didn't work before) -This patchset leaves the original chromebook related stuff alone. Thanks. [1] https://github.com/Conmanx360/QemuHDADump Bugs: ------------------------------------------------------------------------------- Recon3Di: (Reported by Mariusz Ceier) ******************* -Occasionally switching between rear and front mic breaks the input until computer is shutdown or put to sleep. -Surround Sound works, but is inconsistent. Sometimes, just updating the volume fixes it, and sometimes, it requires a restart. Sound Blaster Z: ******************* -none that I'm aware of. Version changes: ------------------------------------------------------------------------------- v1: ******************* -Massive patch formatting failure, please ignore v1. v2: ******************* -Fixed patch formatting failure. v3: ******************* -Fixed mem_base unmap, instead of checking for QUIRK_SBZ on exit, have it check if the area is mapped, and if it is, unmap it. Also make it unmap after all other commands are finished. -Change notification of failure to map mem_base from codec_dbg to codec_warn, and use codec_info to tell the user that their card might have been incorrectly identified as a Sound Blaster Z. -Remove commented out commands in sbz_exit_chip function, only reintroduce them when their functions are defined. v4: ******************* -Split patch into smaller pieces. -Added const to alt_out_presets array. -Fixed command that was commented out and only put it in when it was actually used. v5: ******************* -Fixed issue identified by kbuild test robot, where patch 12 didn't compile individually. Connor McAdams (13): ALSA: hda/ca0132: R3Di and SBZ quirk entires + alt firmware loading ALSA: hda/ca0132: Add pincfg for SBZ + R3Di, add fp hp auto-detect ALSA: hda/ca0132: Add PCI region2 iomap for SBZ ALSA: hda/ca0132: Add extra exit functions for R3Di and SBZ ALSA: hda/ca0132: add extra init functions for r3di + sbz ALSA: hda/ca0132: update core functions for sbz + r3di ALSA: hda/ca0132: add dsp setup related commands for the sbz ALSA: hda/ca0132: Add dsp setup + gpio functions for r3di ALSA: hda/ca0132: add the ability to set src_id on scp commands ALSA: hda/ca0132: add alt_select_in/out for R3Di + SBZ ALSA: hda/ca0132: Add DSP Volume set and New mixers for SBZ + R3Di ALSA: hda/ca0132: add ca0132_alt_set_vipsource ALSA: hda/ca0132: Add new control changes for SBZ + R3Di sound/pci/hda/patch_ca0132.c | 3057 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 2941 insertions(+), 116 deletions(-) -- 2.7.4

3 16

Re: [alsa-devel] [PATCH v2 09/11] docs: Fix some broken references
by Takashi Iwai 13 May '18

13 May '18

On Wed, 09 May 2018 15:18:52 +0200, Mauro Carvalho Chehab wrote: > > As we move stuff around, some doc references are broken. Fix some of > them via this script: > ./scripts/documentation-file-ref-check --fix-rst > > Manually checked if the produced result is valid, removing a few > false-positives. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> For sound stuff, feel free to take my ack (if it's not too late): Acked-by: Takashi Iwai <tiwai(a)suse.de> thanks, Takashi

1 0

[alsa-devel] [PATCH] ALSA: control: fix a redundant-copy issue
by Wenwen Wang 13 May '18

13 May '18

In snd_ctl_elem_add_compat(), the fields of the struct 'data' need to be copied from the corresponding fields of the struct 'data32' in userspace. This is achieved by invoking copy_from_user() and get_user() functions. The problem here is that the 'type' field is copied twice. One is by copy_from_user() and one is by get_user(). Given that the 'type' field is not used between the two copies, the second copy is *completely* redundant and should be removed for better performance and cleanup. Also, these two copies can cause inconsistent data: as the struct 'data32' resides in userspace and a malicious userspace process can race to change the 'type' field between the two copies to cause inconsistent data. Depending on how the data is used in the future, such an inconsistency may cause potential security risks. For above reasons, we should take out the second copy. Signed-off-by: Wenwen Wang <wang6495(a)umn.edu> --- sound/core/control_compat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index a848836..507fd52 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -396,8 +396,7 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file, if (copy_from_user(&data->id, &data32->id, sizeof(data->id)) || copy_from_user(&data->type, &data32->type, 3 * sizeof(u32))) goto error; - if (get_user(data->owner, &data32->owner) || - get_user(data->type, &data32->type)) + if (get_user(data->owner, &data32->owner)) goto error; switch (data->type) { case SNDRV_CTL_ELEM_TYPE_BOOLEAN: -- 2.7.4

2 1

[alsa-devel] [PATCH v2 0/7] USB Audio Device Class 3.0 BADD profiles support
by Ruslan Bilovol 13 May '18

13 May '18

This patchset adds BADD profiles support from the USB Audio Device Class 3.0 spec [1]. BADD profile support is defined as mandatory feature of UAC3-compliant device, it should be implemented as a separate USB configuration. Notable issue with BADD configuration is that it misses class-specific descriptors (and it's mandatory as per spec), so host should guess them from BADD profile number and parameters of endpoints (type, number of endpoints and max packet size) This patchset adds support of all known/existing BADD profiles from the UAC3 specification. First 5 patches are refactoring and improvements, and last 2 patches actually implement UAC3 BADD profiles support. It's an alternative implementation comparing to [2], and doesn't build usb descriptors on the host but instead initializes alsa-usb structures with known parameters, so we don't need to keep whole class-specific descriptors in the driver since we anyway need to have BADD-specific logic. I've picked one Jorge's UAC1 patch-improvement and updated it to v4.17 wich contais recently introduced header's sanity checks. Remaining part is to add interrupt endpoint support so we will be able to detect jack insertion in the Headset Adapter profile. This has been tested on ARM and x86-64 machines with custom UAC3 gadget which I'll post later to linux-usb Comments and testing are welcome. v2: - split refactoring patch to more atomic and bisectable changes as suggested by Takashi - renamed "Side Tone"->"Sidetone" as suggested by Andrew - revorked main BADD patch to have table lookup for checking BADD channels validity and to reduce identation as suggested by Takashi - also removed code duplication in BADD patch by reusing common part of build_feature_ctl() func v1: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-April/134412.html [1] http://www.usb.org/developers/docs/devclass_docs/USB_Audio_v3.0.zip [2] https://www.spinics.net/lists/alsa-devel/msg71614.html Jorge Sanjuan (1): ALSA: usb: Only get AudioControl header for UAC1 class. Ruslan Bilovol (6): ALSA: usb: stream: move audioformat alloc/init into separate function ALSA: usb: stream: refactor uac1/2 audio interface parsing ALSA: usb: stream: refactor uac3 audio interface parsing ALSA: usb: mixer: make string parsing independent of mixer_build state include: usb: audio-v3: add BADD-specific values ALSA: usb: add UAC3 BADD profiles support include/linux/usb/audio-v3.h | 26 ++ sound/usb/card.c | 53 ++-- sound/usb/clock.c | 9 +- sound/usb/mixer.c | 351 +++++++++++++++++++--- sound/usb/mixer_maps.c | 65 ++++ sound/usb/stream.c | 687 +++++++++++++++++++++++++------------------ sound/usb/usbaudio.h | 2 + 7 files changed, 849 insertions(+), 344 deletions(-) -- 1.9.1

3 10

[alsa-devel] [PATCH v2] ALSA: hda - Add missing HD-Audio codec information
by Shrikant Dharwadkar 13 May '18

13 May '18

This adds missing HD-Audio codec information such as GPIO info, power controls, volume capabilities from HDA spec. These additional info can be useful in debugging issues. Following are the info that are being added: Function group nodes -Add power state controls -Add subordinate node count parameters -Add function group type information -Add function group capabilities -Add unsolicited response controls -Add input converter SDI select information -Add GPIO enable control -Add GPIO direction information -Add GPIO wake enable information -Add GPIO unsolicited control information -Add GPIO sticky mask data -Add GPIO data sets associated with GPIO signals Widget nodes -Add pin widget controls -Add power state controls -Add converter stream and channel controls -Add processing state information -Add processing capabilities -Add volume knob capabilities -Add volume knob control information -Add digital converter control information -Add pin sense control information -Add EAPD/BTL enable controls -Add unsolicited response controls Signed-off-by: Shrikant Dharwadkar <shrikant.dharwadkar(a)intel.com> --- sound/hda/hdac_sysfs.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index fb2aa34..b1acff2 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c @@ -37,6 +37,9 @@ static ssize_t type##_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(type) +#define CODEC_PRINT(verb) sprintf(buf, "0x%08x\n", \ + snd_hdac_read_parm(codec, nid, verb)) + CODEC_ATTR(type); CODEC_ATTR(vendor_id); CODEC_ATTR(subsystem_id); @@ -173,6 +176,12 @@ static ssize_t pin_caps_show(struct hdac_device *codec, hda_nid_t nid, snd_hdac_read_parm(codec, nid, AC_PAR_PIN_CAP)); } +static ssize_t pin_widget_ctl_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_PIN_WIDGET_CONTROL); +} + static ssize_t pin_cfg_show(struct hdac_device *codec, hda_nid_t nid, struct widget_attribute *attr, char *buf) { @@ -243,6 +252,14 @@ static ssize_t power_caps_show(struct hdac_device *codec, hda_nid_t nid, snd_hdac_read_parm(codec, nid, AC_PAR_POWER_STATE)); } +static ssize_t power_states_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + if (nid != codec->afg && !(get_wcaps(codec, nid) & AC_WCAP_POWER)) + return 0; + return CODEC_PRINT(AC_VERB_GET_POWER_STATE); +} + static ssize_t gpio_caps_show(struct hdac_device *codec, hda_nid_t nid, struct widget_attribute *attr, char *buf) { @@ -266,27 +283,166 @@ static ssize_t connections_show(struct hdac_device *codec, hda_nid_t nid, return ret; } +static ssize_t converter_stream_channel_show(struct hdac_device *codec, + hda_nid_t nid, struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_CONV); +} + +static ssize_t processing_states_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_PROC_STATE); +} + +static ssize_t subordinate_node_count_show(struct hdac_device *codec, + hda_nid_t nid, struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_PAR_NODE_COUNT); +} + +static ssize_t function_group_type_show(struct hdac_device *codec, + hda_nid_t nid, struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_PAR_FUNCTION_TYPE); +} + +static ssize_t processing_caps_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_PAR_PROC_CAP); +} + +static ssize_t volume_knob_caps_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_PAR_VOL_KNB_CAP); +} + +static ssize_t volume_knob_ctl_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_VOLUME_KNOB_CONTROL); +} + +static ssize_t digital_converter_ctl_show(struct hdac_device *codec, + hda_nid_t nid, struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_DIGI_CONVERT_1); +} + +static ssize_t pin_sense_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_PIN_SENSE); +} + +static ssize_t EAPD_BTL_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_EAPD_BTLENABLE); +} + +static ssize_t unsol_caps_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_UNSOLICITED_RESPONSE); +} + +static ssize_t sdi_select_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_SDI_SELECT); +} + +static ssize_t gpio_enable_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_GPIO_MASK); +} + +static ssize_t gpio_direction_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_GPIO_DIRECTION); +} + +static ssize_t gpio_wake_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_GPIO_WAKE_MASK); +} + +static ssize_t gpio_unsol_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK); +} + +static ssize_t gpio_sticky_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_GPIO_STICKY_MASK); +} + +static ssize_t gpio_data_show(struct hdac_device *codec, hda_nid_t nid, + struct widget_attribute *attr, char *buf) +{ + return CODEC_PRINT(AC_VERB_GET_GPIO_DATA); +} + static WIDGET_ATTR_RO(caps); static WIDGET_ATTR_RO(pin_caps); static WIDGET_ATTR_RO(pin_cfg); +static WIDGET_ATTR_RO(pin_widget_ctl); static WIDGET_ATTR_RO(pcm_caps); static WIDGET_ATTR_RO(pcm_formats); static WIDGET_ATTR_RO(amp_in_caps); static WIDGET_ATTR_RO(amp_out_caps); static WIDGET_ATTR_RO(power_caps); +static WIDGET_ATTR_RO(power_states); static WIDGET_ATTR_RO(gpio_caps); static WIDGET_ATTR_RO(connections); +static WIDGET_ATTR_RO(converter_stream_channel); +static WIDGET_ATTR_RO(processing_states); +static WIDGET_ATTR_RO(subordinate_node_count); +static WIDGET_ATTR_RO(function_group_type); +static WIDGET_ATTR_RO(processing_caps); +static WIDGET_ATTR_RO(volume_knob_caps); +static WIDGET_ATTR_RO(volume_knob_ctl); +static WIDGET_ATTR_RO(digital_converter_ctl); +static WIDGET_ATTR_RO(pin_sense); +static WIDGET_ATTR_RO(EAPD_BTL); +static WIDGET_ATTR_RO(unsol_caps); +static WIDGET_ATTR_RO(sdi_select); +static WIDGET_ATTR_RO(gpio_enable); +static WIDGET_ATTR_RO(gpio_direction); +static WIDGET_ATTR_RO(gpio_wake); +static WIDGET_ATTR_RO(gpio_unsol); +static WIDGET_ATTR_RO(gpio_sticky); +static WIDGET_ATTR_RO(gpio_data); static struct attribute *widget_node_attrs[] = { &wid_attr_caps.attr, &wid_attr_pin_caps.attr, + &wid_attr_pin_widget_ctl.attr, &wid_attr_pin_cfg.attr, &wid_attr_pcm_caps.attr, &wid_attr_pcm_formats.attr, &wid_attr_amp_in_caps.attr, &wid_attr_amp_out_caps.attr, &wid_attr_power_caps.attr, + &wid_attr_power_states.attr, &wid_attr_connections.attr, + &wid_attr_converter_stream_channel.attr, + &wid_attr_processing_states.attr, + &wid_attr_processing_caps.attr, + &wid_attr_volume_knob_caps.attr, + &wid_attr_volume_knob_ctl.attr, + &wid_attr_digital_converter_ctl.attr, + &wid_attr_pin_sense.attr, + &wid_attr_EAPD_BTL.attr, + &wid_attr_unsol_caps.attr, NULL, }; @@ -296,7 +452,18 @@ static struct attribute *widget_afg_attrs[] = { &wid_attr_amp_in_caps.attr, &wid_attr_amp_out_caps.attr, &wid_attr_power_caps.attr, + &wid_attr_power_states.attr, &wid_attr_gpio_caps.attr, + &wid_attr_subordinate_node_count.attr, + &wid_attr_function_group_type.attr, + &wid_attr_unsol_caps.attr, + &wid_attr_sdi_select.attr, + &wid_attr_gpio_enable.attr, + &wid_attr_gpio_direction.attr, + &wid_attr_gpio_wake.attr, + &wid_attr_gpio_unsol.attr, + &wid_attr_gpio_sticky.attr, + &wid_attr_gpio_data.attr, NULL, }; -- 2.7.4

2 1