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

[alsa-devel] [PATCH 42/87] sound: oss: replace kmalloc + memset with kzalloc
by Fuqian Huang 27 Jun '19

27 Jun '19

kmalloc + memset(0) -> kzalloc Signed-off-by: Fuqian Huang <huangfq.daxian(a)gmail.com> --- sound/core/seq/oss/seq_oss_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c index 6dc94efc19c9..6e8020d4368a 100644 --- a/sound/core/seq/oss/seq_oss_init.c +++ b/sound/core/seq/oss/seq_oss_init.c @@ -66,7 +66,7 @@ snd_seq_oss_create_client(void) struct snd_seq_port_info *port; struct snd_seq_port_callback port_callback; - port = kmalloc(sizeof(*port), GFP_KERNEL); + port = kzalloc(sizeof(*port), GFP_KERNEL); if (!port) { rc = -ENOMEM; goto __error; @@ -81,7 +81,6 @@ snd_seq_oss_create_client(void) system_client = rc; /* create annoucement receiver port */ - memset(port, 0, sizeof(*port)); strcpy(port->name, "Receiver"); port->addr.client = system_client; port->capability = SNDRV_SEQ_PORT_CAP_WRITE; /* receive only */ -- 2.11.0

1 0

[alsa-devel] [PATCH] ALSA: hda: Use correct start/count for sysfs init
by Evan Green 27 Jun '19

27 Jun '19

The normal flow through the widget sysfs codepath is that snd_hdac_refresh_widgets() is called once without the sysfs bool set to set up codec->num_nodes and friends, then another time with the bool set to actually allocate all the sysfs widgets. However, during the first time allocation, hda_widget_sysfs_reinit() ignores the new num_nodes passed in via parameter and just calls hda_widget_sysfs_init(), using whatever was in codec->num_nodes before the update. This is not correct in cases where num_nodes changes. Here's an example: Sometime earlier: snd_hdac_refresh_widgets(hdac, false) sets codec->num_nodes to 2, widgets is still not allocated Now: snd_hdac_refresh_widgets(hdac, true) hda_widget_sysfs_reinit(num_nodes=7) hda_widget_sysfs_init() widget_tree_create() alloc(codec->num_nodes) // this is still 2 codec->num_nodes = 7 Pass num_nodes and start_nid down into widget_tree_create() so that the right number of nodes are allocated in all cases. Signed-off-by: Evan Green <evgreen(a)chromium.org> --- sound/hda/hdac_device.c | 2 +- sound/hda/hdac_sysfs.c | 14 ++++++++------ sound/hda/local.h | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index 6907dbefd08c..5e74acf45c81 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -144,7 +144,7 @@ int snd_hdac_device_register(struct hdac_device *codec) if (err < 0) return err; mutex_lock(&codec->widget_lock); - err = hda_widget_sysfs_init(codec); + err = hda_widget_sysfs_init(codec, codec->start_nid, codec->num_nodes); mutex_unlock(&codec->widget_lock); if (err < 0) { device_del(&codec->dev); diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index 909d5ef1179c..1c4b98929d9c 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c @@ -358,7 +358,8 @@ static int add_widget_node(struct kobject *parent, hda_nid_t nid, return 0; } -static int widget_tree_create(struct hdac_device *codec) +static int widget_tree_create(struct hdac_device *codec, + hda_nid_t start_nid, int num_nodes) { struct hdac_widget_tree *tree; int i, err; @@ -372,12 +373,12 @@ static int widget_tree_create(struct hdac_device *codec) if (!tree->root) return -ENOMEM; - tree->nodes = kcalloc(codec->num_nodes + 1, sizeof(*tree->nodes), + tree->nodes = kcalloc(num_nodes + 1, sizeof(*tree->nodes), GFP_KERNEL); if (!tree->nodes) return -ENOMEM; - for (i = 0, nid = codec->start_nid; i < codec->num_nodes; i++, nid++) { + for (i = 0, nid = start_nid; i < num_nodes; i++, nid++) { err = add_widget_node(tree->root, nid, &widget_node_group, &tree->nodes[i]); if (err < 0) @@ -396,14 +397,15 @@ static int widget_tree_create(struct hdac_device *codec) } /* call with codec->widget_lock held */ -int hda_widget_sysfs_init(struct hdac_device *codec) +int hda_widget_sysfs_init(struct hdac_device *codec, + hda_nid_t start_nid, int num_nodes) { int err; if (codec->widgets) return 0; /* already created */ - err = widget_tree_create(codec); + err = widget_tree_create(codec, start_nid, num_nodes); if (err < 0) { widget_tree_free(codec); return err; @@ -428,7 +430,7 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec, int i; if (!codec->widgets) - return hda_widget_sysfs_init(codec); + return hda_widget_sysfs_init(codec, start_nid, num_nodes); tree = kmemdup(codec->widgets, sizeof(*tree), GFP_KERNEL); if (!tree) diff --git a/sound/hda/local.h b/sound/hda/local.h index 877631e39373..8936120ab4d9 100644 --- a/sound/hda/local.h +++ b/sound/hda/local.h @@ -28,7 +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_init(struct hdac_device *codec, + hda_nid_t start_nid, int num_nodes); 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); -- 2.20.1

2 6

[alsa-devel] [PATCH 1/2] device property: Add new array helper
by Charles Keepax 27 Jun '19

27 Jun '19

It is fairly common to want to read an integer array property that is composed of an unknown number of fixed size integer groups. For example, say each group consists of three values which correspond to the settings for one input on the device and the driver supports several chips with different numbers of inputs. Add a new helper function to provide this functionality, it differs for the existing helpers in that it allows reading a smaller number of values than the full array size and checks that the number of values read is a multiple of the group size. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- drivers/base/property.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 50 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 348b37e64944c..656d21e01a648 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -133,6 +133,54 @@ int device_property_read_u32_array(struct device *dev, const char *propname, EXPORT_SYMBOL_GPL(device_property_read_u32_array); /** + * device_property_read_u32_2darray - return a 2d u32 array property of a device + * @dev: Device to get the property of + * @propname: Name of the property + * @val: The values are stored here or %NULL to return the number of values + * @nval: Size of the @val array + * @multiple: Number of entries in each block of data + * + * Function reads an array of u32 properties split up into fixed size + * sub-groups, with @propname from the device firmware description and + * stores them to @val if found. + * + * Return: Number of values read + * %0 if the property was not found, + * %-EINVAL if given arguments are not valid, + * %-ENODATA if the property does not have a value, + * %-EPROTO if the property is not an array of numbers, + * %-EOVERFLOW if the size of the property is not as expected. + * %-ENXIO if no suitable firmware interface is present. + */ +int device_property_read_u32_2darray(struct device *dev, const char *propname, + u32 *val, size_t nval, int multiple) +{ + int n, ret; + + n = device_property_read_u32_array(dev, propname, NULL, 0); + if (n == -EINVAL) { + return 0; /* missing, ignore */ + } else if (n < 0) { + dev_warn(dev, "%s malformed (%d)\n", propname, n); + return n; + } else if ((n % multiple) != 0) { + dev_warn(dev, "%s not a multiple of %d entries\n", + propname, multiple); + return -EOVERFLOW; + } + + if (n > nval) + n = nval; + + ret = device_property_read_u32_array(dev, propname, val, n); + if (ret < 0) + return ret; + else + return n; +} +EXPORT_SYMBOL_GPL(device_property_read_u32_2darray); + +/** * device_property_read_u64_array - return a u64 array property of a device * @dev: Device to get the property of * @propname: Name of the property diff --git a/include/linux/property.h b/include/linux/property.h index e9caa290cda52..5ab0b4a7d34a2 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -40,6 +40,8 @@ int device_property_read_u16_array(struct device *dev, const char *propname, u16 *val, size_t nval); int device_property_read_u32_array(struct device *dev, const char *propname, u32 *val, size_t nval); +int device_property_read_u32_2darray(struct device *dev, const char *propname, + u32 *val, size_t nval, int multiple); int device_property_read_u64_array(struct device *dev, const char *propname, u64 *val, size_t nval); int device_property_read_string_array(struct device *dev, const char *propname, -- 2.11.0

3 8

[alsa-devel] [PATCH v2] ALSA: hda/realtek: Add quirks for several Clevo notebook barebones
by Richard Sailer 27 Jun '19

27 Jun '19

This adds 4 SND_PCI_QUIRK(...) lines for several barebone models of the ODM Clevo. The model names are written in regex syntax to describe/match all clevo models that are similar enough and use the same PCI SSID that this fixup works for them. Additionally the lines regarding SSID 0x96e1 and 0x97e1 didn't fix audio for the all our Clevo notebooks using these SSIDs (models Clevo P960* and P970*) since ALC1220_FIXP_CLEVO_PB51ED_PINS swapped pins that are not necesarry to be swapped. This patch initiates ALC1220_FIXUP_CLEVO_P950 instead for these model and fixes the audio. This is strange since the System76 Oryx Pro also seems to be a P960 and P970 barebone, so the original fixup should also not have worked for them. @Jeremy: What's your take on this? Signed-off-by: Richard Sailer <rs(a)tuxedocomputers.com> --- sound/pci/hda/patch_realtek.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1afb268f3da0..61dcd293afb1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2461,9 +2461,10 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1558, 0x95e1, "Clevo P95xER", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950), - SND_PCI_QUIRK(0x1558, 0x96e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_CLEVO_PB51ED_PINS), - SND_PCI_QUIRK(0x1558, 0x97e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_CLEVO_PB51ED_PINS), - SND_PCI_QUIRK(0x1558, 0x65d1, "Tuxedo Book XC1509", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x96e1, "Clevo P960[ER][CDFN]-K", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x97e1, "Clevo P970[ER][CDFN]", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), + SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD), SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530), -- 2.20.1

2 2

[alsa-devel] [PATCH 0/3] SOF PM and jack detection fixes
by Ranjani Sridharan 27 Jun '19

27 Jun '19

This set of patches addresses issues related to runtime suspend and jack detection during runtime suspend. The first 2 patches handle enabling WAKEEN in the SOF driver to address issue with jack detection when the SOF device is runtime suspended. More details about the issue can be found here: https://github.com/thesofproject/linux/issues/909 The third patch allows the SOF driver to suspend after the autosuspend delay instead of suspending immediately upon boot. Pan Xiuli (1): ASoC: SOF: mark last_busy value at runtime PM init Rander Wang (2): ASoC: SOF: Intel: hda: reduce ifdef usage for hda ASoC: SOF: Intel: hda: Enable jack detection in sof hda driver sound/soc/sof/intel/hda-codec.c | 45 +++++++++++++++++++++++++++-- sound/soc/sof/intel/hda-dsp.c | 51 +++++++++++++++++++++------------ sound/soc/sof/intel/hda.h | 4 +++ sound/soc/sof/sof-pci-dev.c | 3 ++ 4 files changed, 83 insertions(+), 20 deletions(-) -- 2.17.1

3 6

[alsa-devel] [BUG] Line6 Helix / X Stomp: parse_audio_format_rates_v2v3(): unable to retrieve number of sample rates (clock 16)
by nick83ola 27 Jun '19

27 Jun '19

Hi all, I just purchased an HX stomp and when I connect to linux I get the following error message: [ 322.404503] usb 1-6: new high-speed USB device number 13 using xhci_hcd [ 322.531804] usb 1-6: New USB device found, idVendor=0e41, idProduct=4246, bcdDevice= 2.00 [ 322.531806] usb 1-6: New USB device strings: Mfr=1, Product=3, SerialNumber=2 [ 322.531806] usb 1-6: Product: HX Stomp [ 322.531807] usb 1-6: Manufacturer: LINE 6 [ 322.531808] usb 1-6: SerialNumber: 3021888 [ 322.535789] usb 1-6: parse_audio_format_rates_v2v3(): unable to retrieve number of sample rates (clock 16) [ 322.535907] usb 1-6: parse_audio_format_rates_v2v3(): unable to retrieve number of sample rates (clock 16) I have some kernel development experience but not a lot with usb so can someone point me where to start looking? there was a previous discussion on the mailing list related to this by Jens Verwiebe (and other request for help). Here are the relevant patches/discussion https://www.spinics.net/lists/alsa-devel/msg71459.html https://patchwork.kernel.org/patch/10113121/ If someone can help me I have an HX stomp here and time to do some debugging. Also if someone from Line6 is listening would be helpful to have some hints. Cheers Nicola Lunghi

1 0

[alsa-devel] [RFC PATCH 0/4] ASoC: hdac_hdmi: refine the hdac_hdmi jacks
by libin.yang＠intel.com 27 Jun '19

27 Jun '19

From: Libin Yang <libin.yang(a)intel.com> This patchset refines the hdac_hdmi jacks: 1. kctl setting should not impact on hdmi jack status 2. bind jack to pin-port instead of pcm 3. move creating jack into hdac_hdmi from machine drivers Libin Yang (4): ASoC: hdac_hdmi: amixer kctl setting should not impact on jack status ASoC: hdac_hdmi: jack_event represents the status ASoC: hdac_hdmi: refine hdmi jacks ASoC: hdac_hdmi: fix some coding style issue sound/soc/codecs/hdac_hdmi.c | 176 +++++++++++---------- sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 -- sound/soc/intel/boards/bxt_rt298.c | 10 -- sound/soc/intel/boards/glk_rt5682_max98357a.c | 10 -- sound/soc/intel/boards/kbl_da7219_max98357a.c | 10 -- sound/soc/intel/boards/kbl_da7219_max98927.c | 10 -- sound/soc/intel/boards/kbl_rt5660.c | 10 -- sound/soc/intel/boards/kbl_rt5663_max98927.c | 10 -- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 9 -- sound/soc/intel/boards/skl_hda_dsp_common.c | 9 -- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 11 -- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 11 -- sound/soc/intel/boards/skl_rt286.c | 10 -- sound/soc/intel/boards/sof_rt5682.c | 11 -- 14 files changed, 92 insertions(+), 215 deletions(-) -- 2.7.4

4 14

Re: [alsa-devel] [PATCH 2/5] sound: soc: skylake: no need to check return value of debugfs_create functions
by Takashi Iwai 27 Jun '19

27 Jun '19

On Mon, 24 Jun 2019 12:53:34 +0200, Mark Brown wrote: > > On Sat, Jun 22, 2019 at 10:39:11PM +0200, Takashi Iwai wrote: > > > Well, I just wonder whether you have ever seen a case where the > > debugfs creation failed. Or more practically, would it fail silently > > at all? > > > If there can be a silent failure, then it's bad to just ignore, yes. > > We may need either to make it more obvious or return an error. > > Currently debugfs doesn't report any errors other than via the return > codes (at least in the common creation stuff) so it's up to the callers > to do that. So this should be changed to follow a la sysfs creation error, IMO. At least, the name conflicts etc should be reported more obviously. thanks, Takashi

3 2

[alsa-devel] [PATCH 0/2] ASoC: soc-core: update dai_link init
by Jerome Brunet 27 Jun '19

27 Jun '19

My initial goal with this patchset was to allow a dai_link to have no no platform component, instead of having dummy by default. However, when rebasing, I discovered that Kuninori Morimoto had recently done that in a different way :) I am still submitting my change since it should allow multiple platform components on a dai_link, which is one of the FIXME note in soc-core. I have also added a check on the codecs component availability to align on what was done for platforms and cpus Jerome Brunet (2): ASoC: soc-core: defer card registration if codec component is missing ASoC: soc-core: support dai_link with platforms_num != 1 include/sound/soc.h | 6 ++++ sound/soc/soc-core.c | 72 +++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 37 deletions(-) -- 2.21.0

3 4

[alsa-devel] [PATCH v3 1/1] ASoC: Intel: Skylake: Remove static table index when parsing topology
by Amadeusz Sławiński 26 Jun '19

26 Jun '19

Currently when we remove and reload driver we use previous ref_count value to start iterating over skl->modules which leads to out of table access. To fix this just inline the function and calculate indexes everytime we parse UUID token. Change-Id: Ic1de06143579c12eb15120d5d7c219767a939042 Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- sound/soc/intel/skylake/skl-topology.c | 34 +++++++++----------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 6241e35213af..6f991af7af23 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3465,25 +3465,6 @@ static int skl_tplg_get_int_tkn(struct device *dev, return tkn_count; } -static int skl_tplg_get_manifest_uuid(struct device *dev, - struct skl *skl, - struct snd_soc_tplg_vendor_uuid_elem *uuid_tkn) -{ - static int ref_count; - struct skl_module *mod; - - if (uuid_tkn->token == SKL_TKN_UUID) { - mod = skl->modules[ref_count]; - guid_copy(&mod->uuid, (guid_t *)&uuid_tkn->uuid); - ref_count++; - } else { - dev_err(dev, "Not an UUID token tkn %d\n", uuid_tkn->token); - return -EINVAL; - } - - return 0; -} - /* * Fill the manifest structure by parsing the tokens based on the * type. @@ -3494,6 +3475,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, { int tkn_count = 0, ret; int off = 0, tuple_size = 0; + u8 uuid_index = 0; struct snd_soc_tplg_vendor_array *array; struct snd_soc_tplg_vendor_value_elem *tkn_elem; @@ -3516,9 +3498,17 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, continue; case SND_SOC_TPLG_TUPLE_TYPE_UUID: - ret = skl_tplg_get_manifest_uuid(dev, skl, array->uuid); - if (ret < 0) - return ret; + if (array->uuid->token != SKL_TKN_UUID) { + dev_err(dev, "Not an UUID token: %d\n", + array->uuid->token); + return -EINVAL; + } + if (uuid_index >= skl->nr_modules) { + dev_err(dev, "Too many UUID tokens\n"); + return -EINVAL; + } + guid_copy(&skl->modules[uuid_index++]->uuid, + (guid_t *)&array->uuid->uuid); tuple_size += sizeof(*array->uuid); continue; -- 2.17.1

1 0