October 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: rt5616: fix 0x91 default value
by Bard Liao 20 Oct '17

20 Oct '17

The default value of register 0x91 is 0x0c00 instead of 0x0000. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5616.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c index c94e94f..0e5f54a 100644 --- a/sound/soc/codecs/rt5616.c +++ b/sound/soc/codecs/rt5616.c @@ -98,7 +98,7 @@ static const struct reg_default rt5616_reg[] = { { 0x8e, 0x0004 }, { 0x8f, 0x1100 }, { 0x90, 0x0000 }, - { 0x91, 0x0000 }, + { 0x91, 0x0c00 }, { 0x92, 0x0000 }, { 0x93, 0x2000 }, { 0x94, 0x0200 }, -- 2.7.4

1 0

[alsa-devel] [PATCH] tinycompress: clarify dual-license wording
by Pierre-Louis Bossart 20 Oct '17

20 Oct '17

There were reports of confusion in legal circles introduced by the wording "tinycompress is provided under LGPL and BSD dual license" in the README. Clarify with the addition of the wording traditionally used for dual licenses: "This file is provided under a dual BSD/LGPLv2.1 license. When using or redistributing this file, you may do so under either license" Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- COPYING | 3 +++ README | 3 ++- include/tinycompress/tinycompress.h | 3 +++ include/tinycompress/tinymp3.h | 3 +++ include/tinycompress/version.h | 3 +++ src/lib/compress.c | 3 +++ src/utils/cplay.c | 3 +++ src/utils/crecord.c | 3 +++ 8 files changed, 23 insertions(+), 1 deletion(-) diff --git a/COPYING b/COPYING index f963926..dfc7426 100644 --- a/COPYING +++ b/COPYING @@ -1,3 +1,6 @@ +tinycompress is provided under a dual BSD/LGPLv2.1 license. When using or + redistributing tinycompress, you may do so under either license. + BSD LICENSE tinycompress library for compress audio offload in alsa diff --git a/README b/README index 73c19a6..689ca75 100644 --- a/README +++ b/README @@ -22,7 +22,8 @@ Http: http://git.alsa-project.org/?p=tinycompress.git alsa-devel(a)alsa-project.org. 4. LICENSE - tinycompress is provided under LGPL and BSD dual license + tinycompress is provided under a dual BSD/LGPLv2.1 license. When using or + redistributing tinycompress, you may do so under either license. 5. CREDITS - Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> for library design diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index 68626a4..780dce6 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -1,4 +1,7 @@ /* + * This file is provided under a dual BSD/LGPLv2.1 license. When using or + * redistributing this file, you may do so under either license. + * * BSD LICENSE * * Copyright (c) 2011-2012, Intel Corporation diff --git a/include/tinycompress/tinymp3.h b/include/tinycompress/tinymp3.h index a709c39..b0d429d 100644 --- a/include/tinycompress/tinymp3.h +++ b/include/tinycompress/tinymp3.h @@ -1,4 +1,7 @@ /* + * This file is provided under a dual BSD/LGPLv2.1 license. When using or + * redistributing this file, you may do so under either license. + * * BSD LICENSE * * mp3 header and prasing diff --git a/include/tinycompress/version.h b/include/tinycompress/version.h index 000f6a2..82a3e6c 100644 --- a/include/tinycompress/version.h +++ b/include/tinycompress/version.h @@ -1,4 +1,7 @@ /* + * This file is provided under a dual BSD/LGPLv2.1 license. When using or + * redistributing this file, you may do so under either license. + * * BSD LICENSE * * Copyright (c) 2011-2012, Intel Corporation diff --git a/src/lib/compress.c b/src/lib/compress.c index 84738d2..8ae6bbd 100644 --- a/src/lib/compress.c +++ b/src/lib/compress.c @@ -1,4 +1,7 @@ /* + * This file is provided under a dual BSD/LGPLv2.1 license. When using or + * redistributing this file, you may do so under either license. + * * BSD LICENSE * * tinycompress library for compress audio offload in alsa diff --git a/src/utils/cplay.c b/src/utils/cplay.c index 032a971..e0603fd 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -1,4 +1,7 @@ /* + * This file is provided under a dual BSD/LGPLv2.1 license. When using or + * redistributing this file, you may do so under either license. + * * BSD LICENSE * * tinyplay command line player for compress audio offload in alsa diff --git a/src/utils/crecord.c b/src/utils/crecord.c index 1fd3698..e051c2d 100644 --- a/src/utils/crecord.c +++ b/src/utils/crecord.c @@ -1,4 +1,7 @@ /* + * This file is provided under a dual BSD/LGPLv2.1 license. When using or + * redistributing this file, you may do so under either license. + * * BSD LICENSE * * crecord command line recorder for compress audio record in alsa -- 2.11.0

2 1

[alsa-devel] [PATCH 0/2] rt5651: Enable jack detection
by Carlo Caione 20 Oct '17

20 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> Small set of patches to enable jack detection for the rt5651 codec. Please note that: - The jack detection is restricted to the JD1_1 pin only (the only hardware I have uses this pin for jack detection) - AFAICT (reading the rt5651 datasheet) there is no way to detect runtime the type of the jack inserted as done for the others rt56* codecs, so in the driver I always assume that we are dealing with an headset. Carlo Caione (2): ASoC: rt5651: Enable jack detection on JD1_1 ASoC: intel: byt: Add headset jack include/sound/rt5651.h | 7 +++ sound/soc/codecs/rt5651.c | 91 ++++++++++++++++++++++++++++++++++- sound/soc/codecs/rt5651.h | 3 ++ sound/soc/intel/boards/bytcr_rt5651.c | 24 +++++++++ 4 files changed, 123 insertions(+), 2 deletions(-) -- 2.14.2

4 7

[alsa-devel] [PATCH] ALSA: hda: Avoid racy recreation of widget kobjects
by Takashi Iwai 19 Oct '17

19 Oct '17

The refresh of HD-audio widget sysfs kobjects via snd_hdac_refresh_widget_sysfs() is slightly racy. The driver recreates the whole tree from scratch after deleting the whole. When CONFIG_DEBUG_KOBJECT_RELEASE option is used, kobject release doesn't happen immediately but delayed, while the re-creation of the same named kobject happens soon after invoking kobject_put(). This may end up with the conflicts of duplicated kobjects, as found in the bug report below. In this patch, we take another approach to refresh the tree: instead of recreating the whole tree, just add the new nodes and delete the non-existing nodes. Since the refresh happens only once at initialization, no longer race would happen. Along with the code change, merge snd_hdac_refresh_widget_sysfs() with the existing snd_hdac_refresh_widgets() with an additional bool flag for simplifying the code. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197307 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hdaudio.h | 3 +-- sound/hda/hdac_device.c | 43 ++++++++++--------------------------------- sound/hda/hdac_sysfs.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ sound/hda/local.h | 2 ++ sound/pci/hda/hda_codec.c | 2 +- 5 files changed, 61 insertions(+), 36 deletions(-) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 96546b30e900..6f1118545bb8 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -111,8 +111,7 @@ void snd_hdac_device_unregister(struct hdac_device *codec); int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name); int snd_hdac_codec_modalias(struct hdac_device *hdac, char *buf, size_t size); -int snd_hdac_refresh_widgets(struct hdac_device *codec); -int snd_hdac_refresh_widget_sysfs(struct hdac_device *codec); +int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs); unsigned int snd_hdac_make_cmd(struct hdac_device *codec, hda_nid_t nid, unsigned int verb, unsigned int parm); diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index 19deb306facb..06f845e293cb 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -87,7 +87,7 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus, fg = codec->afg ? codec->afg : codec->mfg; - err = snd_hdac_refresh_widgets(codec); + err = snd_hdac_refresh_widgets(codec, false); if (err < 0) goto error; @@ -388,11 +388,12 @@ static void setup_fg_nodes(struct hdac_device *codec) /** * snd_hdac_refresh_widgets - Reset the widget start/end nodes * @codec: the codec object + * @sysfs: re-initialize sysfs tree, too */ -int snd_hdac_refresh_widgets(struct hdac_device *codec) +int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs) { hda_nid_t start_nid; - int nums; + int nums, err; nums = snd_hdac_get_sub_nodes(codec, codec->afg, &start_nid); if (!start_nid || nums <= 0 || nums >= 0xff) { @@ -401,6 +402,12 @@ int snd_hdac_refresh_widgets(struct hdac_device *codec) return -EINVAL; } + if (sysfs) { + err = hda_widget_sysfs_reinit(codec, start_nid, nums); + if (err < 0) + return err; + } + codec->num_nodes = nums; codec->start_nid = start_nid; codec->end_nid = start_nid + nums; @@ -408,36 +415,6 @@ int snd_hdac_refresh_widgets(struct hdac_device *codec) } EXPORT_SYMBOL_GPL(snd_hdac_refresh_widgets); -/** - * snd_hdac_refresh_widget_sysfs - Reset the codec widgets and reinit the - * codec sysfs - * @codec: the codec object - * - * first we need to remove sysfs, then refresh widgets and lastly - * recreate it - */ -int snd_hdac_refresh_widget_sysfs(struct hdac_device *codec) -{ - int ret; - - if (device_is_registered(&codec->dev)) - hda_widget_sysfs_exit(codec); - ret = snd_hdac_refresh_widgets(codec); - if (ret) { - dev_err(&codec->dev, "failed to refresh widget: %d\n", ret); - return ret; - } - if (device_is_registered(&codec->dev)) { - ret = hda_widget_sysfs_init(codec); - if (ret) { - dev_err(&codec->dev, "failed to init sysfs: %d\n", ret); - return ret; - } - } - return ret; -} -EXPORT_SYMBOL_GPL(snd_hdac_refresh_widget_sysfs); - /* return CONNLIST_LEN parameter of the given widget */ static unsigned int get_num_conns(struct hdac_device *codec, hda_nid_t nid) { diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index 42d61bf41969..e123ba6b2e81 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c @@ -414,3 +414,50 @@ void hda_widget_sysfs_exit(struct hdac_device *codec) { widget_tree_free(codec); } + +int hda_widget_sysfs_reinit(struct hdac_device *codec, + hda_nid_t start_nid, int num_nodes) +{ + struct hdac_widget_tree *tree; + hda_nid_t end_nid = start_nid + num_nodes; + hda_nid_t nid; + int i; + + if (!codec->widgets) + return hda_widget_sysfs_init(codec); + + tree = kmemdup(codec->widgets, sizeof(*tree), GFP_KERNEL); + if (!tree) + return -ENOMEM; + + tree->nodes = kcalloc(num_nodes + 1, sizeof(*tree->nodes), GFP_KERNEL); + if (!tree->nodes) { + kfree(tree); + return -ENOMEM; + } + + /* prune non-existing nodes */ + for (i = 0, nid = codec->start_nid; i < codec->num_nodes; i++, nid++) { + if (nid < start_nid || nid >= end_nid) + free_widget_node(codec->widgets->nodes[i], + &widget_node_group); + } + + /* add new nodes */ + for (i = 0, nid = start_nid; i < num_nodes; i++, nid++) { + if (nid < codec->start_nid || nid >= codec->end_nid) + add_widget_node(tree->root, nid, &widget_node_group, + &tree->nodes[i]); + else + tree->nodes[i] = + codec->widgets->nodes[nid - codec->start_nid]; + } + + /* replace with the new tree */ + kfree(codec->widgets->nodes); + kfree(codec->widgets); + codec->widgets = tree; + + kobject_uevent(tree->root, KOBJ_CHANGE); + return 0; +} diff --git a/sound/hda/local.h b/sound/hda/local.h index 0d5bb159d538..c586ea62d49e 100644 --- a/sound/hda/local.h +++ b/sound/hda/local.h @@ -28,6 +28,8 @@ static inline unsigned int get_wcaps_channels(u32 wcaps) extern const struct attribute_group *hdac_dev_attr_groups[]; int hda_widget_sysfs_init(struct hdac_device *codec); +int hda_widget_sysfs_reinit(struct hdac_device *codec, hda_nid_t start_nid, + int num_nodes); void hda_widget_sysfs_exit(struct hdac_device *codec); #endif /* __HDAC_LOCAL_H */ diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 3db26c451837..bb086665c3e0 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -977,7 +977,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec) hda_nid_t fg; int err; - err = snd_hdac_refresh_widget_sysfs(&codec->core); + err = snd_hdac_refresh_widgets(&codec->core, true); if (err < 0) return err; -- 2.14.2

1 0

[alsa-devel] [PATCH v2] ALSA: hda: Abort capability probe on invalid capability
by Ughreja, Rakesh A 19 Oct '17

19 Oct '17

From: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> Due to bugs in BIOS it's possible that the HDA capability link list is not constructed properly. This may lead to driver going into unknown state. So whenever driver discovers unknown HDA capability, log it as error and stop traversing the link list further. Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> --- sound/hda/hdac_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 978dc18..8f7d0d9 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -314,7 +314,8 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) break; default: - dev_dbg(bus->dev, "Unknown capability %d\n", cur_cap); + dev_err(bus->dev, "Unknown capability %d\n", cur_cap); + cur_cap = 0; break; } -- 2.7.4

3 3

[alsa-devel] [BUG] aplay doesn't honor `-t raw` when WAVE header is detected on input
by Nutchanon Wetchasit 19 Oct '17

19 Oct '17

Hello, I ran into a problem on how alsa-utils's aplay command handles `-t` option when I was trying to play a PCM WAVE file in loop, using following command: ( while true; do cat audio.wav; done ) | aplay -t raw -f S16_LE -r 44100 -c 2 An "audio.wav" can be any 44100 Hz 16-bit stereo PCM WAVE file, and `-t raw` was specially specified to make aplay reject length information in the header. However, once the command is run, first line of the output would read: Playing WAVE 'stdin' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo Which shows that aplay still read the input as WAVE format, despite the `-t raw` option being explicitly specified. And you would notice that the audio *does not loop*. Instead, it will play just once, followed by silence. However, if WAVE header was stripped out (or corrupted), aplay would now treat the input as raw audio stream, and play a continuously repeated sound as expected: ( while true; do dd if=audio.wav of=/dev/stdout ibs=44 skip=1; done ) | \ aplay -t raw -f S16_LE -r 44100 -c 2 The first line of output would also show the stream as "raw data" too: Playing raw data 'stdin' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo This problem exists on the latest alsa-utils 1.1.4, as well as the older 1.0.25 which came with my GNU/Linux distribution; though I'm not certain whether this is also applicable to other file format (like Sun .AU) or not. Please investigate. Regards, Nutchanon Wetchasit alsa-utils: 1.1.4 (source distribution) libasound: 1.1.4 (source distribution) System: Debian GNU/Linux 7.0 "Wheezy" i386 P.S. The "audio.wav" I used in my testing is a siren sound generated by Sox: sox -b 16 -c 2 -e signed-integer -r 44100 -n audio.wav \ synth 0.5 sine 800 gain -6 : synth 0.5 sine 600 gain -6

2 3

[alsa-devel] [PATCH v2 0/2] ALSA: hda - Fix incorrect TLV callback check
by Takashi Iwai 19 Oct '17

19 Oct '17

Hi, this is a revised patchset for addressing the incorrect TLV callback check introduced by a set_fs() removal commit. A fix for a superfluous '-' in the code is split as another fix so that it can be applied to older kernels without the rest. Other than that, only the changelog text updates since the older patch (that was embedded in the mail thread "4.13 regression: get_kctl_0dB_offset doesn't handle all possible callbacks"). thanks, Takashi === Takashi Iwai (2): ALSA: hda: Remove superfluous '-' added by printk conversion ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal include/sound/control.h | 3 ++ sound/core/vmaster.c | 31 +++++++++++++++ sound/pci/hda/hda_codec.c | 97 +++++++++++++++++++++++++++-------------------- 3 files changed, 89 insertions(+), 42 deletions(-) -- 2.14.2

2 3

[alsa-devel] [PATCH] ALSA: hda: Abort capability probe on invalid capability
by Ughreja, Rakesh A 18 Oct '17

18 Oct '17

From: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> When an invalid capability is discovered, stop traversing the capability link list further. print the invalid capability error and set it to zero Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> --- sound/hda/hdac_controller.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 978dc18..8f7d0d9 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -314,7 +314,8 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) break; default: - dev_dbg(bus->dev, "Unknown capability %d\n", cur_cap); + dev_err(bus->dev, "Unknown capability %d\n", cur_cap); + cur_cap = 0; break; } -- 2.7.4

1 0

[alsa-devel] [PATCH 0/2] rt5651: Enable platforms with int mic on IN2
by Carlo Caione 18 Oct '17

18 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> While working on enabling a cherry-trail laptop shipping the rt5651 codec I realized that the machine driver needed some fixup. In particular the laptop I'm working on (KIANO SlimNote 14.2) has the internal mic connected to the IN2 port. All the laptop-specific work with the related quirks will follow. Carlo Caione (2): ASoC: intel: byt: Enable quirk logic for custom maps ASoC: intel: byt: Introduce new custom IN2 map sound/soc/intel/boards/bytcr_rt5651.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) -- 2.14.2

3 4

Re: [alsa-devel] linux-next: manual merge of the sound-asoc tree with the drm-misc tree
by Mark Brown 18 Oct '17

18 Oct '17

On Wed, Oct 18, 2017 at 10:57:33AM +0100, Mark Brown wrote: > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Actually I'm just going to discard the AMD drivers from the ASoC tree because the build produces reams of errors like those below, the changes to move the chip type definitions around weren't fully baked. Please resend both the pull request and the patches with this fixed. Note also that if you're basing something on Linus' tree you should use a tagged release rather than just a random commit. In file included from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu.h:51:0, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:31: /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:33:6: error: nested redefinition of 'enum amd_asic_type' enum amd_asic_type { ^ /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:33:6: error: redeclaration of 'enum amd_asic_type' In file included from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:26:0, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu.h:51, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:31: /home/broonie/tmpfs/next/include/drm/amd_asic_type.h:28:6: note: originally defined here enum amd_asic_type { ^

2 2