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

[alsa-devel] [PATCH v2 0/7] ALSA: hda: Move chmap helpers to core
by Subhransu S. Prusty 03 Mar '16

03 Mar '16

The HDMI channel map helper APIs and control registration can be reused by ASoC skylake HDMI drivers. A common chmap object is created, channel map control callback handlers, helper APIs and data structures are moved to the core. Driver object store an instance of this chmap object to register chmap controls and program channel allocation for HDMI infoframe. Driver registers ops for specific operations. changes in v2: - Splitted patches for easier review - Access most of chmap helpers through ops, thus reducing number of exported APIs for chmap support Subhransu S. Prusty (7): ALSA: hda - Create common chmap object ALSA: hda - Register chmap obj as priv data instead of codec ALSA: hda - Use hdmi name space for CEA spk alloc structure ALSA: hda - Add hdmi chmap verb programming ops to chmap object ALSA: hda - Use ops instead of directly accessing chmap helpers ALSA: hda - Move chmap support helpers/ops to core ALSA: hda - Use snd_hdmi namespace prefix for printing ch alloc api include/sound/hdmi_chmap.h | 75 ++++ sound/hda/Makefile | 2 +- sound/hda/hdmi_chmap.c | 791 ++++++++++++++++++++++++++++++++++++++++++ sound/pci/hda/hda_eld.c | 31 +- sound/pci/hda/patch_hdmi.c | 830 +++++---------------------------------------- 5 files changed, 957 insertions(+), 772 deletions(-) create mode 100644 include/sound/hdmi_chmap.h create mode 100644 sound/hda/hdmi_chmap.c -- 1.9.1

3 14

[alsa-devel] [PATCH - hda 1/1] ALSA: hda - Fix mic issues on Acer Aspire E1-472
by Simon South 03 Mar '16

03 Mar '16

This patch applies the microphone-related fix created for the Acer Aspire E1-572 to the E1-472 as well, as it uses the same Realtek ALC282 CODEC and demonstrates the same issues. This patch allows an external, headset microphone to be used and limits the gain on the (quite noisy) internal microphone. Signed-off-by: Simon South <simon(a)simonsouth.com> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c1527fc..5c672f8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5224,6 +5224,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x080d, "Acer Aspire V5-122P", ALC269_FIXUP_ASPIRE_HEADSET_MIC), SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK), SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK), + SND_PCI_QUIRK(0x1025, 0x0762, "Acer Aspire E1-472", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), SND_PCI_QUIRK(0x1025, 0x106d, "Acer Cloudbook 14", ALC283_FIXUP_CHROME_BOOK), -- 2.5.0

2 1

[alsa-devel] [PATCH 0/5] ASoC: pxa: Fix enum ctl accesses
by Takashi Iwai 02 Mar '16

02 Mar '16

Hi, here is a patchset to correct the wrong type accesses in pxa drivers for enum ctls. I didn't put Cc to stable for them, supposing these are only for 32bit systems. If not, feel free to put Cc to stable. thanks, Takashi === Takashi Iwai (5): ASoC: pxa: corgi: Fix enum ctl accesses in a wrong type ASoC: pxa: magician: Fix enum ctl accesses in a wrong type ASoC: pxa: poodle: Fix enum ctl accesses in a wrong type ASoC: pxa: spitz: Fix enum ctl accesses in a wrong type ASoC: pxa: tosa: Fix enum ctl accesses in a wrong type sound/soc/pxa/corgi.c | 12 ++++++------ sound/soc/pxa/magician.c | 6 +++--- sound/soc/pxa/poodle.c | 12 ++++++------ sound/soc/pxa/spitz.c | 12 ++++++------ sound/soc/pxa/tosa.c | 12 ++++++------ 5 files changed, 27 insertions(+), 27 deletions(-) -- 2.7.2

3 11

[alsa-devel] [PATCH v4 22/22] sound/usb: Use Media Controller API to share media resources
by Shuah Khan 02 Mar '16

02 Mar '16

Change ALSA driver to use Media Controller API to share media resources with DVB and V4L2 drivers on a AU0828 media device. Media Controller specific initialization is done after sound card is registered. ALSA creates Media interface and entity function graph nodes for Control, Mixer, PCM Playback, and PCM Capture devices. snd_usb_hw_params() will call Media Controller enable source handler interface to request the media resource. If resource request is granted, it will release it from snd_usb_hw_free(). If resource is busy, -EBUSY is returned. Media specific cleanup is done in usb_audio_disconnect(). Signed-off-by: Shuah Khan <shuahkh(a)osg.samsung.com> --- Changes since v3: - Fixed Kconfig to handle the following 1. CONFIG_MEDIA_SUPPORT and CONFIG_SND_USB_AUDIO are both modules CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected 2. CONFIG_MEDIA_SUPPORT=y and CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected 3. CONFIG_MEDIA_SUPPORT=y and CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER is selected 4. CONFIG_MEDIA_SUPPORT=m and CONFIG_SND_USB_AUDIO=y This is when we don't want CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER selected sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 +++ sound/usb/card.h | 3 + sound/usb/media.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/media.h | 72 +++++++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 28 ++++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 11 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index a452ad7..d14bf41 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig @@ -15,6 +15,7 @@ config SND_USB_AUDIO select SND_RAWMIDI select SND_PCM select BITREVERSE + select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO) help Say Y here to include support for USB audio and USB MIDI devices. @@ -22,6 +23,9 @@ config SND_USB_AUDIO To compile this driver as a module, choose M here: the module will be called snd-usb-audio. +config SND_USB_AUDIO_USE_MEDIA_CONTROLLER + bool + config SND_USB_UA101 tristate "Edirol UA-101/UA-1000 driver" select SND_PCM diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 2d2d122..8dca3c4 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -15,6 +15,8 @@ snd-usb-audio-objs := card.o \ quirks.o \ stream.o +snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o + snd-usbmidi-lib-objs := midi.o # Toplevel Module Dependency diff --git a/sound/usb/card.c b/sound/usb/card.c index 1f09d95..35fe256 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -66,6 +66,7 @@ #include "format.h" #include "power.h" #include "stream.h" +#include "media.h" MODULE_AUTHOR("Takashi Iwai <tiwai(a)suse.de>"); MODULE_DESCRIPTION("USB Audio"); @@ -561,6 +562,11 @@ static int usb_audio_probe(struct usb_interface *intf, if (err < 0) goto __error; + if (quirk->media_device) { + /* don't want to fail when media_device_create() fails */ + media_device_create(chip, intf); + } + usb_chip[chip->index] = chip; chip->num_interfaces++; usb_set_intfdata(intf, chip); @@ -617,6 +623,14 @@ static void usb_audio_disconnect(struct usb_interface *intf) list_for_each(p, &chip->midi_list) { snd_usbmidi_disconnect(p); } + /* + * Nice to check quirk && quirk->media_device + * need some special handlings. Doesn't look like + * we have access to quirk here + * Acceses mixer_list + */ + media_device_delete(chip); + /* release mixer resources */ list_for_each_entry(mixer, &chip->mixer_list, list) { snd_usb_mixer_disconnect(mixer); diff --git a/sound/usb/card.h b/sound/usb/card.h index 71778ca..34a0898 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -105,6 +105,8 @@ struct snd_usb_endpoint { struct list_head list; }; +struct media_ctl; + struct snd_usb_substream { struct snd_usb_stream *stream; struct usb_device *dev; @@ -156,6 +158,7 @@ struct snd_usb_substream { } dsd_dop; bool trigger_tstamp_pending_update; /* trigger timestamp being updated from initial estimate */ + struct media_ctl *media_ctl; }; struct snd_usb_stream { diff --git a/sound/usb/media.c b/sound/usb/media.c new file mode 100644 index 0000000..cff1459 --- /dev/null +++ b/sound/usb/media.c @@ -0,0 +1,318 @@ +/* + * media.c - Media Controller specific ALSA driver code + * + * Copyright (c) 2016 Shuah Khan <shuahkh(a)osg.samsung.com> + * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * + * This file is released under the GPLv2. + */ + +/* + * This file adds Media Controller support to ALSA driver + * to use the Media Controller API to share tuner with DVB + * and V4L2 drivers that control media device. Media device + * is created based on existing quirks framework. Using this + * approach, the media controller API usage can be added for + * a specific device. +*/ + +#include <linux/init.h> +#include <linux/list.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/usb.h> + +#include <sound/pcm.h> +#include <sound/core.h> + +#include "usbaudio.h" +#include "card.h" +#include "mixer.h" +#include "media.h" + +static int media_enable_source(struct media_ctl *mctl) +{ + if (mctl && mctl->media_dev->enable_source) + return mctl->media_dev->enable_source(&mctl->media_entity, + &mctl->media_pipe); + return 0; +} + +static void media_disable_source(struct media_ctl *mctl) +{ + if (mctl && mctl->media_dev->disable_source) + mctl->media_dev->disable_source(&mctl->media_entity); +} + +int media_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm, + int stream) +{ + struct media_device *mdev; + struct media_ctl *mctl; + struct device *pcm_dev = &pcm->streams[stream].dev; + u32 intf_type; + int ret = 0; + u16 mixer_pad; + struct media_entity *entity; + + mdev = subs->stream->chip->media_dev; + if (!mdev) + return -ENODEV; + + if (subs->media_ctl) + return 0; + + /* allocate media_ctl */ + mctl = kzalloc(sizeof(*mctl), GFP_KERNEL); + if (!mctl) + return -ENOMEM; + + mctl->media_dev = mdev; + if (stream == SNDRV_PCM_STREAM_PLAYBACK) { + intf_type = MEDIA_INTF_T_ALSA_PCM_PLAYBACK; + mctl->media_entity.function = MEDIA_ENT_F_AUDIO_PLAYBACK; + mctl->media_pad.flags = MEDIA_PAD_FL_SOURCE; + mixer_pad = 1; + } else { + intf_type = MEDIA_INTF_T_ALSA_PCM_CAPTURE; + mctl->media_entity.function = MEDIA_ENT_F_AUDIO_CAPTURE; + mctl->media_pad.flags = MEDIA_PAD_FL_SINK; + mixer_pad = 2; + } + mctl->media_entity.name = pcm->name; + media_entity_pads_init(&mctl->media_entity, 1, &mctl->media_pad); + ret = media_device_register_entity(mctl->media_dev, + &mctl->media_entity); + if (ret) + goto err1; + + mctl->intf_devnode = media_devnode_create(mdev, intf_type, 0, + MAJOR(pcm_dev->devt), + MINOR(pcm_dev->devt)); + if (!mctl->intf_devnode) { + ret = -ENOMEM; + goto err2; + } + mctl->intf_link = media_create_intf_link(&mctl->media_entity, + &mctl->intf_devnode->intf, + MEDIA_LNK_FL_ENABLED); + if (!mctl->intf_link) { + ret = -ENOMEM; + goto err3; + } + + /* create link between mixer and audio */ + media_device_for_each_entity(entity, mdev) { + switch (entity->function) { + case MEDIA_ENT_F_AUDIO_MIXER: + ret = media_create_pad_link(entity, mixer_pad, + &mctl->media_entity, 0, + MEDIA_LNK_FL_ENABLED); + if (ret) + goto err4; + break; + } + } + + subs->media_ctl = mctl; + return 0; + +err4: + media_remove_intf_link(mctl->intf_link); +err3: + media_devnode_remove(mctl->intf_devnode); +err2: + media_device_unregister_entity(&mctl->media_entity); +err1: + kfree(mctl); + return ret; +} + +void media_stream_delete(struct snd_usb_substream *subs) +{ + struct media_ctl *mctl = subs->media_ctl; + + if (mctl && mctl->media_dev) { + struct media_device *mdev; + + mdev = subs->stream->chip->media_dev; + if (mdev && media_devnode_is_registered(&mdev->devnode)) { + media_devnode_remove(mctl->intf_devnode); + media_device_unregister_entity(&mctl->media_entity); + media_entity_cleanup(&mctl->media_entity); + } + kfree(mctl); + subs->media_ctl = NULL; + } +} + +int media_start_pipeline(struct snd_usb_substream *subs) +{ + struct media_ctl *mctl = subs->media_ctl; + + if (mctl) + return media_enable_source(mctl); + return 0; +} + +void media_stop_pipeline(struct snd_usb_substream *subs) +{ + struct media_ctl *mctl = subs->media_ctl; + + if (mctl) + media_disable_source(mctl); +} + +int media_mixer_init(struct snd_usb_audio *chip) +{ + struct device *ctl_dev = &chip->card->ctl_dev; + struct media_intf_devnode *ctl_intf; + struct usb_mixer_interface *mixer; + struct media_device *mdev = chip->media_dev; + struct media_mixer_ctl *mctl; + u32 intf_type = MEDIA_INTF_T_ALSA_CONTROL; + int ret; + + if (!mdev) + return -ENODEV; + + ctl_intf = chip->ctl_intf_media_devnode; + if (!ctl_intf) { + ctl_intf = media_devnode_create(mdev, intf_type, 0, + MAJOR(ctl_dev->devt), + MINOR(ctl_dev->devt)); + if (!ctl_intf) + return -ENOMEM; + chip->ctl_intf_media_devnode = ctl_intf; + } + + list_for_each_entry(mixer, &chip->mixer_list, list) { + + if (mixer->media_mixer_ctl) + continue; + + /* allocate media_mixer_ctl */ + mctl = kzalloc(sizeof(*mctl), GFP_KERNEL); + if (!mctl) + return -ENOMEM; + + mctl->media_dev = mdev; + mctl->media_entity.function = MEDIA_ENT_F_AUDIO_MIXER; + mctl->media_entity.name = chip->card->mixername; + mctl->media_pad[0].flags = MEDIA_PAD_FL_SINK; + mctl->media_pad[1].flags = MEDIA_PAD_FL_SOURCE; + mctl->media_pad[2].flags = MEDIA_PAD_FL_SOURCE; + media_entity_pads_init(&mctl->media_entity, MEDIA_MIXER_PAD_MAX, + mctl->media_pad); + ret = media_device_register_entity(mctl->media_dev, + &mctl->media_entity); + if (ret) { + kfree(mctl); + return ret; + } + + mctl->intf_link = media_create_intf_link(&mctl->media_entity, + &ctl_intf->intf, + MEDIA_LNK_FL_ENABLED); + if (!mctl->intf_link) { + media_device_unregister_entity(&mctl->media_entity); + media_entity_cleanup(&mctl->media_entity); + kfree(mctl); + return -ENOMEM; + } + mctl->intf_devnode = ctl_intf; + mixer->media_mixer_ctl = mctl; + } + return 0; +} + +static void media_mixer_delete(struct snd_usb_audio *chip) +{ + struct usb_mixer_interface *mixer; + struct media_device *mdev = chip->media_dev; + + if (!mdev) + return; + + list_for_each_entry(mixer, &chip->mixer_list, list) { + struct media_mixer_ctl *mctl; + + mctl = mixer->media_mixer_ctl; + if (!mixer->media_mixer_ctl) + continue; + + if (media_devnode_is_registered(&mdev->devnode)) { + media_device_unregister_entity(&mctl->media_entity); + media_entity_cleanup(&mctl->media_entity); + } + kfree(mctl); + mixer->media_mixer_ctl = NULL; + } + if (media_devnode_is_registered(&mdev->devnode)) + media_devnode_remove(chip->ctl_intf_media_devnode); + chip->ctl_intf_media_devnode = NULL; +} + +int media_device_create(struct snd_usb_audio *chip, + struct usb_interface *iface) +{ + struct media_device *mdev; + struct usb_device *usbdev = interface_to_usbdev(iface); + int ret; + + mdev = media_device_get_devres(&usbdev->dev); + if (!mdev) + return -ENOMEM; + if (!mdev->dev) { + /* register media device */ + mdev->dev = &usbdev->dev; + if (usbdev->product) + strlcpy(mdev->model, usbdev->product, + sizeof(mdev->model)); + if (usbdev->serial) + strlcpy(mdev->serial, usbdev->serial, + sizeof(mdev->serial)); + strcpy(mdev->bus_info, usbdev->devpath); + mdev->hw_revision = le16_to_cpu(usbdev->descriptor.bcdDevice); + media_device_init(mdev); + } + if (!media_devnode_is_registered(&mdev->devnode)) { + ret = media_device_register(mdev); + if (ret) { + dev_err(&usbdev->dev, + "Couldn't register media device. Error: %d\n", + ret); + return ret; + } + } + + /* save media device - avoid lookups */ + chip->media_dev = mdev; + + /* Create media entities for mixer and control dev */ + ret = media_mixer_init(chip); + if (ret) { + dev_err(&usbdev->dev, + "Couldn't create media mixer entities. Error: %d\n", + ret); + + /* clear saved media_dev */ + chip->media_dev = NULL; + + return ret; + } + return 0; +} + +void media_device_delete(struct snd_usb_audio *chip) +{ + struct media_device *mdev = chip->media_dev; + + media_mixer_delete(chip); + + if (mdev) { + if (media_devnode_is_registered(&mdev->devnode)) + media_device_unregister(mdev); + chip->media_dev = NULL; + } +} diff --git a/sound/usb/media.h b/sound/usb/media.h new file mode 100644 index 0000000..f66b4d7 --- /dev/null +++ b/sound/usb/media.h @@ -0,0 +1,72 @@ +/* + * media.h - Media Controller specific ALSA driver code + * + * Copyright (c) 2016 Shuah Khan <shuahkh(a)osg.samsung.com> + * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * + * This file is released under the GPLv2. + */ + +/* + * This file adds Media Controller support to ALSA driver + * to use the Media Controller API to share tuner with DVB + * and V4L2 drivers that control media device. Media device + * is created based on existing quirks framework. Using this + * approach, the media controller API usage can be added for + * a specific device. +*/ +#ifndef __MEDIA_H + +#ifdef CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER + +#include <media/media-device.h> +#include <media/media-entity.h> +#include <sound/asound.h> + +struct media_ctl { + struct media_device *media_dev; + struct media_entity media_entity; + struct media_intf_devnode *intf_devnode; + struct media_link *intf_link; + struct media_pad media_pad; + struct media_pipeline media_pipe; +}; + +/* + * One source pad each for SNDRV_PCM_STREAM_CAPTURE and + * SNDRV_PCM_STREAM_PLAYBACK. One for sink pad to link + * to AUDIO Source +*/ +#define MEDIA_MIXER_PAD_MAX (SNDRV_PCM_STREAM_LAST + 2) + +struct media_mixer_ctl { + struct media_device *media_dev; + struct media_entity media_entity; + struct media_intf_devnode *intf_devnode; + struct media_link *intf_link; + struct media_pad media_pad[MEDIA_MIXER_PAD_MAX]; + struct media_pipeline media_pipe; +}; + +int media_device_create(struct snd_usb_audio *chip, + struct usb_interface *iface); +void media_device_delete(struct snd_usb_audio *chip); +int media_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm, + int stream); +void media_stream_delete(struct snd_usb_substream *subs); +int media_start_pipeline(struct snd_usb_substream *subs); +void media_stop_pipeline(struct snd_usb_substream *subs); +#else +static inline int media_device_create(struct snd_usb_audio *chip, + struct usb_interface *iface) + { return 0; } +static inline void media_device_delete(struct snd_usb_audio *chip) { } +static inline int media_stream_init(struct snd_usb_substream *subs, + struct snd_pcm *pcm, int stream) + { return 0; } +static inline void media_stream_delete(struct snd_usb_substream *subs) { } +static inline int media_start_pipeline(struct snd_usb_substream *subs) + { return 0; } +static inline void media_stop_pipeline(struct snd_usb_substream *subs) { } +#endif +#endif /* __MEDIA_H */ diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 3417ef3..f378944 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -3,6 +3,8 @@ #include <sound/info.h> +struct media_mixer_ctl; + struct usb_mixer_interface { struct snd_usb_audio *chip; struct usb_host_interface *hostif; @@ -22,6 +24,7 @@ struct usb_mixer_interface { struct urb *rc_urb; struct usb_ctrlrequest *rc_setup_packet; u8 rc_buffer[6]; + struct media_mixer_ctl *media_mixer_ctl; }; #define MAX_CHANNELS 16 /* max logical channels */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 9245f52..c3b8486 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -35,6 +35,7 @@ #include "pcm.h" #include "clock.h" #include "power.h" +#include "media.h" #define SUBSTREAM_FLAG_DATA_EP_STARTED 0 #define SUBSTREAM_FLAG_SYNC_EP_STARTED 1 @@ -715,10 +716,14 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, struct audioformat *fmt; int ret; + ret = media_start_pipeline(subs); + if (ret) + return ret; + ret = snd_pcm_lib_alloc_vmalloc_buffer(substream, params_buffer_bytes(hw_params)); if (ret < 0) - return ret; + goto err_ret; subs->pcm_format = params_format(hw_params); subs->period_bytes = params_period_bytes(hw_params); @@ -732,22 +737,27 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, dev_dbg(&subs->dev->dev, "cannot set format: format = %#x, rate = %d, channels = %d\n", subs->pcm_format, subs->cur_rate, subs->channels); - return -EINVAL; + ret = -EINVAL; + goto err_ret; } ret = snd_usb_lock_shutdown(subs->stream->chip); if (ret < 0) - return ret; + goto err_ret; ret = set_format(subs, fmt); snd_usb_unlock_shutdown(subs->stream->chip); if (ret < 0) - return ret; + goto err_ret; subs->interface = fmt->iface; subs->altset_idx = fmt->altset_idx; subs->need_setup_ep = true; return 0; + +err_ret: + media_stop_pipeline(subs); + return ret; } /* @@ -759,6 +769,7 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream) { struct snd_usb_substream *subs = substream->runtime->private_data; + media_stop_pipeline(subs); subs->cur_audiofmt = NULL; subs->cur_rate = 0; subs->period_bytes = 0; @@ -1219,6 +1230,7 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction) struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_usb_substream *subs = &as->substream[direction]; + int ret; subs->interface = -1; subs->altset_idx = 0; @@ -1232,7 +1244,12 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction) subs->dsd_dop.channel = 0; subs->dsd_dop.marker = 1; - return setup_hw_info(runtime, subs); + ret = setup_hw_info(runtime, subs); + if (ret == 0) + ret = media_stream_init(subs, as->pcm, direction); + if (ret) + snd_usb_autosuspend(subs->stream->chip); + return ret; } static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction) @@ -1241,6 +1258,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction) struct snd_usb_substream *subs = &as->substream[direction]; stop_endpoints(subs, true); + media_stop_pipeline(subs); if (subs->interface >= 0 && !snd_usb_lock_shutdown(subs->stream->chip)) { diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index c60a776..9d087b1 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2886,6 +2886,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .product_name = pname, \ .ifnum = QUIRK_ANY_INTERFACE, \ .type = QUIRK_AUDIO_ALIGN_TRANSFER, \ + .media_device = 1, \ } \ } diff --git a/sound/usb/stream.c b/sound/usb/stream.c index c4dc577..6c7f5c1 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -36,6 +36,7 @@ #include "format.h" #include "clock.h" #include "stream.h" +#include "media.h" /* * free a substream @@ -52,6 +53,7 @@ static void free_substream(struct snd_usb_substream *subs) kfree(fp); } kfree(subs->rate_list.list); + media_stream_delete(subs); } diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index b665d85..a161c7c 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -30,6 +30,9 @@ * */ +struct media_device; +struct media_intf_devnode; + struct snd_usb_audio { int index; struct usb_device *dev; @@ -60,6 +63,8 @@ struct snd_usb_audio { bool autoclock; /* from the 'autoclock' module param */ struct usb_host_interface *ctrl_intf; /* the audio control interface */ + struct media_device *media_dev; + struct media_intf_devnode *ctl_intf_media_devnode; }; #define usb_audio_err(chip, fmt, args...) \ @@ -110,6 +115,7 @@ struct snd_usb_audio_quirk { const char *product_name; int16_t ifnum; uint16_t type; + bool media_device; const void *data; }; -- 2.5.0

3 4

[alsa-devel] [PATCH] ASoC: intel: remove unused variable
by Sudip Mukherjee 02 Mar '16

02 Mar '16

The variable cmd_id is only assigned some value and is never used. Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- sound/soc/intel/atom/sst/sst_ipc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c index 3dc7358..8afa6fe 100644 --- a/sound/soc/intel/atom/sst/sst_ipc.c +++ b/sound/soc/intel/atom/sst/sst_ipc.c @@ -318,7 +318,6 @@ void sst_process_reply_mrfld(struct intel_sst_drv *sst_drv_ctx, union ipc_header_high msg_high; u32 msg_low; struct ipc_dsp_hdr *dsp_hdr; - unsigned int cmd_id; msg_high = msg->mrfld_header.p.header_high; msg_low = msg->mrfld_header.p.header_low_payload; @@ -357,7 +356,6 @@ void sst_process_reply_mrfld(struct intel_sst_drv *sst_drv_ctx, return; /* Copy command id so that we can use to put sst to reset */ dsp_hdr = (struct ipc_dsp_hdr *)data; - cmd_id = dsp_hdr->cmd_id; dev_dbg(sst_drv_ctx->dev, "cmd_id %d\n", dsp_hdr->cmd_id); if (sst_wake_up_block(sst_drv_ctx, msg_high.part.result, msg_high.part.drv_id, -- 1.9.1

4 13

[alsa-devel] [PATCH] ALSA: portman2x4: fix NULL pointer dereference
by Sudip Mukherjee 02 Mar '16

02 Mar '16

While registering pardev, the irq_func was also registered. As a result when we tried to probe for the card, an interrupt was generated and in the ISR we tried to dereference private_data. But private_data is still NULL as we have not yet done portman_create(). Lets probe for the device after card is created. Fixes: e6a1b7e88046 ("ALSA: portman2x4 - use new parport device model") Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- sound/drivers/portman2x4.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 362533f..189e3e7 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -762,11 +762,6 @@ static int snd_portman_probe(struct platform_device *pdev) err = -EIO; goto free_pardev; } - err = portman_probe(p); - if (err) { - err = -EIO; - goto release_pardev; - } if ((err = portman_create(card, pardev, &pm)) < 0) { snd_printd("Cannot create main component\n"); @@ -774,6 +769,12 @@ static int snd_portman_probe(struct platform_device *pdev) } card->private_data = pm; card->private_free = snd_portman_card_private_free; + + err = portman_probe(p); + if (err) { + err = -EIO; + goto __err; + } if ((err = snd_portman_rawmidi_create(card)) < 0) { snd_printd("Creating Rawmidi component failed\n"); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: atmel_ssc_dai: distinguish the different SSC
by Songjun Wu 02 Mar '16

02 Mar '16

Cpu_dai id always equals 0, can't distinguish the different SSC. Use platform_device id to record and distinguish the different SSC. Signed-off-by: Songjun Wu <songjun.wu(a)atmel.com> --- drivers/misc/atmel-ssc.c | 1 + sound/soc/atmel/atmel_ssc_dai.c | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index e11a0bd..0516ecd 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c @@ -34,6 +34,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num) if (ssc->pdev->dev.of_node) { if (of_alias_get_id(ssc->pdev->dev.of_node, "ssc") == ssc_num) { + ssc->pdev->id = ssc_num; ssc_valid = 1; break; } diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index ba8def5..2768970 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -285,7 +285,8 @@ static int atmel_ssc_hw_rule_rate(struct snd_pcm_hw_params *params, static int atmel_ssc_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct atmel_ssc_info *ssc_p = &ssc_info[dai->id]; + struct platform_device *pdev = to_platform_device(dai->dev); + struct atmel_ssc_info *ssc_p = &ssc_info[pdev->id]; struct atmel_pcm_dma_params *dma_params; int dir, dir_mask; int ret; @@ -346,7 +347,8 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream, static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct atmel_ssc_info *ssc_p = &ssc_info[dai->id]; + struct platform_device *pdev = to_platform_device(dai->dev); + struct atmel_ssc_info *ssc_p = &ssc_info[pdev->id]; struct atmel_pcm_dma_params *dma_params; int dir, dir_mask; @@ -392,7 +394,8 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream, static int atmel_ssc_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) { - struct atmel_ssc_info *ssc_p = &ssc_info[cpu_dai->id]; + struct platform_device *pdev = to_platform_device(cpu_dai->dev); + struct atmel_ssc_info *ssc_p = &ssc_info[pdev->id]; ssc_p->daifmt = fmt; return 0; @@ -404,7 +407,8 @@ static int atmel_ssc_set_dai_fmt(struct snd_soc_dai *cpu_dai, static int atmel_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai, int div_id, int div) { - struct atmel_ssc_info *ssc_p = &ssc_info[cpu_dai->id]; + struct platform_device *pdev = to_platform_device(cpu_dai->dev); + struct atmel_ssc_info *ssc_p = &ssc_info[pdev->id]; switch (div_id) { case ATMEL_SSC_CMR_DIV: @@ -445,7 +449,8 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - int id = dai->id; + struct platform_device *pdev = to_platform_device(dai->dev); + int id = pdev->id; struct atmel_ssc_info *ssc_p = &ssc_info[id]; struct ssc_device *ssc = ssc_p->ssc; struct atmel_pcm_dma_params *dma_params; @@ -772,7 +777,8 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, static int atmel_ssc_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct atmel_ssc_info *ssc_p = &ssc_info[dai->id]; + struct platform_device *pdev = to_platform_device(dai->dev); + struct atmel_ssc_info *ssc_p = &ssc_info[pdev->id]; struct atmel_pcm_dma_params *dma_params; int dir; @@ -795,7 +801,8 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, static int atmel_ssc_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) { - struct atmel_ssc_info *ssc_p = &ssc_info[dai->id]; + struct platform_device *pdev = to_platform_device(dai->dev); + struct atmel_ssc_info *ssc_p = &ssc_info[pdev->id]; struct atmel_pcm_dma_params *dma_params; int dir; @@ -824,11 +831,12 @@ static int atmel_ssc_trigger(struct snd_pcm_substream *substream, static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai) { struct atmel_ssc_info *ssc_p; + struct platform_device *pdev = to_platform_device(cpu_dai->dev); if (!cpu_dai->active) return 0; - ssc_p = &ssc_info[cpu_dai->id]; + ssc_p = &ssc_info[pdev->id]; /* Save the status register before disabling transmit and receive */ ssc_p->ssc_state.ssc_sr = ssc_readl(ssc_p->ssc->regs, SR); @@ -852,12 +860,13 @@ static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai) static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai) { struct atmel_ssc_info *ssc_p; + struct platform_device *pdev = to_platform_device(cpu_dai->dev); u32 cr; if (!cpu_dai->active) return 0; - ssc_p = &ssc_info[cpu_dai->id]; + ssc_p = &ssc_info[pdev->id]; /* restore SSC register settings */ ssc_writel(ssc_p->ssc->regs, TFMR, ssc_p->ssc_state.ssc_tfmr); -- 1.7.9.5

4 4

[alsa-devel] [PATCH 1/2] ASoC: sh: rcar: core: don't open code of_device_get_match_data()
by Wolfram Sang 02 Mar '16

02 Mar '16

From: Wolfram Sang <wsa+renesas(a)sang-engineering.com> This change will also make Coverity happy by avoiding a theoretical NULL pointer dereference; yet another reason is to use the above helper function to tighten the code and make it more readable. Signed-off-by: Wolfram Sang <wsa+renesas(a)sang-engineering.com> --- Compile tested only. I am on the road and can't test the multimedia drivers because of no cables :( If someone could test it, that would be much appreciated. Or I'll do it next week. The pattern worked for other drivers I could actually test, though. sound/soc/sh/rcar/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 5227aad43e3854..3dae30710c34f2 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1119,7 +1119,6 @@ static int rsnd_probe(struct platform_device *pdev) struct rsnd_priv *priv; struct device *dev = &pdev->dev; struct rsnd_dai *rdai; - const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev); int (*probe_func[])(struct rsnd_priv *priv) = { rsnd_gen_probe, rsnd_dma_probe, @@ -1145,7 +1144,7 @@ static int rsnd_probe(struct platform_device *pdev) } priv->pdev = pdev; - priv->flags = (unsigned long)of_id->data; + priv->flags = (unsigned long)of_device_get_match_data(dev); spin_lock_init(&priv->lock); /* -- 2.7.0

3 6

[alsa-devel] [PATCH v3 0/4] add IEC958 channel status control helper
by Arnaud Pouliquen 02 Mar '16

02 Mar '16

- Define helpers function to handle 'IEC958 Playback Default' control - add "pcm_new" ops for DAI initialisations that need pcm runtime context. This patchset is needed to be able to associate control to the PCM device. The iec control is linked to the DAI but also to the PCM device. Furthermore, some platforms like sti support both HDMI and SPDIF outputs in parallel. Logical way to differentiate them is to link them to pcm device index. V3: This patchset is extracted from following RFC http://permalink.gmane.org/gmane.linux.alsa.devel/149876 (sti: add audio interface to the hdmi driver) Notice that "ASoC: hdmi-codec: add IEC control" patch depends on integration of the hdmi-codec driver Patches update: - ALSA: pcm: add IEC958 channel status control helper - make mutex usage mandatory. - Set control index to pcm device id ( needed to be supported by iecset) - ASoC: core: add code to complete dai init after pcm creation - fix dai param of pcm_new ops for cpu dai. - ASoC: sti: use iec channel status control helper new patch: implementation of the helper for sti cpu-dai V2: - patch: ALSA: pcm: add IEC958 channel status control helper - Return 1 instead of 0 in snd_pcm_iec958_put - Add .access field in control structure - I have kept condition on mutex for flexibility (but could be cleaned to force user to use a mutex) V1: This RFC is the implementation of audio HDMI on sti platform based on generic hdmi-codec driver: https://patchwork.kernel.org/patch/7215271/ ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders") Arnaud Pouliquen (4): ALSA: pcm: add IEC958 channel status control helper ASoC: core: add code to complete dai init after pcm creation ASoC: sti: use iec channel status control helper ASoC: hdmi-codec: add IEC control. include/sound/hdmi-codec.h | 1 + include/sound/pcm_iec958.h | 15 ++++++ include/sound/soc-dai.h | 7 +++ sound/core/pcm_iec958.c | 107 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/hdmi-codec.c | 59 ++++++++++++++++------ sound/soc/soc-core.c | 14 ++++++ sound/soc/sti/Kconfig | 1 + sound/soc/sti/uniperif_player.c | 79 ++++++++++++----------------- 8 files changed, 219 insertions(+), 62 deletions(-) -- 1.9.1

3 11

[alsa-devel] sound: uninterruptible hang in snd_seq_oss_writeq_sync
by Dmitry Vyukov 02 Mar '16

02 Mar '16

Hello, The following program creates an unkillable process: // autogenerated by syzkaller (http://github.com/google/syzkaller) #include <pthread.h> #include <stdint.h> #include <string.h> #include <sys/syscall.h> #include <unistd.h> #ifndef SYS_mmap #define SYS_mmap 9 #endif #ifndef SYS_syz_open_dev #define SYS_syz_open_dev 1000001 #endif #ifndef SYS_write #define SYS_write 1 #endif #ifndef SYS_read #define SYS_read 0 #endif #ifndef SYS_sync_file_range #define SYS_sync_file_range 277 #endif long r[61]; int main() { memset(r, -1, sizeof(r)); r[0] = syscall(SYS_mmap, 0x20000000ul, 0x5e000ul, 0x3ul, 0x32ul, 0xfffffffffffffffful, 0x0ul); r[2] = syscall(SYS_open, "/dev/sequencer", 0x202ul, 0, 0, 0); *(uint8_t*)0x20057000 = (uint8_t)0x7; *(uint8_t*)0x20057001 = (uint8_t)0x6; *(uint8_t*)0x20057002 = (uint8_t)0x3; *(uint8_t*)0x20057003 = (uint8_t)0x99be; *(uint32_t*)0x2005700c = (uint32_t)0x4; *(uint8_t*)0x20057010 = (uint8_t)0x5; *(uint8_t*)0x20057011 = (uint8_t)0xffffffffffffffff; *(uint8_t*)0x20057012 = (uint8_t)0x100; *(uint8_t*)0x20057013 = (uint8_t)0x1; *(uint8_t*)0x20057024 = (uint8_t)0x8; *(uint8_t*)0x20057025 = (uint8_t)0xabe4; *(uint16_t*)0x20057026 = (uint16_t)0x3; *(uint64_t*)0x20057028 = (uint64_t)0x2005055c; *(uint8_t*)0x20057030 = (uint8_t)0xffffffffffffffe0; *(uint8_t*)0x20057031 = (uint8_t)0xffffffffffffffb8; *(uint8_t*)0x20057032 = (uint8_t)0x8; *(uint8_t*)0x20057033 = (uint8_t)0x7; *(uint32_t*)0x2005703c = (uint32_t)0x5; *(uint8_t*)0x20057040 = (uint8_t)0x5; *(uint8_t*)0x20057041 = (uint8_t)0x401; *(uint8_t*)0x20057042 = (uint8_t)0x8; *(uint8_t*)0x20057043 = (uint8_t)0x4; *(uint8_t*)0x2005704c = (uint8_t)0x0; *(uint8_t*)0x2005704d = (uint8_t)0x3; *(uint8_t*)0x2005704e = (uint8_t)0x200; *(uint8_t*)0x2005704f = (uint8_t)0xee; *(uint8_t*)0x20057050 = (uint8_t)0x2; *(uint8_t*)0x20057051 = (uint8_t)0x8; *(uint8_t*)0x20057052 = (uint8_t)0x800; *(uint8_t*)0x20057053 = (uint8_t)0xfffffffffffff000; *(uint64_t*)0x20057068 = (uint64_t)0x77359400; *(uint64_t*)0x20057070 = (uint64_t)0x0; *(uint8_t*)0x20057078 = (uint8_t)0x10000; *(uint8_t*)0x20057079 = (uint8_t)0x946; *(uint8_t*)0x2005707a = (uint8_t)0x1; *(uint8_t*)0x2005707b = (uint8_t)0x1ff; *(uint8_t*)0x2005708c = (uint8_t)0x3; *(uint32_t*)0x20057090 = (uint32_t)0x7; *(uint32_t*)0x20057094 = (uint32_t)0x1; *(uint8_t*)0x20057098 = (uint8_t)0x2; *(uint8_t*)0x20057099 = (uint8_t)0x7ff; *(uint8_t*)0x2005709a = (uint8_t)0x8; *(uint8_t*)0x2005709b = (uint8_t)0xdd8; *(uint64_t*)0x200570b0 = (uint64_t)0x1; *(uint64_t*)0x200570b8 = (uint64_t)0x0; *(uint8_t*)0x200570c0 = (uint8_t)0x9; *(uint8_t*)0x200570c1 = (uint8_t)0x3; *(uint8_t*)0x200570c2 = (uint8_t)0x7ff; *(uint8_t*)0x200570c3 = (uint8_t)0x8; *(uint32_t*)0x200570d4 = (uint32_t)0xec; *(uint64_t*)0x200570d8 = (uint64_t)0x20053f14; memcpy((void*)0x2005055c, "\xa4\x62\xd2\xb0\x88\xe0\x2b\xbd\xea\xa1\xa5\xf7\x7b\x89\xca" "\xb0\x43\xca\x19\x6d\x70\xb6\xa6\xcd\x30\xaa\x98\x07\xb3\xf3" "\xea\xf8\x44\x19\xc8\x83\xbc\xb7\x33\xd1\xd0\x5e\x8f\x34\x12" "\x82\xb4\xf8\xbd\x02\x63\x0b\xe7\x45\x23\x40\xa4\x51\x40\x23" "\x01\xcc\x57\x89\x40\x9c\xc1\x29\x36\xe2\xc0\x70\xe5\xda\xc9" "\x1f\x40\x25\xe0\x74\x98\x07\x75\xe9\x5a\xfc\x0e\x10\x3f\xd9" "\x4b\xc3\xc2\x48\xfa\x18\xb8\xda\x49\x3e\xeb\x69\x2c\x4b\xd2" "\xb7\xac\xc6\x5a\x1c\xfd", 111); memcpy((void*)0x20053f14, "\x1b\x4b\xa5\x94\xeb\xe1\xd9\x4b\x57\xf2\xeb\xab\xdd\xe5\xba" "\x24\xf2\xc8\x36\x90\x88\x21\x2c\xec\x8e\x5a\x0d\x24\x0f\x48" "\xcc\x0d\x3c\xab\x21\x8e\xfa\x8f\x0d\xcd\x8d\x14\x99\xc3\x64" "\xea\x7f\xf3\x88\xe9\xf7\x4f\x4c\x12\xe9\x0e\x23\xad\x73\x7d" "\xa3\x4c\x45\x3f\xb3\x48\xb7\x44\x89\x41\x20\x7b\x2c\xbd\xf2" "\x89\x16\x1f\xbd\x80\x24\x72\xa1\x8d\x4b\x13\x74\xb2\xf4\xdf" "\x49\xe0\x6c\x40\x0d\xf2\x7c\x8a\xbf\xf2\xb1\x62\xe0\x7e\x51" "\x9a\xd4\x60\x64\x49\x96\x4b\x83\x91\xe5\x51\x50\x94\x3c\x41" "\xf6\xd1\xef\x1f\x90\x5a\x48\xa5\xe2\xf8\xe3\xd9\xf9\x82\x5e" "\xa1\x5c\x85\x1c\xbe\x47\xa2\x29\xb7\x5a\xf4\x14\x24\x92\x11" "\x4b\x6b\x54\x95\x5e\x9f\x1b\xda\x02\xa3\x84\xb3\x2b\x07\x13" "\x18\x6b\x31\xb4\xc1\x04\x30\x5f\xa0\xa2\xe9\xe6\x50\x6f\xed" "\x15\x10\xf5\xda\xa1\xe5\x06\xaf\x28\xe0\x53\xea\x88\x49\xf8" "\x97\x52\x4b\xe8\xa2\xce\x9f\xc7\x47\x4f\xd6\xc0\xe2\xb7\xc1" "\x7f\xa9\x54\x3d\x11\xe4\x99\x28\x65\x39\xb1\xf3\xec\x48\x43" "\x58\x19\x12\xf6\x38\x5b\xee\xca\x33\x8e\x4d", 236); r[56] = syscall(SYS_write, r[2], 0x20057000ul, 0x9cul, 0, 0, 0); memcpy((void*)0x2005bfa7, "\x2f\x64\x65\x76\x2f\x76\x68\x63\x69\x00", 10); return 0; } The hang stack is: [<ffffffff85309f77>] snd_seq_oss_writeq_sync+0x327/0x790 sound/core/seq/oss/seq_oss_writeq.c:121 [<ffffffff852fa353>] snd_seq_oss_drain_write+0x113/0x160 sound/core/seq/oss/seq_oss_init.c:448 [<ffffffff852f8d04>] odev_release+0x44/0x80 sound/core/seq/oss/seq_oss.c:152 [<ffffffff817ccdc6>] __fput+0x236/0x780 fs/file_table.c:208 [<ffffffff817cd395>] ____fput+0x15/0x20 fs/file_table.c:244 [<ffffffff813b8db0>] task_work_run+0x170/0x210 kernel/task_work.c:115 [< inline >] exit_task_work include/linux/task_work.h:21 [<ffffffff81363ca0>] do_exit+0xaf0/0x2d20 kernel/exit.c:748 [<ffffffff81366048>] do_group_exit+0x108/0x330 kernel/exit.c:878 [< inline >] SYSC_exit_group kernel/exit.c:889 [<ffffffff8136628d>] SyS_exit_group+0x1d/0x20 kernel/exit.c:887 [<ffffffff866a3236>] entry_SYSCALL_64_fastpath+0x16/0x7a arch/x86/entry/entry_64.S:185 On commit fc77dbd34c5c99bce46d40a2491937c3bcbd10af (4.5-rc6).

2 7

[alsa-devel] [PATCH] ALSA: hda - hdmi defer to register acomp eld notifier
by libin.yang＠linux.intel.com 02 Mar '16

02 Mar '16

From: Libin Yang <libin.yang(a)linux.intel.com> Defer to register acomp eld notifier until hdmi audio driver is fully ready. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index aa2d6a2..a3de50b 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2936,13 +2936,6 @@ static int patch_generic_hdmi(struct hda_codec *codec) is_broxton(codec)) codec->core.link_power_control = 1; - if (codec_has_acomp(codec)) { - codec->depop_delay = 0; - spec->i915_audio_ops.audio_ptr = codec; - spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify; - snd_hdac_i915_register_notifier(&spec->i915_audio_ops); - } - if (hdmi_parse_codec(codec) < 0) { if (spec->i915_bound) snd_hdac_i915_exit(&codec->bus->core); @@ -2964,6 +2957,13 @@ static int patch_generic_hdmi(struct hda_codec *codec) init_channel_allocations(); + if (codec_has_acomp(codec)) { + codec->depop_delay = 0; + spec->i915_audio_ops.audio_ptr = codec; + spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify; + snd_hdac_i915_register_notifier(&spec->i915_audio_ops); + } + WARN_ON(spec->dyn_pcm_assign && !codec_has_acomp(codec)); return 0; } -- 1.9.1

3 2

[alsa-devel] [PATCH v2] ASoC: imx-wm8958: add imx-wm8958 machine driver
by Zidan Wang 02 Mar '16

02 Mar '16

This is the initial imx-wm8958 device-tree-only machine driver working with fsl_sai driver. This sound card has three dai link, HIFI, VOICE and BT dai. HIFI dai link will support codec master and slave mode. VOICE an BT dai link have dummy cpu dai, and just support codec master mode. Signed-off-by: Zidan Wang <zidan.wang(a)freescale.com> --- .../devicetree/bindings/sound/imx-audio-wm8958.txt | 49 +++ arch/arm/configs/imx_v6_v7_defconfig | 1 + sound/soc/fsl/Kconfig | 14 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/imx-wm8958.c | 432 +++++++++++++++++++++ 5 files changed, 498 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt create mode 100644 sound/soc/fsl/imx-wm8958.c diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt b/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt new file mode 100644 index 0000000..50bad12 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt @@ -0,0 +1,49 @@ +Freescale i.MX audio complex with WM8958 codec + +Required properties: + + - compatible : "fsl,imx-audio-wm8958" + + - model : The user-visible name of this sound complex + + - cpu-dai : The phandle of an CPU DAI controller + + - audio-codec : The phandle of the WM8958 audio codec + + - audio-routing : A list of the connections between audio components. + Each entry is a pair of strings, the first being + the connection's sink, the second being the + connection's source. Valid names could be power + supplies, WM8958 pins, and the jacks on the board: + + Power supplies: + * MICBIAS1 + * MICBIAS2 + + Board connectors: + * Headphone Jack + * Ext Spk + + - fsl,hifi-dai-master : If present, hifi dai works as master, and will + provide bit clock and frame clock. Otherwise, + hifi dai works as slave. + +Example: + +sound { + compatible = "fsl,imx6ul-evk-wm8958", + "fsl,imx-audio-wm8958"; + model = "wm8960-audio"; + cpu-dai = <&sai1>; + audio-codec = <&codec>; + audio-routing = + "Headphone Jack", "HPOUT1L", + "Headphone Jack", "HPOUT1R", + "Ext Spk", "SPKOUTLP", + "Ext Spk", "SPKOUTLN", + "Ext Spk", "SPKOUTRP", + "Ext Spk", "SPKOUTRN", + "IN1LN", "MICBIAS2"; + + fsl,hifi-dai-master; +}; diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 978c5de..7ac5856 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -251,6 +251,7 @@ CONFIG_SND_SOC_FSL_ASRC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_EUKREA_TLV320=y +CONFIG_SND_SOC_IMX_WM8958=y CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SPDIF=y diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 35aabf9..f6e5d96 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -229,6 +229,20 @@ config SND_SOC_EUKREA_TLV320 Enable I2S based access to the TLV320AIC23B codec attached to the SSI interface +config SND_SOC_IMX_WM8958 + tristate "SoC Audio support for i.MX boards with wm8958" + depends on OF && I2C + select MFD_WM8994 + select SND_SOC_WM8994 + select SND_SOC_IMX_PCM_DMA + select SND_SOC_FSL_SAI + select SND_SOC_FSL_UTILS + select SND_KCTL_JACK + help + SoC Audio support for i.MX boards with WM8958 + Say Y if you want to add support for SoC audio on an i.MX board with + a wm8958 codec. + config SND_SOC_IMX_WM8962 tristate "SoC Audio support for i.MX boards with wm8962" depends on OF && I2C && INPUT diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index d28dc25..2a781c0 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -54,6 +54,7 @@ snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o snd-soc-wm1133-ev1-objs := wm1133-ev1.o snd-soc-imx-es8328-objs := imx-es8328.o snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o +snd-soc-imx-wm8958-objs := imx-wm8958.o snd-soc-imx-wm8962-objs := imx-wm8962.o snd-soc-imx-spdif-objs := imx-spdif.o snd-soc-imx-mc13783-objs := imx-mc13783.o @@ -64,6 +65,7 @@ obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o +obj-$(CONFIG_SND_SOC_IMX_WM8958) += snd-soc-imx-wm8958.o obj-$(CONFIG_SND_SOC_IMX_WM8962) += snd-soc-imx-wm8962.o obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o diff --git a/sound/soc/fsl/imx-wm8958.c b/sound/soc/fsl/imx-wm8958.c new file mode 100644 index 0000000..24eb66f --- /dev/null +++ b/sound/soc/fsl/imx-wm8958.c @@ -0,0 +1,432 @@ +/* + * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/i2c.h> +#include <linux/of_gpio.h> +#include <linux/gpio.h> +#include <linux/clk.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include <sound/control.h> +#include <sound/pcm_params.h> +#include <sound/soc-dapm.h> +#include <linux/mfd/wm8994/registers.h> +#include "../fsl/fsl_sai.h" +#include "../codecs/wm8994.h" + +#define DAI_NAME_SIZE 32 + +#define DAI_LINK_NUM (3) +#define HIFI_DAI (0) +#define VOICE_DAI (1) +#define BT_DAI (2) + +#define WM8958_MCLK_MAX (2) + +#define WM8994_FLL(id) (id == HIFI_DAI ? WM8994_FLL1 : WM8994_FLL2) +#define WM8994_SYSCLK_FLL(id) (id == HIFI_DAI ? WM8994_SYSCLK_FLL1 : WM8994_SYSCLK_FLL2) +#define WM8994_FLL_SRC_MCLK(id) (id == HIFI_DAI ? WM8994_FLL_SRC_MCLK1 : WM8994_FLL_SRC_MCLK2) + +struct imx_wm8958_data { + struct snd_soc_dai_link *dai_link; + struct snd_soc_card card; + struct clk *mclk[WM8958_MCLK_MAX]; + u32 mclk_freq[WM8958_MCLK_MAX]; + bool is_hifi_dai_master; + bool is_stream_in_use[DAI_LINK_NUM][2]; +}; + +static const struct snd_soc_dapm_widget imx_wm8958_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), +}; + +static u32 imx_wm8958_rates[] = { 8000, 16000, 32000, 48000 }; + +static struct snd_pcm_hw_constraint_list imx_wm8958_rate_constraints = { + .count = ARRAY_SIZE(imx_wm8958_rates), + .list = imx_wm8958_rates, +}; + +static int imx_wm8958_hifi_startup(struct snd_pcm_substream *substream) +{ + int ret = 0; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *card = rtd->card; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + + if (!data->is_hifi_dai_master) + ret = snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &imx_wm8958_rate_constraints); + + return ret; +} +static int imx_wm8958_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_card *card = rtd->card; + struct device *dev = card->dev; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + bool hifi_dai_sysclk_dir = SND_SOC_CLOCK_OUT; + u32 mclk_id, id = codec_dai->id - 1; + u32 pll_out; + int ret; + + data->is_stream_in_use[id][tx] = true; + + if (data->mclk_freq[id]) + mclk_id = WM8994_FLL_SRC_MCLK(id); + else if (id == HIFI_DAI) + mclk_id = WM8994_FLL_SRC_MCLK2; + else + mclk_id = WM8994_FLL_SRC_MCLK1; + + if (id == HIFI_DAI) { + /* + * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 + * using shared LRCLK from DACLRCK1. + */ + snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); + + if (!data->is_hifi_dai_master) + hifi_dai_sysclk_dir = SND_SOC_CLOCK_IN; + + ret = snd_soc_dai_set_sysclk(cpu_dai, + 0, 0, !hifi_dai_sysclk_dir); + + if (ret) { + dev_err(dev, "failed to set cpu sysclk: %d\n", ret); + return ret; + } + + if (!data->is_hifi_dai_master) { + ret = snd_soc_dai_set_sysclk(codec_dai, mclk_id, + data->mclk_freq[mclk_id - 1], + hifi_dai_sysclk_dir); + if (ret) { + dev_err(dev, + "failed to set codec sysclk: %d\n", + ret); + return ret; + } + + return 0; + } + } else if (id == VOICE_DAI) { + /* + * Set GPIO6 pin function to reserve, so that DAC2 and ADC2 + * using shared LRCLK from DACLRCK2. + */ + snd_soc_update_bits(codec, WM8994_GPIO_6, 0x1f, 0x2); + } + + if (params_width(params) == 24) + pll_out = params_rate(params) * 384; + else + pll_out = params_rate(params) * 256; + + ret = snd_soc_dai_set_pll(codec_dai, + WM8994_FLL(id), + mclk_id, + data->mclk_freq[mclk_id - 1], + pll_out); + if (ret) { + dev_err(dev, "failed to set codec pll: %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, + WM8994_SYSCLK_FLL(id), + pll_out, + SND_SOC_CLOCK_OUT); + if (ret) { + dev_err(dev, "failed to set codec sysclk: %d\n", ret); + return ret; + } + + return 0; +} + +static int imx_wm8958_hw_free(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_card *card = rtd->card; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + int id = codec_dai->id - 1; + + data->is_stream_in_use[id][tx] = false; + + if (id == HIFI_DAI && !data->is_hifi_dai_master) + return 0; + + if (!data->is_stream_in_use[id][!tx]) { + /* + * We should connect AIFxCLK source to FLL after enable FLL, + * and disconnect AIF1CLK source to FLL before disable FLL, + * otherwise FLL worked abnormal. + */ + snd_soc_dai_set_sysclk(codec_dai, WM8994_FLL_SRC_MCLK(id), + data->mclk_freq[id], SND_SOC_CLOCK_OUT); + + /* Disable FLL1 after all stream finished. */ + snd_soc_dai_set_pll(codec_dai, WM8994_FLL(id), 0, 0, 0); + } + + return 0; +} + +static int imx_wm8958_set_bias_level(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, + enum snd_soc_bias_level level) +{ + struct snd_soc_pcm_runtime *rtd; + struct snd_soc_dai *codec_dai; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + int ret, i; + + rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); + codec_dai = rtd->codec_dai; + + if (dapm->dev != codec_dai->dev) + return 0; + + switch (level) { + case SND_SOC_BIAS_STANDBY: + if (card->dapm.bias_level == SND_SOC_BIAS_OFF) { + /* need to enable mclk to write/read wm8958 register */ + for (i = 0; i < WM8958_MCLK_MAX; i++) { + if (!IS_ERR(data->mclk[i])) { + ret = clk_prepare_enable(data->mclk[i]); + if (ret) + dev_warn(card->dev, + "Failed to enable MCLK%d: %d\n", + i + 1, ret); + } + } + } + break; + default: + break; + } + + return 0; +} + +static int imx_wm8958_set_bias_level_post(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, + enum snd_soc_bias_level level) +{ + struct snd_soc_pcm_runtime *rtd; + struct snd_soc_dai *codec_dai; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + int i; + + rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); + codec_dai = rtd->codec_dai; + + if (dapm->dev != codec_dai->dev) + return 0; + + switch (level) { + case SND_SOC_BIAS_OFF: + if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) + for (i = 0; i < WM8958_MCLK_MAX; i++) { + if (!IS_ERR(data->mclk[i])) + clk_disable_unprepare(data->mclk[i]); + } + break; + default: + break; + } + + card->dapm.bias_level = level; + + return 0; +} + +static struct snd_soc_ops imx_hifi_ops = { + .hw_params = imx_wm8958_hw_params, + .hw_free = imx_wm8958_hw_free, + .startup = imx_wm8958_hifi_startup, +}; + +static struct snd_soc_ops imx_voice_ops = { + .hw_params = imx_wm8958_hw_params, + .hw_free = imx_wm8958_hw_free, +}; + +static struct snd_soc_dai_link imx_wm8958_dai_link[] = { + [HIFI_DAI] = { + .name = "HiFi", + .stream_name = "HiFi", + .codec_name = "wm8994-codec", + .codec_dai_name = "wm8994-aif1", + .ops = &imx_hifi_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF, + }, + [VOICE_DAI] = { + .name = "Voice", + .stream_name = "Voice", + .cpu_dai_name = "snd-soc-dummy-dai", + .codec_name = "wm8994-codec", + .codec_dai_name = "wm8994-aif2", + .platform_name = "snd-soc-dummy", + .ignore_pmdown_time = 1, + .ops = &imx_voice_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, + }, + [BT_DAI] = { + .name = "Bluetooth", + .stream_name = "Bluetooth", + .cpu_dai_name = "snd-soc-dummy-dai", + .codec_name = "wm8994-codec", + .codec_dai_name = "wm8994-aif3", + .platform_name = "snd-soc-dummy", + .ignore_pmdown_time = 1, + }, +}; + +static int imx_wm8958_probe(struct platform_device *pdev) +{ + struct device_node *cpu_np, *codec_np; + struct device_node *np = pdev->dev.of_node; + struct platform_device *cpu_pdev; + struct i2c_client *codec_dev; + struct imx_wm8958_data *data; + char tmp[8]; + int ret, i; + + cpu_np = of_parse_phandle(np, "cpu-dai", 0); + if (!cpu_np) { + dev_err(&pdev->dev, "cpu dai phandle missing or invalid\n"); + return -EINVAL; + } + + codec_np = of_parse_phandle(np, "audio-codec", 0); + if (!codec_np) { + dev_err(&pdev->dev, "phandle missing or invalid\n"); + ret = -EINVAL; + goto fail; + } + + cpu_pdev = of_find_device_by_node(cpu_np); + if (!cpu_pdev) { + dev_err(&pdev->dev, "failed to find cpu dai platform device\n"); + ret = -EINVAL; + goto fail; + } + + codec_dev = of_find_i2c_device_by_node(codec_np); + if (!codec_dev || !codec_dev->dev.driver) { + dev_err(&pdev->dev, "failed to find codec platform device\n"); + ret = -EINVAL; + goto fail; + } + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->dai_link = imx_wm8958_dai_link; + + /* + * AIF1 support codec master and slave mode + * AIF2 and AIF3 just support codec master mode + */ + if (of_property_read_bool(pdev->dev.of_node, "fsl,hifi-dai-master")) { + data->is_hifi_dai_master = true; + data->dai_link[HIFI_DAI].dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + } else { + data->is_hifi_dai_master = false; + data->dai_link[HIFI_DAI].dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; + } + + for (i = 0; i < WM8958_MCLK_MAX; i++) { + sprintf(tmp, "mclk%d", i + 1); + data->mclk[i] = devm_clk_get(&codec_dev->dev, tmp); + if (IS_ERR(data->mclk[i])) { + ret = PTR_ERR(data->mclk[i]); + dev_err(&pdev->dev, "failed to get mclk%d clock: %d\n", + i + 1, ret); + } else { + data->mclk_freq[i] = clk_get_rate(data->mclk[i]); + } + } + + data->dai_link[HIFI_DAI].cpu_dai_name = dev_name(&cpu_pdev->dev); + data->dai_link[HIFI_DAI].platform_of_node = cpu_np; + + data->card.set_bias_level = imx_wm8958_set_bias_level; + data->card.set_bias_level_post = imx_wm8958_set_bias_level_post; + data->card.dev = &pdev->dev; + ret = snd_soc_of_parse_card_name(&data->card, "model"); + if (ret) + goto fail; + + data->card.num_links = DAI_LINK_NUM; + data->card.dai_link = data->dai_link; + data->card.dapm_widgets = imx_wm8958_dapm_widgets; + data->card.num_dapm_widgets = ARRAY_SIZE(imx_wm8958_dapm_widgets); + data->card.owner = THIS_MODULE; + + ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing"); + if (ret) + goto fail; + + platform_set_drvdata(pdev, &data->card); + snd_soc_card_set_drvdata(&data->card, data); + + ret = devm_snd_soc_register_card(&pdev->dev, &data->card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); + goto fail; + } + +fail: + of_node_put(cpu_np); + of_node_put(codec_np); + + return ret; +} + +static const struct of_device_id imx_wm8958_dt_ids[] = { + { .compatible = "fsl,imx-audio-wm8958", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, imx_wm8958_dt_ids); + +static struct platform_driver imx_wm8958_driver = { + .driver = { + .name = "imx-wm8958", + .pm = &snd_soc_pm_ops, + .of_match_table = imx_wm8958_dt_ids, + }, + .probe = imx_wm8958_probe, +}; +module_platform_driver(imx_wm8958_driver); + +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("Freescale i.MX WM8958 ASoC machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-wm8958"); -- 1.9.1

3 3

[alsa-devel] [PATCH] ASoC: mediatek: Add machine driver for rt5650 rt5514 codec
by PC Liao 02 Mar '16

02 Mar '16

From: Koro Chen <koro.chen(a)mediatek.com> This is the DPCM based machine driver with rt5650 and rt5514. Signed-off-by: Koro Chen <koro.chen(a)mediatek.com> Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- .../bindings/sound/mt8173-rt5650-rt5514.txt | 15 ++ sound/soc/mediatek/Kconfig | 28 ++- sound/soc/mediatek/Makefile | 3 +- sound/soc/mediatek/mt8173-rt5650-rt5514.c | 258 ++++++++++++++++++++ 4 files changed, 294 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt create mode 100644 sound/soc/mediatek/mt8173-rt5650-rt5514.c diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt new file mode 100644 index 0000000..e8b3c80 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt @@ -0,0 +1,15 @@ +MT8173 with RT5650 RT5514 CODECS + +Required properties: +- compatible : "mediatek,mt8173-rt5650-rt5514" +- mediatek,audio-codec: the phandles of rt5650 and rt5514 codecs +- mediatek,platform: the phandle of MT8173 ASoC platform + +Example: + + sound { + compatible = "mediatek,mt8173-rt5650-rt5514"; + mediatek,audio-codec = <&rt5650 &rt5514>; + mediatek,platform = <&afe>; + }; + diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 6c88087..f7e789e 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -18,14 +18,25 @@ config SND_SOC_MT8173_MAX98090 If unsure select "N". config SND_SOC_MT8173_RT5650 - tristate "ASoC Audio driver for MT8173 with RT5650 codec" - depends on SND_SOC_MEDIATEK && I2C - select SND_SOC_RT5645 - help - This adds ASoC driver for Mediatek MT8173 boards - with the RT5650 audio codec. - Select Y if you have such device. - If unsure select "N". + tristate "ASoC Audio driver for MT8173 with RT5650 codec" + depends on SND_SOC_MEDIATEK && I2C + select SND_SOC_RT5645 + help + This adds ASoC driver for Mediatek MT8173 boards + with the RT5650 audio codec. + Select Y if you have such device. + If unsure select "N". + +config SND_SOC_MT8173_RT5650_RT5514 + tristate "ASoC Audio driver for MT8173 with RT5650 RT5514 codecs" + depends on SND_SOC_MEDIATEK && I2C + select SND_SOC_RT5645 + select SND_SOC_RT5514 + help + This adds ASoC driver for Mediatek MT8173 boards + with the RT5650 and RT5514 codecs. + Select Y if you have such device. + If unsure select "N". config SND_SOC_MT8173_RT5650_RT5676 tristate "ASoC Audio driver for MT8173 with RT5650 RT5676 codecs" @@ -37,4 +48,3 @@ config SND_SOC_MT8173_RT5650_RT5676 with the RT5650 and RT5676 codecs. Select Y if you have such device. If unsure select "N". - diff --git a/sound/soc/mediatek/Makefile b/sound/soc/mediatek/Makefile index bcdcb06..d486860 100644 --- a/sound/soc/mediatek/Makefile +++ b/sound/soc/mediatek/Makefile @@ -2,5 +2,6 @@ obj-$(CONFIG_SND_SOC_MEDIATEK) += mtk-afe-pcm.o # Machine support obj-$(CONFIG_SND_SOC_MT8173_MAX98090) += mt8173-max98090.o -obj-$(CONFIG_SND_SOC_MT8173_RT5650_RT5676) += mt8173-rt5650-rt5676.o obj-$(CONFIG_SND_SOC_MT8173_RT5650) += mt8173-rt5650.o +obj-$(CONFIG_SND_SOC_MT8173_RT5650_RT5514) += mt8173-rt5650-rt5514.o +obj-$(CONFIG_SND_SOC_MT8173_RT5650_RT5676) += mt8173-rt5650-rt5676.o diff --git a/sound/soc/mediatek/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173-rt5650-rt5514.c new file mode 100644 index 0000000..58e0836 --- /dev/null +++ b/sound/soc/mediatek/mt8173-rt5650-rt5514.c @@ -0,0 +1,258 @@ +/* + * mt8173-rt5650-rt5514.c -- MT8173 machine driver with RT5650/5514 codecs + * + * Copyright (c) 2016 MediaTek Inc. + * Author: Koro Chen <koro.chen(a)mediatek.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include "../codecs/rt5645.h" + +#define MCLK_FOR_CODECS 12288000 + +static const struct snd_soc_dapm_widget mt8173_rt5650_rt5514_widgets[] = { + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), +}; + +static const struct snd_soc_dapm_route mt8173_rt5650_rt5514_routes[] = { + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + {"Sub DMIC1L", NULL, "Int Mic"}, + {"Sub DMIC1R", NULL, "Int Mic"}, + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"Headset Mic", NULL, "micbias1"}, + {"Headset Mic", NULL, "micbias2"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, +}; + +static const struct snd_kcontrol_new mt8173_rt5650_rt5514_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), +}; + +static int mt8173_rt5650_rt5514_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + int i, ret; + + for (i = 0; i < rtd->num_codecs; i++) { + struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; + + /* pll from mclk 12.288M */ + ret = snd_soc_dai_set_pll(codec_dai, 0, 0, MCLK_FOR_CODECS, + params_rate(params) * 512); + if (ret) + return ret; + + /* sysclk from pll */ + ret = snd_soc_dai_set_sysclk(codec_dai, 1, + params_rate(params) * 512, + SND_SOC_CLOCK_IN); + if (ret) + return ret; + } + return 0; +} + +static struct snd_soc_ops mt8173_rt5650_rt5514_ops = { + .hw_params = mt8173_rt5650_rt5514_hw_params, +}; + +static struct snd_soc_jack mt8173_rt5650_rt5514_jack; + +static int mt8173_rt5650_rt5514_init(struct snd_soc_pcm_runtime *runtime) +{ + struct snd_soc_card *card = runtime->card; + struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; + int ret; + + rt5645_sel_asrc_clk_src(codec, + RT5645_DA_STEREO_FILTER | + RT5645_AD_STEREO_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + + /* enable jack detection */ + ret = snd_soc_card_jack_new(card, "Headset Jack", + SND_JACK_HEADPHONE | SND_JACK_MICROPHONE | + SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3, + &mt8173_rt5650_rt5514_jack, NULL, 0); + if (ret) { + dev_err(card->dev, "Can't new Headset Jack %d\n", ret); + return ret; + } + + return rt5645_set_jack_detect(codec, + &mt8173_rt5650_rt5514_jack, + &mt8173_rt5650_rt5514_jack, + &mt8173_rt5650_rt5514_jack); +} + +static struct snd_soc_dai_link_component mt8173_rt5650_rt5514_codecs[] = { + { + .dai_name = "rt5645-aif1", + }, + { + .dai_name = "rt5514-aif1", + }, +}; + +enum { + DAI_LINK_PLAYBACK, + DAI_LINK_CAPTURE, + DAI_LINK_CODEC_I2S, +}; + +/* Digital audio interface glue - connects codec <---> CPU */ +static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { + /* Front End DAI links */ + [DAI_LINK_PLAYBACK] = { + .name = "rt5650_rt5514 Playback", + .stream_name = "rt5650_rt5514 Playback", + .cpu_dai_name = "DL1", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, + .dynamic = 1, + .dpcm_playback = 1, + }, + [DAI_LINK_CAPTURE] = { + .name = "rt5650_rt5514 Capture", + .stream_name = "rt5650_rt5514 Capture", + .cpu_dai_name = "VUL", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, + .dynamic = 1, + .dpcm_capture = 1, + }, + /* Back End DAI links */ + [DAI_LINK_CODEC_I2S] = { + .name = "Codec", + .cpu_dai_name = "I2S", + .no_pcm = 1, + .codecs = mt8173_rt5650_rt5514_codecs, + .num_codecs = 2, + .init = mt8173_rt5650_rt5514_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ops = &mt8173_rt5650_rt5514_ops, + .ignore_pmdown_time = 1, + .dpcm_playback = 1, + .dpcm_capture = 1, + }, +}; + +static struct snd_soc_codec_conf mt8173_rt5650_rt5514_codec_conf[] = { + { + .name_prefix = "Sub", + }, +}; + +static struct snd_soc_card mt8173_rt5650_rt5514_card = { + .name = "mtk-rt5650-rt5514", + .owner = THIS_MODULE, + .dai_link = mt8173_rt5650_rt5514_dais, + .num_links = ARRAY_SIZE(mt8173_rt5650_rt5514_dais), + .codec_conf = mt8173_rt5650_rt5514_codec_conf, + .num_configs = ARRAY_SIZE(mt8173_rt5650_rt5514_codec_conf), + .controls = mt8173_rt5650_rt5514_controls, + .num_controls = ARRAY_SIZE(mt8173_rt5650_rt5514_controls), + .dapm_widgets = mt8173_rt5650_rt5514_widgets, + .num_dapm_widgets = ARRAY_SIZE(mt8173_rt5650_rt5514_widgets), + .dapm_routes = mt8173_rt5650_rt5514_routes, + .num_dapm_routes = ARRAY_SIZE(mt8173_rt5650_rt5514_routes), +}; + +static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &mt8173_rt5650_rt5514_card; + struct device_node *platform_node; + int i, ret; + + platform_node = of_parse_phandle(pdev->dev.of_node, + "mediatek,platform", 0); + if (!platform_node) { + dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); + return -EINVAL; + } + + for (i = 0; i < card->num_links; i++) { + if (mt8173_rt5650_rt5514_dais[i].platform_name) + continue; + mt8173_rt5650_rt5514_dais[i].platform_of_node = platform_node; + } + + mt8173_rt5650_rt5514_codecs[0].of_node = + of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0); + if (!mt8173_rt5650_rt5514_codecs[0].of_node) { + dev_err(&pdev->dev, + "Property 'audio-codec' missing or invalid\n"); + return -EINVAL; + } + mt8173_rt5650_rt5514_codecs[1].of_node = + of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1); + if (!mt8173_rt5650_rt5514_codecs[1].of_node) { + dev_err(&pdev->dev, + "Property 'audio-codec' missing or invalid\n"); + return -EINVAL; + } + mt8173_rt5650_rt5514_codec_conf[0].of_node = + mt8173_rt5650_rt5514_codecs[1].of_node; + + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); + return ret; +} + +static const struct of_device_id mt8173_rt5650_rt5514_dt_match[] = { + { .compatible = "mediatek,mt8173-rt5650-rt5514", }, + { } +}; +MODULE_DEVICE_TABLE(of, mt8173_rt5650_rt5514_dt_match); + +static struct platform_driver mt8173_rt5650_rt5514_driver = { + .driver = { + .name = "mtk-rt5650-rt5514", + .of_match_table = mt8173_rt5650_rt5514_dt_match, +#ifdef CONFIG_PM + .pm = &snd_soc_pm_ops, +#endif + }, + .probe = mt8173_rt5650_rt5514_dev_probe, +}; + +module_platform_driver(mt8173_rt5650_rt5514_driver); + +/* Module information */ +MODULE_DESCRIPTION("MT8173 RT5650 and RT5514 SoC machine driver"); +MODULE_AUTHOR("Koro Chen <koro.chen(a)mediatek.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:mtk-rt5650-rt5514"); + -- 1.7.9.5

2 1

[alsa-devel] [PATCH 0/3] ASoC: Intel: Skylake: Update the IVI feedback path
by Vinod Koul 02 Mar '16

02 Mar '16

This patch series fixes the blob query direction and then uses that in IVI feedback path in nau88125_ssm4567 machine. Jeeja KP (3): ASoC: Intel: Skylake: correct direction in blob query ASoC: Intel: Skylake: Add IVI feedback path in nau88125_ssm4567 machine ASoC: Intel: Skylake: remove IVI codec loop in skl_nau88l25_ssm4567 machine sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 21 +++------------------ sound/soc/intel/skylake/skl-topology.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 25 deletions(-) -- 1.9.1

2 6

Re: [alsa-devel] [RFD] Add hw_params support for hostless stream BE DAIs
by Liam Girdwood 02 Mar '16

02 Mar '16

On Tue, 2016-02-16 at 21:47 +0530, Jeeja KP wrote: > We have no mechanism to configure hw_params for DAIs which are hostless. > Like a loop or DAIs connected to internal sinks/sources. > Fwiw, a few years back Peter, Sebastien and I were considering a similar mechanism for the ABE on OMAP4. We never got around to implementing or upstreaming though.... One comment below. > Problem Statement: > During a BE-BE loop of DSP or a SRC->SINK path, we cannot program > hw_params. There are no hw_params from user as these are hostless. > This scenario can happens in below 2 cases: > > Case 1: BE-BE loop aka hostless stream through SoC DSP > Hostless stream can be defined by BE to BE connection and in this case > the path is enabled or disabled by the state of the DAPM graph. This > usually means there is a mixer control that can be used to connect or > disconnect the path between both DAIs. > Example: > |--------------/----------------| > | | > | | > codec out modem_in > | | > | | > ssp0_TX ssp1_RX > | | > | | > AIFI_Playback dummy_capture > > In the above case (SSP0,codec playback,SSp1 dai needs to be configured > and turned on with the selected hw_params). > > Case 2: SoC Internal Sink or Source > Example: > WOV SINK (DAPM Sink) > | > | > | > Switch > | > | > w1 > | > dmic rx (BE dai widget) > | > Capture(codec dai widget) > | > DMIC AIF > | > DMic > | > Soc DMic (MIC Widget) (SRC) > > In the above case BE (dmic RX) dai hw_params needs to applied. > > Approach: > 1. Allow params to be defined for other BE dai link also. this > currently applicable only for codec_codec link. > > 2. when params is defined for BE dai link, create params kcontrols > and associate it with the dai widgets. this will allow params to be > selected via Kcontrol for each dai defined in the dai link. > The only problem we have with using a kcontrol to define params is that we already have an existing kernel ioctl and public C API to define SW/HW params. This would add another mechanism, unless each new kcontrol allows modification of a single param ? Liam > 3. Before powering on the dai widget and if the dai is not powered > with the stream event, then dai_ops(hw_params) for the dai widget will > be called.This will apply the selected hw_params. > > 4. with the above, fix_up can be removed and can use .params to > select the parameter. > > Core Changes: > 1. params definition needs to changed, currently this is defined to used > only for codec codec link. define new flag to identifying codec > codec link. > > 2. if params is defined for any BE dai link, then create kcontrol for > each dai defined in the dai_link and associated the kcontrol to dai > widget. > > 3. In the powering sequence check if the dai widget and if the event is > not a stream event, SND_SOC_DAPM_STREAM_NOP , then call dai ops with > the selected params. This will apply the hw_params for dai. > > 1. params definition: > - Add new flag in struct snd_soc_dai_link. > - Based on this flag create, the codec codec link instead of > params > struct snd_soc_dai_link { > const struct snd_soc_pcm_stream *params; > unsigned int num_params; > > + /* flag to create codec codec based on the flag*/ > + unsigned int codec_link:1; > + > unsigned int dai_fmt; /* format to set on init */ > > enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ > > - creation of dai link based on the codec_link flag > static int soc_probe_link_dais(struct snd_soc_card *card, > int num, int order) > } > } else { > > - if (!dai_link->params) { > + if (!dai_link->codec_link) { > /* create the pcm */ > ret = soc_new_pcm(rtd, num); > if (ret < 0) { > > 2. when params is defined for BE dai link, create params kcontrols and > associate it with the dai widgets. this will allow params to be selected > via Kcontrol for each dai defined in the dai link. > a. Move the param control creation from snd_soc_dapm_new_pcm and add new > API to created kcontrols with the params. > +snd_soc_dapm_create_param_control(struct snd_soc_card *card, > + const struct snd_soc_pcm_stream *params, > + unsigned int num_params) > { > /* create kcontrol based on the params */ > } > > - modify the snd_soc_dapm_new_pcm to create the param control > int snd_soc_dapm_new_pcm(struct snd_soc_card *card, > const struct snd_soc_pcm_stream *params, > unsigned int num_params, > struct snd_soc_dapm_widget *source, > struct snd_soc_dapm_widget *sink) > { > > template.kcontrol_news = snd_soc_dapm_create_param_control(card, > params, num_params); > if (!template.kcontrol_news) { > dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", > link_name); > ret = -ENOMEM; > - goto outfree_private_value; > + goto outfree_link_name; > } > > > b. add new API snd_soc_dapm_new_dai_params() to create kcontrol for dai and associated it to dai. > +int snd_soc_dapm_new_dai_params(struct snd_soc_card *card, > + const struct snd_soc_pcm_stream *params, > + unsigned int num_params, > + struct snd_soc_dapm_widget *dai_w) > +{ > + struct snd_kcontrol_new *kcontrol_news; > + > + kcontrol_news = snd_soc_dapm_create_param_control(card, params, > + num_params); > + if (!kcontrol_news) { > + dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", > + dai_w->name); > + return -EINVAL; > + } > + > + dai_w->num_kcontrols = 1; > + dai_w->kcontrol_news = kcontrol_news; > + > + dai_w->params = params; > + dai_w->num_params = num_params; > + > + return 0; > + > +} > + > +++ b/include/sound/soc-dapm.h > +int snd_soc_dapm_new_dai_params(struct snd_soc_card *card, > + const struct snd_soc_pcm_stream *params, > + unsigned int num_params, > + struct snd_soc_dapm_widget *dai_w); > > > c. if the be dai link has .params defined, call new API snd_soc_dapm_new_dai_params > > +static int soc_link_be_params_widget(struct snd_soc_card *card, > + struct snd_soc_dai *dai, > + const struct snd_soc_pcm_stream *params, > + unsigned int num_params) > +{ > + int ret; > + struct snd_soc_dapm_widget *w; > + > + if (!strcmp(dai->name, "snd-soc-dummy")) > + return 0; > + > + if (dai->playback_widget) { > + w = dai->playback_widget; > + ret = snd_soc_dapm_new_dai_params(card, params, > + num_params, w); > + > + if (ret != 0) { > + dev_err(card->dev, > + "ASoC: Can't create params widget=%s %d\n", > + w->name, ret); > + return ret; > + } > + } > + > + if (dai->capture_widget) { > + w = dai->capture_widget; > + ret = snd_soc_dapm_new_dai_params(card, params, > + num_params, w); > + > + if (ret != 0) { > + dev_err(card->dev, > + "ASoC: Can't create params widget=%s %d\n", > + w->name, ret); > + return ret; > + } > + } > + > + return 0; > +} > + > +static int soc_link_be_params_dai_widgets(struct snd_soc_card *card, > + struct snd_soc_dai_link *dai_link, > + struct snd_soc_pcm_runtime *rtd) > +{ > + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; > + int ret, i; > + > + for (i = 0; i < rtd->num_codecs; i++) { > + struct snd_soc_dai *codec = rtd->codec_dais[i]; > + > + ret = soc_link_be_params_widget(card, codec, > + dai_link->params, > + dai_link->num_params); > + > + if (!ret) > + return ret; > + } > + > + return soc_link_be_params_widget(card, cpu_dai, dai_link->params, > + dai_link->num_params); > +} > + > > @@ -1651,6 +1714,13 @@ static int soc_probe_link_dais(struct snd_soc_card *card, > dai_link->stream_name, ret); > return ret; > } > + if (dai_link->params && dai_link->no_pcm) { > + /* create dai link controls */ > + ret = soc_link_be_params_dai_widgets(card, > + dai_link, rtd); > + if (ret) > + return ret; > + } > } else { > INIT_DELAYED_WORK(&rtd->delayed_work, > codec2codec_close_delayed_work); > > > 3. Applying the hw_params for dai widget > > --- a/sound/soc/soc-dapm.c > +++ b/sound/soc/soc-dapm.c > @@ -1398,9 +1398,64 @@ static void dapm_seq_check_event(struct snd_soc_card * > card, > } > } > > +static int snd_soc_dai_params(struct snd_soc_dapm_widget *w, int event) > +{ > + struct snd_soc_dai *dai; > + const struct snd_soc_pcm_stream *config = w->params + w->params_select; > + struct snd_pcm_substream substream; > + struct snd_pcm_hw_params *params = NULL; > + u64 fmt; > + int ret = 0; > + > + if (WARN_ON(!config)) > + return -EINVAL; > + > + dai = w->priv; > + > + if (config->formats) { > + fmt = ffs(config->formats) - 1; > + } else { > + dev_warn(w->dapm->dev, "ASoC: Invalid format %llx specified\n", > + config->formats); > + fmt = 0; > + } > + > + /* Currently very limited parameter selection */ > + params = kzalloc(sizeof(*params), GFP_KERNEL); > + if (!params) { > + ret = -ENOMEM; > + goto out; > + } > + snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt); > + > + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = > + config->rate_min; > + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = > + config->rate_max; > + > + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min > + = config->channels_min; > + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max > + = config->channels_max; > + > + memset(&substream, 0, sizeof(substream)); > + if (w->id == snd_soc_dapm_dai_in) > + substream.stream = SNDRV_PCM_STREAM_CAPTURE; > + else > + substream.stream = SNDRV_PCM_STREAM_PLAYBACK; > + > + ret = soc_dai_hw_params(&substream, params, dai); > + if (ret < 0) > + goto out; > +out: > + kfree(params); > + return ret; > +} > + > /* Apply the coalesced changes from a DAPM sequence */ > static void dapm_seq_run_coalesced(struct snd_soc_card *card, > - struct list_head *pending) > + struct list_head *pending, > + int event) > { > struct snd_soc_dapm_context *dapm; > struct snd_soc_dapm_widget *w; > @@ -1413,6 +1468,14 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card, > dapm = w->dapm; > > list_for_each_entry(w, pending, power_list) { > + if ((event == SND_SOC_DAPM_STREAM_NOP) && > + ((w->id == snd_soc_dapm_dai_out) || > + (w->id == snd_soc_dapm_dai_in))) { > + snd_soc_dai_params(w, SND_SOC_DAPM_PRE_PMU); > + } > + } > + > + list_for_each_entry(w, pending, power_list) { > WARN_ON(reg != w->reg || dapm != w->dapm); > w->power = w->new_power; > > @@ -1447,6 +1510,13 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card, > dapm_seq_check_event(card, w, SND_SOC_DAPM_POST_PMU); > dapm_seq_check_event(card, w, SND_SOC_DAPM_POST_PMD); > } > + list_for_each_entry(w, pending, power_list) { > + if ((event == SND_SOC_DAPM_STREAM_NOP) && > + ((w->id == snd_soc_dapm_dai_out) || > + (w->id == snd_soc_dapm_dai_in))) { > + snd_soc_dai_params(w, SND_SOC_DAPM_POST_PMD); > + } > + } > } > > /* Apply a DAPM power sequence. > @@ -1482,7 +1552,7 @@ static void dapm_seq_run(struct snd_soc_card *card, > if (sort[w->id] != cur_sort || w->reg != cur_reg || > w->dapm != cur_dapm || w->subseq != cur_subseq) { > if (!list_empty(&pending)) > - dapm_seq_run_coalesced(card, &pending); > + dapm_seq_run_coalesced(card, &pending, event); > > if (cur_dapm && cur_dapm->seq_notifier) { > for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) > @@ -1545,7 +1615,7 @@ static void dapm_seq_run(struct snd_soc_card *card, > } > > if (!list_empty(&pending)) > - dapm_seq_run_coalesced(card, &pending); > + dapm_seq_run_coalesced(card, &pending, event); > > if (cur_dapm && cur_dapm->seq_notifier) { > for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) > -- > 1.7.9.5 > > Comments welcome, based on discussion we will send patches. > > --Jeeja

3 2

Re: [alsa-devel] [PATCH v2] ASoC: imx-wm8958: add imx-wm8958 machine driver
by Nicolin Chen 02 Mar '16

02 Mar '16

It looks like you replied me off the maillist. So I just add the maillist and related TO/CCs back. On Tue, Mar 01, 2016 at 05:43:22AM +0000, Zidan Wang wrote: > On Fri, Feb 26, 2016 at 11:42:42AM +0800, Zidan Wang wrote: > > This is the initial imx-wm8958 device-tree-only machine driver working > > with fsl_sai driver. This sound card has three dai link, HIFI, VOICE > > and BT dai. HIFI dai link will support codec master and slave mode. > > VOICE an BT dai link have dummy cpu dai, and just support codec master > > mode. > > Why VOICE and BT are using dummy cpu dai? Where can I find the schematics > for wm8958 from NXP website? > [Wang Zidan-B50113] I have attached the schematics for wm8958. In our > release, we can't support VOICE and BT, and just using AIF1. But in > order to upstream, I add the voice and bt dai. The way to support the other two AIFs are not very graceful -- looks like you will have to hard code the CPU DAIs in the driver. I personally suggest you to use fsl-asoc-card. Since the Codec IC provides three DAIs. And in the schematics, you do have three DAI links. It sounds plausible to me that we might treat these three DAI links as three different cards. Then use different compatible names: "imx-audio-wm8958-aif1" and so on. And each one can also has ASRC back-end support. If you really have big trouble to integrate it into fsl-asoc-card (not 100% sure if the 3 cards methodology is totally feasible), I will be okay with a dedicated driver for wm8958. But you will need to refine the DT binding to support three CPU DAIs in my opinion. > > +static u32 imx_wm8958_rates[] = { 8000, 16000, 32000, 48000 }; > > + > > +static struct snd_pcm_hw_constraint_list imx_wm8958_rate_constraints = { > > + .count = ARRAY_SIZE(imx_wm8958_rates), > > + .list = imx_wm8958_rates, > > +}; > > Where are these rate constraints coming from? > [Wang Zidan-B50113] these rates are restricted by the SAI MCLK. If the SAI MCLK runs at a different rate, it would be invalid. So there should be at least two constraints depending on the MCLK rate. And I think it might be better to have this in the SAI driver as a refinement since the current driver only errors out for those unsupported rates. > > + if (id == HIFI_DAI) { > > + /* > > + * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 > > + * using shared LRCLK from DACLRCK1. > > + */ > > + snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); > > I don't see any reverse operation against this GPIO configuration here. > So is it really an operation that has to be done every hw_params()? > > > + } else if (id == VOICE_DAI) { > > + /* > > + * Set GPIO6 pin function to reserve, so that DAC2 and ADC2 > > + * using shared LRCLK from DACLRCK2. > > + */ > > + snd_soc_update_bits(codec, WM8994_GPIO_6, 0x1f, 0x2); > > Same here. Actually I just took a look at the DT binding doc of WM8994. It supports GPIO configurations in the codec DT nodes. So you may not need to do these over here at all. > > +static int imx_wm8958_set_bias_level_post(struct snd_soc_card *card, > > + struct snd_soc_dapm_context *dapm, > > + enum snd_soc_bias_level level) { > > + switch (level) { > > + case SND_SOC_BIAS_OFF: > > + if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) > > + for (i = 0; i < WM8958_MCLK_MAX; i++) { > > + if (!IS_ERR(data->mclk[i])) > > + clk_disable_unprepare(data->mclk[i]); > > The set_bias() funcs are merely en/disabling mclk. > Would be possible to do it in the codec driver? > [Wang Zidan-B50113] It can be moved to codec driver, > but the wm8994 driver can support wm8958 wm8994 wm1811 codec, > it's hard for me to do like that, and I also can't test them. Sending a patch to the maillist is a way to let people be aware of the change and then test it. The driver maintainer will review it and give you feedback. If it really causes compatible issues, you can then limit the code for wm8958 only. > > +static struct snd_soc_dai_link imx_wm8958_dai_link[] = { > > + [BT_DAI] = { > > + .name = "Bluetooth", > > + .stream_name = "Bluetooth", > > + .cpu_dai_name = "snd-soc-dummy-dai", > > + .codec_name = "wm8994-codec", > > + .codec_dai_name = "wm8994-aif3", > > + .platform_name = "snd-soc-dummy", > > + .ignore_pmdown_time = 1, > > + }, > > A little curious...how is the BT gonna work for you? > [Wang Zidan-B50113] I have not test the BT dai. The BT is directly > connect to AIF3, when AIF3 receive date from BT, it will route the > date to AIF1 or AIF2. And the date from AIF1 and AIF2 can also route > to AIF3 to BT. So we just need to set the amixer setting to open the > audio route. Sounds interesting. So the Codec totally becomes a router. If this design can not be supported by using three cards via the fsl-asoc-card, you may continue this driver as I can see the situation here. But I encourage you to try that first so as to avoid duplicated code/driver.

2 2

[alsa-devel] [PATCH] Add a quirk for Plantronics DA45
by Dennis Kadioglu 01 Mar '16

01 Mar '16

Plantronics DA45 does not support reading the sample rate which leads to many lines of "cannot get freq at ep 0x4" and "cannot get freq at ep 0x84". This patch adds the USB ID of the DA45 to quirks.c and avoids those error messages. Signed-off-by: Dennis Kadioglu <denk(a)post.com> --- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 2585c17..5b03296 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1123,6 +1123,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) case USB_ID(0x045E, 0x076F): /* MS Lifecam HD-6000 */ case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */ case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */ + case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */ case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */ ---

2 1

[alsa-devel] [PATCH] Add a quirk for Plantronics DA45
by denk 01 Mar '16

01 Mar '16

Plantronics DA45 does not support reading the sample rate which leads to many lines of "cannot get freq at ep 0x4" and "cannot get freq at ep 0x84". This patch adds the USB ID of the DA45 to quirks.c and avoids those error messages. --- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 2585c17..5b03296 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1123,6 +1123,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) case USB_ID(0x045E, 0x076F): /* MS Lifecam HD-6000 */ case USB_ID(0x045E, 0x0772): /* MS Lifecam Studio */ case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */ + case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */ case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */ --- Signed-off-by: Dennis Kadioglu <denk(a)post.com>

4 5

[alsa-devel] [PATCH 1/1] alsabat: truncate sample frames for faster FFT analysis
by han.lu＠intel.com 01 Mar '16

01 Mar '16

From: "Lu, Han" <han.lu(a)intel.com> Truncate the sample frames to powers of 2, since the FFTW algorithm runs especially fast in this case, and other sizes may be computed by means of a slow, general-purpose algorithm. In my test environment applying the patch, a sound clip of 33072 frames is cut off to 32768 frames before analysis, and the time cost is reduced from 6.128s to 0.224s. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/bat/analyze.c b/bat/analyze.c index 60e2d1c..5cfdac3 100644 --- a/bat/analyze.c +++ b/bat/analyze.c @@ -256,6 +256,20 @@ static int reorder_data(struct bat *bat) return 0; } +/* truncate sample frames for faster FFT analysis process */ +static int truncate_frames(struct bat *bat) +{ + int shift = SHIFT_MAX; + + for (; shift > SHIFT_MIN; shift--) + if (bat->frames & (1 << shift)) { + bat->frames = 1 << shift; + return 0; + } + + return -EINVAL; +} + int analyze_capture(struct bat *bat) { int err = 0; @@ -263,6 +277,13 @@ int analyze_capture(struct bat *bat) int c; struct analyze a; + err = truncate_frames(bat); + if (err < 0) { + fprintf(bat->err, _("Invalid frame number for analysis: %d\n"), + bat->frames); + return err; + } + fprintf(bat->log, _("\nBAT analysis: signal has %d frames at %d Hz,"), bat->frames, bat->rate); fprintf(bat->log, _(" %d channels, %d bytes per sample.\n"), diff --git a/bat/common.h b/bat/common.h index b8f6670..ff03fc1 100644 --- a/bat/common.h +++ b/bat/common.h @@ -68,6 +68,12 @@ #define FOUND_DC (1<<1) #define FOUND_WRONG_PEAK (1<<0) +/* Truncate sample frames to (1 << N), for faster FFT analysis process. The + * valid range of N is (SHIFT_MIN, SHIFT_MAX). When N increases, the analysis + * will be more time-consuming, and the result will be more accurate. */ +#define SHIFT_MAX (sizeof(int) * 8 - 2) +#define SHIFT_MIN 8 + struct wav_header { unsigned int magic; /* 'RIFF' */ unsigned int length; /* file len */ -- 2.5.0

2 1

[alsa-devel] [PATCH] ALSA: hda - hdmi_find_pcm_slot return value bug fix
by libin.yang＠linux.intel.com 01 Mar '16

01 Mar '16

From: Libin Yang <libin.yang(a)linux.intel.com> hdmi_find_pcm_slot return -EBUSY when not no pcm slot found, not -ENODEV. So the caller should compare with -EBUSY. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d77509a..aa2d6a2 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1758,7 +1758,7 @@ static void hdmi_attach_hda_pcm(struct hdmi_spec *spec, if (per_pin->pcm) return; idx = hdmi_find_pcm_slot(spec, per_pin); - if (idx == -ENODEV) + if (idx == -EBUSY) return; per_pin->pcm_idx = idx; per_pin->pcm = get_hdmi_pcm(spec, idx); -- 1.9.1

2 1

[alsa-devel] [PATCH] teac ud-501/ud-503 usb delay
by Guillaume Fougnies 01 Mar '16

01 Mar '16

Hello, This is a small patch against sound/usb/quirks.c to correct "Teac Corp." products delay. Tested on Teac UD-501 and UD-503 products, could not harm other Teac products. It corrects the "clock source 41 is not valid, cannot use" error for both devices. And more critically on the new UD-503, a complete freeze of the teac usb interface when switching between different rate/format. (Freeze only solved by a power switch of the device...) The patch matches the problem of the "Playback Design" products. I just refactored a bit the code to include Teac products properly. Regards, Guillaume --- sound/usb/quirks.c | 58 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 23ea6d8..f3faaef 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1202,40 +1202,48 @@ void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep) void snd_usb_set_interface_quirk(struct usb_device *dev) { /* - * "Playback Design" products need a 50ms delay after setting the + * Products needing a 50ms delay after setting the * USB interface. */ - if (le16_to_cpu(dev->descriptor.idVendor) == 0x23ba) - mdelay(50); + switch (le16_to_cpu(dev->descriptor.idVendor)) { + case 0x23ba: /* Playback Design */ + case 0x0644: /* TEAC Corp. */ + mdelay(50); + } } void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, __u16 size) { - /* - * "Playback Design" products need a 20ms delay after each - * class compliant request - */ - if ((le16_to_cpu(dev->descriptor.idVendor) == 0x23ba) && - (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) - mdelay(20); - - /* Marantz/Denon devices with USB DAC functionality need a delay - * after each class compliant request - */ - if (is_marantz_denon_dac(USB_ID(le16_to_cpu(dev->descriptor.idVendor), - le16_to_cpu(dev->descriptor.idProduct))) - && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) - mdelay(20); + if ((requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) { + switch (le16_to_cpu(dev->descriptor.idVendor)) { + /* + * "Playback Design"/"TEAC Corp." products need a 20ms delay after each + * class compliant request + */ + case 0x23ba: /* "Playback Design" */ + case 0x0644: /* TEAC Corp. */ + mdelay(20); + return; + + /* Zoom R16/24 needs a tiny delay here, otherwise requests like + * get/set frequency return as failed despite actually succeeding. + */ + case 0x1686: + /* restrict to 0x00dd */ + if (le16_to_cpu(dev->descriptor.idProduct) == 0x00dd) + mdelay(1); + return; + } - /* Zoom R16/24 needs a tiny delay here, otherwise requests like - * get/set frequency return as failed despite actually succeeding. - */ - if ((le16_to_cpu(dev->descriptor.idVendor) == 0x1686) && - (le16_to_cpu(dev->descriptor.idProduct) == 0x00dd) && - (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) - mdelay(1); + /* Marantz/Denon devices with USB DAC functionality need a delay + * after each class compliant request + */ + if (is_marantz_denon_dac(USB_ID(le16_to_cpu(dev->descriptor.idVendor), + le16_to_cpu(dev->descriptor.idProduct)))) + mdelay(20); + } } /* -- 2.6.4

4 5

[alsa-devel] Applied "ASoC: intel: remove unused variable" to the asoc tree
by Mark Brown 01 Mar '16

01 Mar '16

The patch ASoC: intel: remove unused variable has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From dbc77eed6553362e08c1874ff30df640c96eca92 Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Date: Mon, 29 Feb 2016 22:53:46 +0530 Subject: [PATCH] ASoC: intel: remove unused variable The variable cmd_id is only assigned some value and is never used. Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/atom/sst/sst_ipc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c index 3dc7358828b3..8afa6fe7b0b0 100644 --- a/sound/soc/intel/atom/sst/sst_ipc.c +++ b/sound/soc/intel/atom/sst/sst_ipc.c @@ -318,7 +318,6 @@ void sst_process_reply_mrfld(struct intel_sst_drv *sst_drv_ctx, union ipc_header_high msg_high; u32 msg_low; struct ipc_dsp_hdr *dsp_hdr; - unsigned int cmd_id; msg_high = msg->mrfld_header.p.header_high; msg_low = msg->mrfld_header.p.header_low_payload; @@ -357,7 +356,6 @@ void sst_process_reply_mrfld(struct intel_sst_drv *sst_drv_ctx, return; /* Copy command id so that we can use to put sst to reset */ dsp_hdr = (struct ipc_dsp_hdr *)data; - cmd_id = dsp_hdr->cmd_id; dev_dbg(sst_drv_ctx->dev, "cmd_id %d\n", dsp_hdr->cmd_id); if (sst_wake_up_block(sst_drv_ctx, msg_high.part.result, msg_high.part.drv_id, -- 2.7.0

1 0

[alsa-devel] [PATCH] ASoC: dapm: Fix ctl value accesses in a wrong type
by Takashi Iwai 01 Mar '16

01 Mar '16

snd_soc_dapm_dai_link_get() and _put() access the associated ctl values as value.integer.value[]. However, this is an enum ctl, and it has to be accessed via value.enumerated.item[]. The former is long while the latter is unsigned int, so they don't align. Fixes: c66150824b8a ('ASoC: dapm: add code to configure dai link parameters') Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/soc-dapm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0d3707987900..581175a51ecf 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3573,7 +3573,7 @@ static int snd_soc_dapm_dai_link_get(struct snd_kcontrol *kcontrol, { struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol); - ucontrol->value.integer.value[0] = w->params_select; + ucontrol->value.enumerated.item[0] = w->params_select; return 0; } @@ -3587,13 +3587,13 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, if (w->power) return -EBUSY; - if (ucontrol->value.integer.value[0] == w->params_select) + if (ucontrol->value.enumerated.item[0] == w->params_select) return 0; - if (ucontrol->value.integer.value[0] >= w->num_params) + if (ucontrol->value.enumerated.item[0] >= w->num_params) return -EINVAL; - w->params_select = ucontrol->value.integer.value[0]; + w->params_select = ucontrol->value.enumerated.item[0]; return 0; } -- 2.7.2

2 1

[alsa-devel] [PATCH 0/2] ASoC: omap: Fix enum ctl accesses
by Takashi Iwai 01 Mar '16

01 Mar '16

Hi, here is a patchset to correct the wrong type accesses in omap drivers for enum ctls. I didn't put Cc to stable for them, supposing these are only for 32bit systems. If not, feel free to put Cc to stable. thanks, Takashi === Takashi Iwai (2): ASoC: omap: n810: Fix enum ctl accesses in a wrong type ASoC: omap: rx51: Fix enum ctl accesses in a wrong type sound/soc/omap/n810.c | 18 +++++++++--------- sound/soc/omap/rx51.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) -- 2.7.2

3 6

[alsa-devel] [PATCH] ASoC: intel: mfld: Fix enum ctl accesses in a wrong type
by Takashi Iwai 01 Mar '16

01 Mar '16

"Playback Switch" and "Lineout Mux" ctls in medfld machine driver are enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- I didn't put Cc to stable, as I assume medfiled is 32bit only. If it also supports 64bit, put Cc to stable. sound/soc/intel/boards/mfld_machine.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/mfld_machine.c b/sound/soc/intel/boards/mfld_machine.c index 49c09a0add79..34f46c72a0e2 100644 --- a/sound/soc/intel/boards/mfld_machine.c +++ b/sound/soc/intel/boards/mfld_machine.c @@ -94,7 +94,7 @@ static const struct soc_enum lo_enum = static int headset_get_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - ucontrol->value.integer.value[0] = hs_switch; + ucontrol->value.enumerated.item[0] = hs_switch; return 0; } @@ -104,12 +104,12 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol, struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_context *dapm = &card->dapm; - if (ucontrol->value.integer.value[0] == hs_switch) + if (ucontrol->value.enumerated.item[0] == hs_switch) return 0; snd_soc_dapm_mutex_lock(dapm); - if (ucontrol->value.integer.value[0]) { + if (ucontrol->value.enumerated.item[0]) { pr_debug("hs_set HS path\n"); snd_soc_dapm_enable_pin_unlocked(dapm, "Headphones"); snd_soc_dapm_disable_pin_unlocked(dapm, "EPOUT"); @@ -123,7 +123,7 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol, snd_soc_dapm_mutex_unlock(dapm); - hs_switch = ucontrol->value.integer.value[0]; + hs_switch = ucontrol->value.enumerated.item[0]; return 0; } @@ -148,7 +148,7 @@ static void lo_enable_out_pins(struct snd_soc_dapm_context *dapm) static int lo_get_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - ucontrol->value.integer.value[0] = lo_dac; + ucontrol->value.enumerated.item[0] = lo_dac; return 0; } @@ -158,7 +158,7 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol, struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct snd_soc_dapm_context *dapm = &card->dapm; - if (ucontrol->value.integer.value[0] == lo_dac) + if (ucontrol->value.enumerated.item[0] == lo_dac) return 0; snd_soc_dapm_mutex_lock(dapm); @@ -168,7 +168,7 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol, */ lo_enable_out_pins(dapm); - switch (ucontrol->value.integer.value[0]) { + switch (ucontrol->value.enumerated.item[0]) { case 0: pr_debug("set vibra path\n"); snd_soc_dapm_disable_pin_unlocked(dapm, "VIB1OUT"); @@ -202,7 +202,7 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol, snd_soc_dapm_mutex_unlock(dapm); - lo_dac = ucontrol->value.integer.value[0]; + lo_dac = ucontrol->value.enumerated.item[0]; return 0; } -- 2.7.2

2 1

[alsa-devel] [PATCH] ASoC: cs42l51: Fix enum ctl accesses in a wrong type
by Takashi Iwai 01 Mar '16

01 Mar '16

"PCM channel mixer" ctl in cs42l51 codec driver is enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- like other patchsets, I didn't put Cc to stable. If this driver is used for 64bit archs, feel free to put Cc to stable. sound/soc/codecs/cs42l51.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index b3951524339f..35488f14e237 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -60,15 +60,15 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol, switch (value) { default: case 0: - ucontrol->value.integer.value[0] = 0; + ucontrol->value.enumerated.item[0] = 0; break; /* same value : (L+R)/2 and (R+L)/2 */ case 1: case 2: - ucontrol->value.integer.value[0] = 1; + ucontrol->value.enumerated.item[0] = 1; break; case 3: - ucontrol->value.integer.value[0] = 2; + ucontrol->value.enumerated.item[0] = 2; break; } @@ -85,7 +85,7 @@ static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); unsigned char val; - switch (ucontrol->value.integer.value[0]) { + switch (ucontrol->value.enumerated.item[0]) { default: case 0: val = CHAN_MIX_NORMAL; -- 2.7.2

2 1

[alsa-devel] [PATCH] ASoC: da732x: Fix enum ctl accesses in a wrong type
by Takashi Iwai 01 Mar '16

01 Mar '16

"DAC1 High Pass Filter Mode" & co in da732x codec driver are enum, while the current driver accesses wrongly via value.integer.value[]. They have to be via value.enumerated.item[] instead. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- like other patchsets, I didn't put Cc to stable. If this driver is used for 64bit archs, feel free to put Cc to stable. sound/soc/codecs/da732x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 1d5a89c5164b..461506a4ca6a 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -334,7 +334,7 @@ static int da732x_hpf_set(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value; unsigned int reg = enum_ctrl->reg; - unsigned int sel = ucontrol->value.integer.value[0]; + unsigned int sel = ucontrol->value.enumerated.item[0]; unsigned int bits; switch (sel) { @@ -368,13 +368,13 @@ static int da732x_hpf_get(struct snd_kcontrol *kcontrol, switch (val) { case DA732X_HPF_VOICE_EN: - ucontrol->value.integer.value[0] = DA732X_HPF_VOICE; + ucontrol->value.enumerated.item[0] = DA732X_HPF_VOICE; break; case DA732X_HPF_MUSIC_EN: - ucontrol->value.integer.value[0] = DA732X_HPF_MUSIC; + ucontrol->value.enumerated.item[0] = DA732X_HPF_MUSIC; break; default: - ucontrol->value.integer.value[0] = DA732X_HPF_DISABLED; + ucontrol->value.enumerated.item[0] = DA732X_HPF_DISABLED; break; } -- 2.7.2

2 1

[alsa-devel] [PATCH 0/5] ASoC: Fix enum ctl accesses in various codec drivers
by Takashi Iwai 01 Mar '16

01 Mar '16

Hi, here are the rest of buggy drivers to be fixed for the wrong ctl access types to enum ctls. Again, put Cc to stable appropriately if needed. thanks, Takashi === Takashi Iwai (5): ASoC: ab8500: Fix enum ctl accesses in a wrong type ASoC: max98088: Fix enum ctl accesses in a wrong type ASoC: max98095: Fix enum ctl accesses in a wrong type ASoC: tlv320dac33: Fix enum ctl accesses in a wrong type ASoC: wl1273: Fix enum ctl accesses in a wrong type sound/soc/codecs/ab8500-codec.c | 8 ++++---- sound/soc/codecs/max98088.c | 2 +- sound/soc/codecs/max98095.c | 4 ++-- sound/soc/codecs/tlv320dac33.c | 9 ++++----- sound/soc/codecs/wl1273.c | 13 ++++++------- 5 files changed, 17 insertions(+), 19 deletions(-) -- 2.7.2

2 10

[alsa-devel] [PATCH v2 0/6] ALSA core X32 ABI fixes
by Takashi Iwai 29 Feb '16

29 Feb '16

Hi, this is the revised patchset for fixing the incompatible ioctls in ALSA core with X32 ABI. Too bad that we have to deal in this way, but it's life... Takashi === Takashi Iwai (6): ALSA: ctl: Fix ioctls for X32 ABI ALSA: pcm: Fix ioctls for X32 ABI ALSA: rawmidi: Use comapt_put_timespec() ALSA: rawmidi: Fix ioctls X32 ABI ALSA: timer: Fix broken compat timer user status ioctl ALSA: timer: Fix ioctls for X32 ABI sound/core/control_compat.c | 90 ++++++++++++++++++---- sound/core/pcm_compat.c | 177 +++++++++++++++++++++++++++++++++++++++++++- sound/core/rawmidi_compat.c | 56 +++++++++++++- sound/core/timer_compat.c | 18 ++++- 4 files changed, 320 insertions(+), 21 deletions(-) -- 2.7.2

2 8

[alsa-devel] [PATCH] ALSA: seq: Remove unimplemented ioctls
by Takashi Iwai 29 Feb '16

29 Feb '16

SNDRV_SEQ_IOCTL_{GET|SET}_QUEUE_OWNER and *_{GET|SET}_QUEUE_SYNC ioctls have been never implemented. Get rid of the definitions from uapi header file. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/uapi/sound/asequencer.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index 5a5fa4956ebd..af96f2044f91 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h @@ -594,14 +594,8 @@ struct snd_seq_query_subs { #define SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS _IOWR('S', 0x40, struct snd_seq_queue_status) #define SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO _IOWR('S', 0x41, struct snd_seq_queue_tempo) #define SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO _IOW ('S', 0x42, struct snd_seq_queue_tempo) -#define SNDRV_SEQ_IOCTL_GET_QUEUE_OWNER _IOWR('S', 0x43, struct snd_seq_queue_owner) -#define SNDRV_SEQ_IOCTL_SET_QUEUE_OWNER _IOW ('S', 0x44, struct snd_seq_queue_owner) #define SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER _IOWR('S', 0x45, struct snd_seq_queue_timer) #define SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER _IOW ('S', 0x46, struct snd_seq_queue_timer) -/* XXX -#define SNDRV_SEQ_IOCTL_GET_QUEUE_SYNC _IOWR('S', 0x53, struct snd_seq_queue_sync) -#define SNDRV_SEQ_IOCTL_SET_QUEUE_SYNC _IOW ('S', 0x54, struct snd_seq_queue_sync) -*/ #define SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT _IOWR('S', 0x49, struct snd_seq_queue_client) #define SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT _IOW ('S', 0x4a, struct snd_seq_queue_client) #define SNDRV_SEQ_IOCTL_GET_CLIENT_POOL _IOWR('S', 0x4b, struct snd_seq_client_pool) -- 2.7.2

1 0

[alsa-devel] [PATCH] ASoC: qcom: add dependency on HAS_DMA
by Sudip Mukherjee 29 Feb '16

29 Feb '16

m32r allmodconfig build is failing with the error: ERROR: "bad_dma_ops" [sound/soc/qcom/snd-soc-lpass-platform.ko] undefined! ERROR: "dma_common_mmap" [sound/soc/qcom/snd-soc-lpass-platform.ko] undefined! lpass-platform uses DMA so add HAS_DMA in the Kconfig. Also add the same for SND_SOC_LPASS_IPQ806X and SND_SOC_LPASS_APQ8016 as they will also select SND_SOC_LPASS_PLATFORM. Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- m32r allmodconfig build for next-20160229 is at: https://travis-ci.org/sudipm-mukherjee/parport/jobs/112534168 sound/soc/qcom/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 3cc252e..1e7a783 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -11,15 +11,18 @@ config SND_SOC_LPASS_CPU config SND_SOC_LPASS_PLATFORM tristate + depends on HAS_DMA select REGMAP_MMIO config SND_SOC_LPASS_IPQ806X tristate + depends on HAS_DMA select SND_SOC_LPASS_CPU select SND_SOC_LPASS_PLATFORM config SND_SOC_LPASS_APQ8016 tristate + depends on HAS_DMA select SND_SOC_LPASS_CPU select SND_SOC_LPASS_PLATFORM -- 1.9.1

1 1

[alsa-devel] [PATCH] ALSA: mts64: fix NULL pointer dereference
by Sudip Mukherjee 29 Feb '16

29 Feb '16

While registering pardev, the irq_func was also registered. As a result when we tried to probe for the card, an interrupt was generated and in the ISR we tried to dereference private_data. But private_data is still NULL as we have not yet done snd_mts64_create(). Lets probe for the card after mts64 is created. Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Fixes: 94a573500d48 ("ALSA: mts64: use new parport device model") Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- sound/drivers/mts64.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index c76bd87..fd4d18d 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -964,11 +964,6 @@ static int snd_mts64_probe(struct platform_device *pdev) err = -EIO; goto free_pardev; } - err = mts64_probe(p); - if (err) { - err = -EIO; - goto release_pardev; - } if ((err = snd_mts64_create(card, pardev, &mts)) < 0) { snd_printd("Cannot create main component\n"); @@ -976,6 +971,12 @@ static int snd_mts64_probe(struct platform_device *pdev) } card->private_data = mts; card->private_free = snd_mts64_card_private_free; + + err = mts64_probe(p); + if (err) { + err = -EIO; + goto __err; + } if ((err = snd_mts64_rawmidi_create(card)) < 0) { snd_printd("Creating Rawmidi component failed\n"); -- 1.9.1

2 2

[alsa-devel] [PATCH] ALSA: hdsp: Fix wrong boolean ctl value accesses
by Takashi Iwai 29 Feb '16

29 Feb '16

snd-hdsp driver accesses enum item values (int) instead of boolean values (long) wrongly for some ctl elements. This patch fixes them. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/rme9652/hdsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 2875b4f6d8c9..7c8941b8b2de 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -2879,7 +2879,7 @@ static int snd_hdsp_get_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ctl { struct hdsp *hdsp = snd_kcontrol_chip(kcontrol); - ucontrol->value.enumerated.item[0] = hdsp_dds_offset(hdsp); + ucontrol->value.integer.value[0] = hdsp_dds_offset(hdsp); return 0; } @@ -2891,7 +2891,7 @@ static int snd_hdsp_put_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ctl if (!snd_hdsp_use_is_exclusive(hdsp)) return -EBUSY; - val = ucontrol->value.enumerated.item[0]; + val = ucontrol->value.integer.value[0]; spin_lock_irq(&hdsp->lock); if (val != hdsp_dds_offset(hdsp)) change = (hdsp_set_dds_offset(hdsp, val) == 0) ? 1 : 0; -- 2.7.2

1 0

[alsa-devel] [PATCH 1/2] ALSA: hdspm: Fix wrong boolean ctl value accesses
by Takashi Iwai 29 Feb '16

29 Feb '16

snd-hdspm driver accesses enum item values (int) instead of boolean values (long) wrongly for some ctl elements. This patch fixes them. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/rme9652/hdspm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 8bc8016c173d..b047b1ba48fd 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -2261,7 +2261,7 @@ static int snd_hdspm_put_system_sample_rate(struct snd_kcontrol *kcontrol, { struct hdspm *hdspm = snd_kcontrol_chip(kcontrol); - hdspm_set_dds_value(hdspm, ucontrol->value.enumerated.item[0]); + hdspm_set_dds_value(hdspm, ucontrol->value.integer.value[0]); return 0; } @@ -4449,7 +4449,7 @@ static int snd_hdspm_get_tco_word_term(struct snd_kcontrol *kcontrol, { struct hdspm *hdspm = snd_kcontrol_chip(kcontrol); - ucontrol->value.enumerated.item[0] = hdspm->tco->term; + ucontrol->value.integer.value[0] = hdspm->tco->term; return 0; } @@ -4460,8 +4460,8 @@ static int snd_hdspm_put_tco_word_term(struct snd_kcontrol *kcontrol, { struct hdspm *hdspm = snd_kcontrol_chip(kcontrol); - if (hdspm->tco->term != ucontrol->value.enumerated.item[0]) { - hdspm->tco->term = ucontrol->value.enumerated.item[0]; + if (hdspm->tco->term != ucontrol->value.integer.value[0]) { + hdspm->tco->term = ucontrol->value.integer.value[0]; hdspm_tco_write(hdspm); -- 2.7.2

1 1

[alsa-devel] [PATCH] ALSA: ctl: Fix incompatible ioctls for X32 ABI
by Takashi Iwai 29 Feb '16

29 Feb '16

The X32 ABI takes the same alignment like x86-64, and this may result in the incompatible struct size from ia32. Unfortunately, we hit this in some control ABI: struct snd_ctl_elem_value differs between them due to the position of 64bit variable array. This ends up with the unknown ioctl (ENOTTY) error. The fix is to add the compat entries for the new aligned struct. Reported-and-tested-by: Steven Newbury <steve(a)snewbury.org.uk> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/control_compat.c | 90 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index b9c0910fb8c4..dff3671217c8 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -170,6 +170,19 @@ struct snd_ctl_elem_value32 { unsigned char reserved[128]; }; +#ifdef CONFIG_X86_X32 +/* x32 has a different alignment for 64bit values from ia32 */ +struct snd_ctl_elem_value_x32 { + struct snd_ctl_elem_id id; + unsigned int indirect; /* bit-field causes misalignment */ + union { + s32 integer[128]; + unsigned char data[512]; + s64 integer64[64]; + } value; + unsigned char reserved[128]; +}; +#endif /* CONFIG_X86_X32 */ /* get the value type and count of the control */ static int get_ctl_type(struct snd_card *card, struct snd_ctl_elem_id *id, @@ -219,9 +232,11 @@ static int get_elem_size(int type, int count) static int copy_ctl_value_from_user(struct snd_card *card, struct snd_ctl_elem_value *data, - struct snd_ctl_elem_value32 __user *data32, + void __user *userdata, + void __user *valuep, int *typep, int *countp) { + struct snd_ctl_elem_value32 __user *data32 = userdata; int i, type, size; int uninitialized_var(count); unsigned int indirect; @@ -239,8 +254,9 @@ static int copy_ctl_value_from_user(struct snd_card *card, if (type == SNDRV_CTL_ELEM_TYPE_BOOLEAN || type == SNDRV_CTL_ELEM_TYPE_INTEGER) { for (i = 0; i < count; i++) { + s32 __user *intp = valuep; int val; - if (get_user(val, &data32->value.integer[i])) + if (get_user(val, &intp[i])) return -EFAULT; data->value.integer.value[i] = val; } @@ -250,8 +266,7 @@ static int copy_ctl_value_from_user(struct snd_card *card, dev_err(card->dev, "snd_ioctl32_ctl_elem_value: unknown type %d\n", type); return -EINVAL; } - if (copy_from_user(data->value.bytes.data, - data32->value.data, size)) + if (copy_from_user(data->value.bytes.data, valuep, size)) return -EFAULT; } @@ -261,7 +276,8 @@ static int copy_ctl_value_from_user(struct snd_card *card, } /* restore the value to 32bit */ -static int copy_ctl_value_to_user(struct snd_ctl_elem_value32 __user *data32, +static int copy_ctl_value_to_user(void __user *userdata, + void __user *valuep, struct snd_ctl_elem_value *data, int type, int count) { @@ -270,22 +286,22 @@ static int copy_ctl_value_to_user(struct snd_ctl_elem_value32 __user *data32, if (type == SNDRV_CTL_ELEM_TYPE_BOOLEAN || type == SNDRV_CTL_ELEM_TYPE_INTEGER) { for (i = 0; i < count; i++) { + s32 __user *intp = valuep; int val; val = data->value.integer.value[i]; - if (put_user(val, &data32->value.integer[i])) + if (put_user(val, &intp[i])) return -EFAULT; } } else { size = get_elem_size(type, count); - if (copy_to_user(data32->value.data, - data->value.bytes.data, size)) + if (copy_to_user(valuep, data->value.bytes.data, size)) return -EFAULT; } return 0; } -static int snd_ctl_elem_read_user_compat(struct snd_card *card, - struct snd_ctl_elem_value32 __user *data32) +static int ctl_elem_read_user(struct snd_card *card, + void __user *userdata, void __user *valuep) { struct snd_ctl_elem_value *data; int err, type, count; @@ -294,7 +310,9 @@ static int snd_ctl_elem_read_user_compat(struct snd_card *card, if (data == NULL) return -ENOMEM; - if ((err = copy_ctl_value_from_user(card, data, data32, &type, &count)) < 0) + err = copy_ctl_value_from_user(card, data, userdata, valuep, + &type, &count); + if (err < 0) goto error; snd_power_lock(card); @@ -303,14 +321,15 @@ static int snd_ctl_elem_read_user_compat(struct snd_card *card, err = snd_ctl_elem_read(card, data); snd_power_unlock(card); if (err >= 0) - err = copy_ctl_value_to_user(data32, data, type, count); + err = copy_ctl_value_to_user(userdata, valuep, data, + type, count); error: kfree(data); return err; } -static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file, - struct snd_ctl_elem_value32 __user *data32) +static int ctl_elem_write_user(struct snd_ctl_file *file, + void __user *userdata, void __user *valuep) { struct snd_ctl_elem_value *data; struct snd_card *card = file->card; @@ -320,7 +339,9 @@ static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file, if (data == NULL) return -ENOMEM; - if ((err = copy_ctl_value_from_user(card, data, data32, &type, &count)) < 0) + err = copy_ctl_value_from_user(card, data, userdata, valuep, + &type, &count); + if (err < 0) goto error; snd_power_lock(card); @@ -329,12 +350,39 @@ static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file, err = snd_ctl_elem_write(card, file, data); snd_power_unlock(card); if (err >= 0) - err = copy_ctl_value_to_user(data32, data, type, count); + err = copy_ctl_value_to_user(userdata, valuep, data, + type, count); error: kfree(data); return err; } +static int snd_ctl_elem_read_user_compat(struct snd_card *card, + struct snd_ctl_elem_value32 __user *data32) +{ + return ctl_elem_read_user(card, data32, &data32->value); +} + +static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file, + struct snd_ctl_elem_value32 __user *data32) +{ + return ctl_elem_write_user(file, data32, &data32->value); +} + +#ifdef CONFIG_X86_X32 +static int snd_ctl_elem_read_user_x32_compat(struct snd_card *card, + struct snd_ctl_elem_value_x32 __user *data32) +{ + return ctl_elem_read_user(card, data32, &data32->value); +} + +static int snd_ctl_elem_write_user_x32_compat(struct snd_ctl_file *file, + struct snd_ctl_elem_value_x32 __user *data32) +{ + return ctl_elem_write_user(file, data32, &data32->value); +} +#endif /* CONFIG_X86_X32 */ + /* add or replace a user control */ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file, struct snd_ctl_elem_info32 __user *data32, @@ -391,6 +439,10 @@ enum { SNDRV_CTL_IOCTL_ELEM_INFO32 = _IOWR('U', 0x11, struct snd_ctl_elem_info32), SNDRV_CTL_IOCTL_ELEM_READ32 = _IOWR('U', 0x12, struct snd_ctl_elem_value32), SNDRV_CTL_IOCTL_ELEM_WRITE32 = _IOWR('U', 0x13, struct snd_ctl_elem_value32), +#ifdef CONFIG_X86_X32 + SNDRV_CTL_IOCTL_ELEM_READ_X32 = _IOWR('U', 0x12, struct snd_ctl_elem_value_x32), + SNDRV_CTL_IOCTL_ELEM_WRITE_X32 = _IOWR('U', 0x13, struct snd_ctl_elem_value_x32), +#endif SNDRV_CTL_IOCTL_ELEM_ADD32 = _IOWR('U', 0x17, struct snd_ctl_elem_info32), SNDRV_CTL_IOCTL_ELEM_REPLACE32 = _IOWR('U', 0x18, struct snd_ctl_elem_info32), }; @@ -427,6 +479,12 @@ static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, uns return snd_ctl_elem_read_user_compat(ctl->card, argp); case SNDRV_CTL_IOCTL_ELEM_WRITE32: return snd_ctl_elem_write_user_compat(ctl, argp); +#ifdef CONFIG_X86_X32 + case SNDRV_CTL_IOCTL_ELEM_READ_X32: + return snd_ctl_elem_read_user_x32_compat(ctl->card, argp); + case SNDRV_CTL_IOCTL_ELEM_WRITE_X32: + return snd_ctl_elem_write_user_x32_compat(ctl, argp); +#endif case SNDRV_CTL_IOCTL_ELEM_ADD32: return snd_ctl_elem_add_compat(ctl, argp, 0); case SNDRV_CTL_IOCTL_ELEM_REPLACE32: -- 2.7.2

1 1

[alsa-devel] ERROR: USB Sound card with unsafe characters
by Brian Jones 29 Feb '16

29 Feb '16

Newby alert - but I don't know how to get this bug to the developers I have been trying to work on a fix for Bug 1498129 - https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1498129 on Ubuntu My USB soundcard is an Asus Xonar U7 Echelon Edition <https://www.asus.com/Sound-Cards/Xonar_U7_Echelon_Edition/> which identifies itself to alsa as "Xonar U7 Echelon Ed." The card is supported by alsa and works well in analog mode but I cannot get digital output via alsa. It has iec958 as device 1 rather than device 0 and I can access digital output by referring to directly to hw:x,1 but cannot access digital output via alsa. Attempts to change the iec958 device in USB-Audio.conf fail because of the period char and apparently my level of OS (Mint 17.3 based on Ubuntu 14.04, kernel 3.19.0-32) does not have alsa supporting USB vendorid:productid naming so I don't have a workaround. If a patch exists, advice on applying/rebuilding alsa would be gratefully appreciated.

2 2

[alsa-devel] [PATCH] ASoC: nau8825: reduce stanby power consumption
by John Hsu 29 Feb '16

29 Feb '16

Fix unnecessary widget power up when standby; And decrease internal clock frequency to save power. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 49 +++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 52882e4..f9752cc 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -262,6 +262,29 @@ static int nau8825_playback_event(struct snd_soc_dapm_widget *w, return 0; } +static int nau8825_dacr_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + regmap_update_bits(nau8825->regmap, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_DACR, NAU8825_ENABLE_DACR); + break; + case SND_SOC_DAPM_POST_PMD: + if (!nau8825->irq) + regmap_update_bits(nau8825->regmap, + NAU8825_REG_ENA_CTRL, NAU8825_ENABLE_DACR, 0); + break; + default: + return -EINVAL; + } + + return 0; +} + static const char * const nau8825_adc_decimation[] = { "32", "64", "128", "256" @@ -337,16 +360,17 @@ static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = { 0), /* ADC for button press detection */ - SND_SOC_DAPM_ADC("SAR", NULL, NAU8825_REG_SAR_CTRL, - NAU8825_SAR_ADC_EN_SFT, 0), + SND_SOC_DAPM_SUPPLY("SAR", NAU8825_REG_SAR_CTRL, + NAU8825_SAR_ADC_EN_SFT, 0, NULL, 0), SND_SOC_DAPM_DAC("ADACL", NULL, NAU8825_REG_RDAC, 12, 0), SND_SOC_DAPM_DAC("ADACR", NULL, NAU8825_REG_RDAC, 13, 0), SND_SOC_DAPM_SUPPLY("ADACL Clock", NAU8825_REG_RDAC, 8, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("ADACR Clock", NAU8825_REG_RDAC, 9, 0, NULL, 0), - SND_SOC_DAPM_DAC("DDACR", NULL, NAU8825_REG_ENA_CTRL, - NAU8825_ENABLE_DACR_SFT, 0), + SND_SOC_DAPM_DAC_E("DDACR", NULL, SND_SOC_NOPM, 0, 0, + nau8825_dacr_event, SND_SOC_DAPM_POST_PMU | + SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_DAC("DDACL", NULL, NAU8825_REG_ENA_CTRL, NAU8825_ENABLE_DACL_SFT, 0), SND_SOC_DAPM_SUPPLY("DDAC Clock", NAU8825_REG_ENA_CTRL, 6, 0, NULL, 0), @@ -878,13 +902,6 @@ static int nau8825_codec_probe(struct snd_soc_codec *codec) nau8825->dapm = dapm; - /* The interrupt clock is gated by x1[10:8], - * one of them needs to be enabled all the time for - * interrupts to happen. - */ - snd_soc_dapm_force_enable_pin(dapm, "DDACR"); - snd_soc_dapm_sync(dapm); - /* Unmask interruptions. Handler uses dapm object so we can enable * interruptions only after dapm is fully initialized. */ @@ -1075,6 +1092,12 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, NAU8825_DCO_EN); regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO); + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0xf); + regmap_update_bits(regmap, NAU8825_REG_FLL1, + NAU8825_FLL_RATIO_MASK, 0x10); + regmap_update_bits(regmap, NAU8825_REG_FLL6, + NAU8825_SDM_EN, NAU8825_SDM_EN); if (nau8825->mclk_freq) { clk_disable_unprepare(nau8825->mclk); nau8825->mclk_freq = 0; @@ -1309,9 +1332,7 @@ static int nau8825_setup_irq(struct nau8825 *nau8825) /* Enable internal VCO needed for interruptions */ nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); - /* Enable DDACR needed for interrupts - * It is the same as force_enable_pin("DDACR") we do later - */ + /* Enable DDACR needed for interrupts */ regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, NAU8825_ENABLE_DACR, NAU8825_ENABLE_DACR); -- 2.6.4

2 5

[alsa-devel] [PATCH] ALSA: dice: drop duplex streams synchronization to transfer own time stamps
by Takashi Sakamoto 28 Feb '16

28 Feb '16

This commit drops implementation of duplex streams synchronization from ALSA dice driver, due to a reason of hardware design. This patch allows dice-based units to generate sounds correctly when isochronous packet streaming starts at first time. In IEC 61883-6:2005, CIP packetization layer for AM824 data format utilizes the value of SYT field in CIP header of received packet for a reference to phase lock loop. Figure 3 in clause 4.3 describes it. The value is an offset from cycle_time field of every cycle start packet from cycle master on IEEE 1394 bus. The time calculated with these two fields is called as 'presentation timestamp' which represents the time to play data included in the packet. Although, this idea includes some problems due to accuracy of timekeep in cycle master, accuracy of transmission of cycle start packet on the bus with the other units, accuracy of sampling clock in data transmitter side and accuracy of replay in data receiver side. In most case, these accuracies somewhat worse because there's no such ideal hardwares in this world. For the issues, ASICs for Dice include Jitter Elimination Technologies (JET) PLL. The PLL can handle several sources of clock and compensate it with high-precision internal clock source. The sequence of value in syt field of received AMDTP packets is one of the sources, therefore transmitters on IEEE 1394 bus should transfer it. On the other hand, current ALSA dice driver is programmed with a mode of duplex streams with synchronization. In this mode, the driver outputs packets after some incoming packets are handled, to re-use the value of SYT field in incoming packets to the value for outgoing packets. This mode is enabled when source signal of sampling clock is set to internal, and this is a major use case. Thus, in most cases, the unit receives no packets during a short time after packet streaming starts. As long as I experienced, this causes the units to generate no sounds at first time to receive packets. This issue occurs only with Dice II. I guess this is due to a quirk of the PLL. In short, the PLL cannot generate firm signals to ADCs/DACs or the other ICs when no packets are received in the beginning of packet streaming. While, on second time or later, the unit generates sound correctly. I guess that starting packet streaming at first time sets the PLL correctly. Well, still based on my hypothesis and no way to prove it, this commit drops duplex streams synchronization from this driver. At least, the PLL requires the sequence of value in SYT field of received AMDTP packets as one of source of clock signals with internal clock source. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/dice/dice-stream.c | 42 ++------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c index a64b3cc..df035b1 100644 --- a/sound/firewire/dice/dice-stream.c +++ b/sound/firewire/dice/dice-stream.c @@ -191,53 +191,17 @@ end: return err; } -static int get_sync_mode(struct snd_dice *dice, enum cip_flags *sync_mode) -{ - u32 source; - int err; - - err = snd_dice_transaction_get_clock_source(dice, &source); - if (err < 0) - goto end; - - switch (source) { - /* So-called 'SYT Match' modes, sync_to_syt value of packets received */ - case CLOCK_SOURCE_ARX4: /* in 4th stream */ - case CLOCK_SOURCE_ARX3: /* in 3rd stream */ - case CLOCK_SOURCE_ARX2: /* in 2nd stream */ - err = -ENOSYS; - break; - case CLOCK_SOURCE_ARX1: /* in 1st stream, which this driver uses */ - *sync_mode = 0; - break; - default: - *sync_mode = CIP_SYNC_TO_DEVICE; - break; - } -end: - return err; -} - int snd_dice_stream_start_duplex(struct snd_dice *dice, unsigned int rate) { struct amdtp_stream *master, *slave; unsigned int curr_rate; - enum cip_flags sync_mode; int err = 0; if (dice->substreams_counter == 0) goto end; - err = get_sync_mode(dice, &sync_mode); - if (err < 0) - goto end; - if (sync_mode == CIP_SYNC_TO_DEVICE) { - master = &dice->tx_stream; - slave = &dice->rx_stream; - } else { - master = &dice->rx_stream; - slave = &dice->tx_stream; - } + master = &dice->rx_stream; + slave = &dice->tx_stream; /* Some packet queueing errors. */ if (amdtp_streaming_error(master) || amdtp_streaming_error(slave)) @@ -261,8 +225,6 @@ int snd_dice_stream_start_duplex(struct snd_dice *dice, unsigned int rate) stop_stream(dice, slave); snd_dice_transaction_clear_enable(dice); - amdtp_stream_set_sync(sync_mode, master, slave); - err = ensure_phase_lock(dice); if (err < 0) { dev_err(&dice->unit->device, -- 2.5.0

2 1

[alsa-devel] [PATCH 0/2] clk: imx6: add kpp clock for i.MX6UL
by Lothar Waßmann 28 Feb '16

28 Feb '16

This patchset adds the clock which is necessary to operate the KPP unit on i.MX6UL. The first patch removes bogus whitespace before TABs in indentation. The second patch adds the clock definition.

3 4

[alsa-devel] [PATCH 1/4] ASoC: wm9713: add binding for WM9713 codec
by Robert Jarzmik 27 Feb '16

27 Feb '16

This adds a binding for the Wolfson WM9713 audio codec. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- Documentation/devicetree/bindings/sound/wm9713.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/wm9713.txt diff --git a/Documentation/devicetree/bindings/sound/wm9713.txt b/Documentation/devicetree/bindings/sound/wm9713.txt new file mode 100644 index 000000000000..761001bc3201 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/wm9713.txt @@ -0,0 +1,14 @@ +WM9713 audio CODEC + +This devices supports I2C. + +Required properties: + - compatible : + "wlf,wm9713" + +Example: + wm9713: wm9713@0 { + compatible = "wlf,wm9713"; + #sound-dai-cells = <1>; + status = "okay"; + }; -- 2.1.4

3 16

[alsa-devel] [PATCH] ASoC: rt5640: add master clock handling for rt5640
by Sugar Zhang 27 Feb '16

27 Feb '16

enable/disable master clock when codec is active or not. Signed-off-by: Sugar Zhang <sugar.zhang(a)rock-chips.com> --- Documentation/devicetree/bindings/sound/rt5640.txt | 3 +++ sound/soc/codecs/rt5640.c | 31 ++++++++++++++++++++++ sound/soc/codecs/rt5640.h | 2 ++ 3 files changed, 36 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rt5640.txt b/Documentation/devicetree/bindings/sound/rt5640.txt index 9e62f6e..57fe646 100644 --- a/Documentation/devicetree/bindings/sound/rt5640.txt +++ b/Documentation/devicetree/bindings/sound/rt5640.txt @@ -12,6 +12,9 @@ Required properties: Optional properties: +- clocks: The phandle of the master clock to the CODEC +- clock-names: Should be "mclk" + - realtek,in1-differential - realtek,in2-differential - realtek,in3-differential diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 11d032c..6cd84fb 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1949,7 +1949,33 @@ static int rt5640_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, static int rt5640_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + int ret; + switch (level) { + case SND_SOC_BIAS_ON: + break; + + case SND_SOC_BIAS_PREPARE: + /* + * SND_SOC_BIAS_PREPARE is called while preparing for a + * transition to ON or away from ON. If current bias_level + * is SND_SOC_BIAS_ON, then it is preparing for a transition + * away from ON. Disable the clock in that case, otherwise + * enable it. + */ + if (IS_ERR(rt5640->mclk)) + break; + + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) { + clk_disable_unprepare(rt5640->mclk); + } else { + ret = clk_prepare_enable(rt5640->mclk); + if (ret) + return ret; + } + break; + case SND_SOC_BIAS_STANDBY: if (SND_SOC_BIAS_OFF == snd_soc_codec_get_bias_level(codec)) { snd_soc_update_bits(codec, RT5640_PWR_ANLG1, @@ -2088,6 +2114,11 @@ static int rt5640_probe(struct snd_soc_codec *codec) struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + /* Check if MCLK provided */ + rt5640->mclk = devm_clk_get(codec->dev, "mclk"); + if (PTR_ERR(rt5640->mclk) == -EPROBE_DEFER) + return -EPROBE_DEFER; + rt5640->codec = codec; snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h index 83a7150..1761c3a9 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -12,6 +12,7 @@ #ifndef _RT5640_H #define _RT5640_H +#include <linux/clk.h> #include <sound/rt5640.h> /* Info */ @@ -2097,6 +2098,7 @@ struct rt5640_priv { struct snd_soc_codec *codec; struct rt5640_platform_data pdata; struct regmap *regmap; + struct clk *mclk; int sysclk; int sysclk_src; -- 1.9.1

5 9

[alsa-devel] [PATCH] ALSA: hda - Autosuspend controller after probe even if codecs are already suspended
by ville.syrjala＠linux.intel.com 26 Feb '16

26 Feb '16

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> azx_probe_continue() uses pm_runtime_put_noidle() to drop the rpm usage_count, which means that if it's the last reference the autosuspend of the controller won't actually happen. So if the codecs autosuspend before the azx_probe_continue() drops the last reference we'll fail to autosuspend the controller. This does happen in practice, but not every time. As can be seen in [1] the controller autosuspend attempt fails due to the usage_count when suspending the codecs. A bit later we see the the contoller usage_count dropping to zero without further attempts at autosuspend. Fix the problem by using pm_runtime_put_autosuspend() instead, which will kick off the autosuspend of the controller even if the codecs are already asleep. As can be seen in [2] the controller autosuspend still fails while suspending the codecs, but later on we see another autosuspend attempt after dropping the usage_count to 0. I was also a bit worried that there might still be a race between the controller autosuspend and the rest of the code in azx_probe_continue(). So I also tried replacing the the put_noidle() with put_sync_suspend(). No explosions occurred, so I'm somewhat satisfied that there are no serious problems in this area. [1] kworker/1:2-122 [001] .... 63.661310: __pm_runtime_suspend: hdaudioC0D0 usage_count 0 kworker/1:2-122 [001] d..2 63.661316: rpm_suspend: hdaudioC0D0 flags-d cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/1:2-122 [001] d..1 63.661317: rpm_check_suspend_allowed: hdaudioC0D0 retval 0 kworker/1:2-122 [001] d..2 63.661332: rpm_return_int: rpm_suspend+0x406/0x5e8:hdaudioC0D0 ret=0 kworker/1:1-72 [001] d..2 63.661543: rpm_suspend: hdaudioC0D0 flags-a cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/1:1-72 [001] d..1 63.661544: rpm_check_suspend_allowed: hdaudioC0D0 retval 0 kworker/1:1-72 [001] .... 63.661545: hda_codec_runtime_suspend: hdaudioC0D0 suspend kworker/1:1-72 [001] d..2 63.661614: rpm_idle: 0000:00:03.0 flags-1 cnt-1 dep-0 auto-1 p-0 irq-0 child-0 kworker/1:1-72 [001] d..1 63.661615: rpm_check_suspend_allowed: 0000:00:03.0 usage_count 1 kworker/1:1-72 [001] d..1 63.661615: rpm_check_suspend_allowed: 0000:00:03.0 retval -11 kworker/1:1-72 [001] d..2 63.661616: rpm_return_int: rpm_idle+0x249/0x487:0000:00:03.0 ret=-11 kworker/1:1-72 [001] d..2 63.661616: rpm_return_int: rpm_suspend+0x406/0x5e8:hdaudioC0D0 ret=0 kworker/1:2-122 [001] d..2 63.664834: rpm_idle: hdaudioC0D0 flags-8 cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/1:2-122 [001] d..1 63.664835: rpm_check_suspend_allowed: hdaudioC0D0 retval 1 kworker/1:2-122 [001] d..2 63.664836: rpm_return_int: rpm_idle+0x249/0x487:hdaudioC0D0 ret=-11 kworker/1:2-122 [001] d..2 63.664841: rpm_idle: hdaudioC0D0 flags-8 cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/1:2-122 [001] d..1 63.664841: rpm_check_suspend_allowed: hdaudioC0D0 retval 1 kworker/1:2-122 [001] d..2 63.664841: rpm_return_int: rpm_idle+0x249/0x487:hdaudioC0D0 ret=-11 kworker/1:2-122 [001] .... 63.664842: azx_probe_continue: 0000:00:03.0 usage_count=0 [2] kworker/0:0-4 [000] .... 50.354567: __pm_runtime_suspend: hdaudioC0D0 usage_count 0 kworker/0:0-4 [000] d..2 50.354574: rpm_suspend: hdaudioC0D0 flags-d cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:0-4 [000] d..1 50.354575: rpm_check_suspend_allowed: hdaudioC0D0 retval 0 kworker/0:0-4 [000] d..2 50.354589: rpm_return_int: rpm_suspend+0x406/0x5e8:hdaudioC0D0 ret=0 kworker/0:2-135 [000] d..2 50.354809: rpm_suspend: hdaudioC0D0 flags-a cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:2-135 [000] d..1 50.354810: rpm_check_suspend_allowed: hdaudioC0D0 retval 0 kworker/0:2-135 [000] .... 50.354816: hda_codec_runtime_suspend: hdaudioC0D0 suspend kworker/0:2-135 [000] d..2 50.354908: rpm_idle: 0000:00:03.0 flags-1 cnt-1 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:2-135 [000] d..1 50.354909: rpm_check_suspend_allowed: 0000:00:03.0 usage_count 1 kworker/0:2-135 [000] d..1 50.354909: rpm_check_suspend_allowed: 0000:00:03.0 retval -11 kworker/0:2-135 [000] d..2 50.354909: rpm_return_int: rpm_idle+0x249/0x487:0000:00:03.0 ret=-11 kworker/0:2-135 [000] d..2 50.354910: rpm_return_int: rpm_suspend+0x406/0x5e8:hdaudioC0D0 ret=0 kworker/0:0-4 [000] d..2 50.373791: rpm_idle: hdaudioC0D0 flags-8 cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:0-4 [000] d..1 50.373792: rpm_check_suspend_allowed: hdaudioC0D0 retval 1 kworker/0:0-4 [000] d..2 50.373793: rpm_return_int: rpm_idle+0x249/0x487:hdaudioC0D0 ret=-11 kworker/0:0-4 [000] d..2 50.373797: rpm_idle: hdaudioC0D0 flags-8 cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:0-4 [000] d..1 50.373798: rpm_check_suspend_allowed: hdaudioC0D0 retval 1 kworker/0:0-4 [000] d..2 50.373798: rpm_return_int: rpm_idle+0x249/0x487:hdaudioC0D0 ret=-11 kworker/0:0-4 [000] .... 50.373799: __pm_runtime_suspend: 0000:00:03.0 usage_count 0 kworker/0:0-4 [000] d..2 50.373800: rpm_suspend: 0000:00:03.0 flags-d cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:0-4 [000] d..1 50.373800: rpm_check_suspend_allowed: 0000:00:03.0 retval 0 kworker/0:0-4 [000] d..2 50.373803: rpm_return_int: rpm_suspend+0x406/0x5e8:0000:00:03.0 ret=0 kworker/0:0-4 [000] d..2 50.385164: rpm_suspend: 0000:00:03.0 flags-a cnt-0 dep-0 auto-1 p-0 irq-0 child-0 kworker/0:0-4 [000] d..1 50.385165: rpm_check_suspend_allowed: 0000:00:03.0 retval 0 kworker/0:0-4 [000] .... 50.385174: azx_runtime_suspend: 0000:00:03.0 azx suspend releaseing power well kworker/0:0-4 [000] .... 50.385179: azx_runtime_suspend: 0000:00:03.0 azx suspend kworker/0:0-4 [000] d..2 50.386872: rpm_return_int: rpm_suspend+0x406/0x5e8:0000:00:03.0 ret=0 Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- sound/pci/hda/hda_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e5240cb3749f..2624cfe98884 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2145,7 +2145,7 @@ static int azx_probe_continue(struct azx *chip) azx_add_card_list(chip); snd_hda_set_power_save(&chip->bus, power_save * 1000); if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo) - pm_runtime_put_noidle(&pci->dev); + pm_runtime_put_autosuspend(&pci->dev); out_free: if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL -- 2.4.10

2 1

[alsa-devel] [PATCH] ASoC: Extend FLL function
by John Hsu 26 Feb '16

26 Feb '16

Extend FFL clock source from MCLK/BCLK/FS; And modify some FLL parameter setting. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 100 +++++++++++++++++++++++++++++++++------------ sound/soc/codecs/nau8825.h | 14 ++++++- 2 files changed, 86 insertions(+), 28 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 7fc7b4e..16da8ef 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -926,7 +926,8 @@ static void nau8825_fll_apply(struct nau8825 *nau8825, struct nau8825_fll *fll_param) { regmap_update_bits(nau8825->regmap, NAU8825_REG_CLK_DIVIDER, - NAU8825_CLK_MCLK_SRC_MASK, fll_param->mclk_src); + NAU8825_CLK_SRC_MASK | NAU8825_CLK_MCLK_SRC_MASK, + NAU8825_CLK_SRC_MCLK | fll_param->mclk_src); regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL1, NAU8825_FLL_RATIO_MASK, fll_param->ratio); /* FLL 16-bit fractional input */ @@ -939,10 +940,20 @@ static void nau8825_fll_apply(struct nau8825 *nau8825, NAU8825_FLL_REF_DIV_MASK, fll_param->clk_ref_div); /* select divided VCO input */ regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5, - NAU8825_FLL_FILTER_SW_MASK, 0x0000); - /* FLL sigma delta modulator enable */ + NAU8825_FLL_PDB_DAC_EN | NAU8825_FLL_LOOP_FTR_EN | + NAU8825_FLL_FILTER_SW_MASK, + NAU8825_FLL_PDB_DAC_EN | NAU8825_FLL_LOOP_FTR_EN | + NAU8825_FLL_FILTER_SW_REF); + /* Disable free-running mode */ regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL6, - NAU8825_SDM_EN_MASK, NAU8825_SDM_EN); + NAU8825_DCO_EN, 0); + /* FLL sigma delta modulator enable */ + if (fll_param->fll_frac) + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL6, + NAU8825_SDM_EN_MASK, NAU8825_SDM_EN); + else + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL6, + NAU8825_SDM_EN_MASK, 0); } /* freq_out must be 256*Fs in order to achieve the best performance */ @@ -970,6 +981,37 @@ static int nau8825_set_pll(struct snd_soc_codec *codec, int pll_id, int source, return 0; } +static int nau8825_mclk_prepare(struct nau8825 *nau8825, unsigned int freq) +{ + int ret = 0; + + /* We selected MCLK source but the clock itself managed externally */ + if (!nau8825->mclk) + goto done; + + if (!nau8825->mclk_freq) { + ret = clk_prepare_enable(nau8825->mclk); + if (ret) { + dev_err(nau8825->dev, "Unable to prepare codec mclk\n"); + goto done; + } + } + + if (nau8825->mclk_freq != freq) { + nau8825->mclk_freq = freq; + + freq = clk_round_rate(nau8825->mclk, freq); + ret = clk_set_rate(nau8825->mclk, freq); + if (ret) { + dev_err(nau8825->dev, "Unable to set mclk rate\n"); + goto done; + } + } + +done: + return ret; +} + static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, unsigned int freq) { @@ -981,29 +1023,9 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_MCLK); regmap_update_bits(regmap, NAU8825_REG_FLL6, NAU8825_DCO_EN, 0); - - /* We selected MCLK source but the clock itself managed externally */ - if (!nau8825->mclk) - break; - - if (!nau8825->mclk_freq) { - ret = clk_prepare_enable(nau8825->mclk); - if (ret) { - dev_err(nau8825->dev, "Unable to prepare codec mclk\n"); - return ret; - } - } - - if (nau8825->mclk_freq != freq) { - nau8825->mclk_freq = freq; - - freq = clk_round_rate(nau8825->mclk, freq); - ret = clk_set_rate(nau8825->mclk, freq); - if (ret) { - dev_err(nau8825->dev, "Unable to set mclk rate\n"); - return ret; - } - } + ret = nau8825_mclk_prepare(nau8825, freq); + if (ret) + return ret; break; case NAU8825_CLK_INTERNAL: @@ -1018,6 +1040,30 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, } break; + case NAU8825_CLK_FLL_MCLK: + regmap_update_bits(regmap, NAU8825_REG_FLL3, + NAU8825_FLL_CLK_SRC_MASK, NAU8825_FLL_CLK_SRC_MCLK); + ret = nau8825_mclk_prepare(nau8825, freq); + if (ret) + return ret; + + break; + case NAU8825_CLK_FLL_BLK: + regmap_update_bits(regmap, NAU8825_REG_FLL3, + NAU8825_FLL_CLK_SRC_MASK, NAU8825_FLL_CLK_SRC_BLK); + ret = nau8825_mclk_prepare(nau8825, freq); + if (ret) + return ret; + + break; + case NAU8825_CLK_FLL_FS: + regmap_update_bits(regmap, NAU8825_REG_FLL3, + NAU8825_FLL_CLK_SRC_MASK, NAU8825_FLL_CLK_SRC_FS); + ret = nau8825_mclk_prepare(nau8825, freq); + if (ret) + return ret; + + break; default: dev_err(nau8825->dev, "Invalid clock id (%d)\n", clk_id); return -EINVAL; diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index dff8edb..e8f7ca5 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -112,12 +112,21 @@ /* FLL3 (0x06) */ #define NAU8825_FLL_INTEGER_MASK (0x3ff << 0) +#define NAU8825_FLL_CLK_SRC_SFT 10 +#define NAU8825_FLL_CLK_SRC_MASK (0x3 << NAU8825_FLL_CLK_SRC_SFT) +#define NAU8825_FLL_CLK_SRC_MCLK (0 << NAU8825_FLL_CLK_SRC_SFT) +#define NAU8825_FLL_CLK_SRC_BLK (0x2 << NAU8825_FLL_CLK_SRC_SFT) +#define NAU8825_FLL_CLK_SRC_FS (0x3 << NAU8825_FLL_CLK_SRC_SFT) /* FLL4 (0x07) */ #define NAU8825_FLL_REF_DIV_MASK (0x3 << 10) /* FLL5 (0x08) */ -#define NAU8825_FLL_FILTER_SW_MASK (0x1 << 14) +#define NAU8825_FLL_PDB_DAC_EN (0x1 << 15) +#define NAU8825_FLL_LOOP_FTR_EN (0x1 << 14) +#define NAU8825_FLL_FILTER_SW_MASK (0x1 << 13) +#define NAU8825_FLL_FILTER_SW_N2 (0x1 << 13) +#define NAU8825_FLL_FILTER_SW_REF (0x0 << 13) /* FLL6 (0x9) */ #define NAU8825_DCO_EN_MASK (0x1 << 15) @@ -306,6 +315,9 @@ enum { NAU8825_CLK_MCLK = 0, NAU8825_CLK_INTERNAL, + NAU8825_CLK_FLL_MCLK, + NAU8825_CLK_FLL_BLK, + NAU8825_CLK_FLL_FS, }; struct nau8825 { -- 1.9.1

3 7

[alsa-devel] [PATCH RESEND] ASoC: pxa: remove unused variable
by Arnd Bergmann 26 Feb '16

26 Feb '16

As pointed out by Zhangfei Gao, the sspa_div variable in brownstone_wm8994_hw_params() is completely unused, so as a cleanup following a prior patch, this removes both the variable and the division. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- Submitted originally on Nov 23 2015, this apparently got lost, resending it now. sound/soc/pxa/brownstone.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 416ea646c3b1..ec522e94b0e2 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -52,7 +52,6 @@ static int brownstone_wm8994_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; int freq_out, sspa_mclk, sysclk; - int sspa_div; if (params_rate(params) > 11025) { freq_out = params_rate(params) * 512; @@ -63,7 +62,6 @@ static int brownstone_wm8994_hw_params(struct snd_pcm_substream *substream, sysclk = params_rate(params) * 512; sspa_mclk = params_rate(params) * 64; } - sspa_div = freq_out / sspa_mclk; snd_soc_dai_set_sysclk(cpu_dai, MMP_SSPA_CLK_AUDIO, freq_out, 0); snd_soc_dai_set_pll(cpu_dai, MMP_SYSCLK, 0, freq_out, sysclk); -- 2.7.0

2 2

Re: [alsa-devel] Fwd: Lenovo Y700-17ISK notebook - multiple issues
by Takashi Iwai 26 Feb '16

26 Feb '16

On Wed, 24 Feb 2016 21:20:06 +0100, Aljosa wrote: > > OS: Ubuntu 16.04 > I tested first the original Ubuntu kernel and now I'm running > 4.5-rc5-wily. > I didn't test any model option because I don't know how to do it (I'm > not an expert). > > Please find attached the 'alsa-info.sh output' file. Please don't top-post. Also, again, don't drop Cc to ML. Judging from alsa-info.sh output, there is no pin declared for the bass output by BIOS. So you'd need to identify the pin by yourself, e.g. via hdajackretask, and set it up manually. Once when you figuring out which pin corresponds to the bass output, let us know. We can add it statically in the driver fixup. thanks, Takashi > > Thanks, ciao :) > Aljosa > > > > On 2016-02-24 20:29, Takashi Iwai wrote: > > On Wed, 24 Feb 2016 19:00:36 +0100, > > Aljosa wrote: > >> > >> Hi Takashi, > >> thank you very much for your reply. > >> Notebook subwoofer doesn't work at all (it does not produce any > >> sound). > > > > OK, could you give more details? Which kernel did you test? Did you > > test any model option? > > > > Also give alsa-info.sh output (run it with --no-upload option and > > attach the output). This contains the h/w details. > > > > Last but not least, don't drop Cc to ML. > > > > > > thanks, > > > > Takashi > > > >> Regards, Aljosa > >> > >> > >> > >> On 2016-02-24 16:35, Takashi Iwai wrote: > >> > On Tue, 23 Feb 2016 20:37:21 +0100, > >> > Aljosa wrote: > >> >> > >> >> Hello, > >> >> advised by one of the kernel developers - I'm reporting you the > >> >> problem > >> >> nr.2 from the below link. > >> > > >> > Could you describe what are the exact issues, instead of pointing some > >> > URL? > >> > > >> > > >> > thanks, > >> > > >> > Takashi > >> > upload=true&script=true&cardinfo= > !!################################ > !!ALSA Information Script v 0.4.64 > !!################################ > > !!Script ran on: Wed Feb 24 20:16:58 UTC 2016 > > > !!Linux Distribution > !!------------------ > > Ubuntu Xenial Xerus (development branch) \n \l DISTRIB_ID=Ubuntu DISTRIB_DESCRIPTION="Ubuntu Xenial Xerus (development branch)" NAME="Ubuntu" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 16.04" HOME_URL="http://www.ubuntu.com/" SUPPORT_URL="http://help.ubuntu.com/" BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/" UBUNTU_CODENAME=xenial > > > !!DMI Information > !!--------------- > > Manufacturer: LENOVO > Product Name: 80Q0 > Product Version: Lenovo ideapad Y700-17ISK > Firmware Version: CDCN26WW > > > !!Kernel Information > !!------------------ > > Kernel release: 4.5.0-040500rc5-generic > Operating System: GNU/Linux > Architecture: x86_64 > Processor: x86_64 > SMP Enabled: Yes > > > !!ALSA Version > !!------------ > > Driver version: k4.5.0-040500rc5-generic > Library version: 1.1.0 > Utilities version: 1.1.0 > > > !!Loaded ALSA modules > !!------------------- > > snd_hda_intel > > > !!Sound Servers on this system > !!---------------------------- > > Pulseaudio: > Installed - Yes (/usr/bin/pulseaudio) > Running - Yes > > > !!Soundcards recognised by ALSA > !!----------------------------- > > 0 [PCH ]: HDA-Intel - HDA Intel PCH > HDA Intel PCH at 0x94320000 irq 132 > > > !!PCI Soundcards installed in the system > !!-------------------------------------- > > 00:1f.3 Audio device: Intel Corporation Sunrise Point-H HD Audio (rev 31) > > > !!Advanced information - PCI Vendor/Device/Subsystem ID's > !!------------------------------------------------------- > > 00:1f.3 0403: 8086:a170 (rev 31) > Subsystem: 17aa:3802 > > > !!Modprobe options (Sound related) > !!-------------------------------- > > snd_pcsp: index=-2 > snd_usb_audio: index=-2 > snd_atiixp_modem: index=-2 > snd_intel8x0m: index=-2 > snd_via82xx_modem: index=-2 > snd_atiixp_modem: index=-2 > snd_intel8x0m: index=-2 > snd_via82xx_modem: index=-2 > snd_usb_audio: index=-2 > snd_usb_caiaq: index=-2 > snd_usb_ua101: index=-2 > snd_usb_us122l: index=-2 > snd_usb_usx2y: index=-2 > snd_cmipci: mpu_port=0x330 fm_port=0x388 > snd_pcsp: index=-2 > snd_usb_audio: index=-2 > > > !!Loaded sound module options > !!--------------------------- > > !!Module: snd_hda_intel > align_buffer_size : -1 > bdl_pos_adj : -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 > beep_mode : N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N > enable : Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y,Y > enable_msi : -1 > id : (null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null) > index : -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 > jackpoll_ms : 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 > model : (null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null) > patch : (null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null),(null) > position_fix : -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 > power_save : 0 > power_save_controller : Y > probe_mask : -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 > probe_only : 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 > single_cmd : N > snoop : -1 > > > !!HDA-Intel Codec information > !!--------------------------- > --startcollapse-- > > Codec: Realtek ALC233 > Address: 0 > AFG Function Id: 0x1 (unsol 1) > Vendor Id: 0x10ec0235 > Subsystem Id: 0x17aa3829 > Revision Id: 0x100002 > No Modem Function Group found > Default PCM: > rates [0x560]: 44100 48000 96000 192000 > bits [0xe]: 16 20 24 > formats [0x1]: PCM > Default Amp-In caps: N/A > Default Amp-Out caps: N/A > State of AFG node 0x01: > Power states: D0 D1 D2 D3 D3cold CLKSTOP EPSS > Power: setting=D0, actual=D0 > GPIO: io=3, o=0, i=0, unsolicited=1, wake=0 > IO[0]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 > IO[1]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 > IO[2]: enable=0, dir=0, wake=0, sticky=0, data=0, unsol=0 > Node 0x02 [Audio Output] wcaps 0x41d: Stereo Amp-Out > Control: name="Speaker Playback Volume", index=0, device=0 > ControlAmp: chs=3, dir=Out, idx=0, ofs=0 > Amp-Out caps: ofs=0x57, nsteps=0x57, stepsize=0x02, mute=0 > Amp-Out vals: [0x50 0x50] > Converter: stream=1, channel=0 > PCM: > rates [0x60]: 44100 48000 > bits [0xe]: 16 20 24 > formats [0x1]: PCM > Power states: D0 D1 D2 D3 EPSS > Power: setting=D0, actual=D0 > Node 0x03 [Audio Output] wcaps 0x41d: Stereo Amp-Out > Control: name="Headphone Playback Volume", index=0, device=0 > ControlAmp: chs=3, dir=Out, idx=0, ofs=0 > Device: name="ALC233 Analog", type="Audio", device=0 > Amp-Out caps: ofs=0x57, nsteps=0x57, stepsize=0x02, mute=0 > Amp-Out vals: [0x00 0x00] > Converter: stream=1, channel=0 > PCM: > rates [0x60]: 44100 48000 > bits [0xe]: 16 20 24 > formats [0x1]: PCM > Power states: D0 D1 D2 D3 EPSS > Power: setting=D0, actual=D0 > Node 0x04 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x05 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x06 [Audio Output] wcaps 0x611: Stereo Digital > Converter: stream=0, channel=0 > Digital: > Digital category: 0x0 > IEC Coding Type: 0x0 > PCM: > rates [0x5e0]: 44100 48000 88200 96000 192000 > bits [0xe]: 16 20 24 > formats [0x1]: PCM > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Node 0x07 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x08 [Audio Input] wcaps 0x10051b: Stereo Amp-In > Control: name="Capture Volume", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=0, ofs=0 > Control: name="Capture Switch", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=0, ofs=0 > Device: name="ALC233 Analog", type="Audio", device=0 > Amp-In caps: ofs=0x17, nsteps=0x3f, stepsize=0x02, mute=1 > Amp-In vals: [0x30 0x30] > Converter: stream=1, channel=0 > SDI-Select: 0 > PCM: > rates [0x560]: 44100 48000 96000 192000 > bits [0xe]: 16 20 24 > formats [0x1]: PCM > Power states: D0 D1 D2 D3 EPSS > Power: setting=D0, actual=D0 > Connection: 1 > 0x23 > Node 0x09 [Audio Input] wcaps 0x10051b: Stereo Amp-In > Amp-In caps: ofs=0x17, nsteps=0x3f, stepsize=0x02, mute=1 > Amp-In vals: [0x97 0x97] > Converter: stream=0, channel=0 > SDI-Select: 0 > PCM: > rates [0x560]: 44100 48000 96000 192000 > bits [0xe]: 16 20 24 > formats [0x1]: PCM > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Connection: 1 > 0x22 > Node 0x0a [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x0b [Audio Mixer] wcaps 0x20010b: Stereo Amp-In > Control: name="Mic Playback Volume", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=1, ofs=0 > Control: name="Mic Playback Switch", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=1, ofs=0 > Control: name="Beep Playback Volume", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=4, ofs=0 > Control: name="Beep Playback Switch", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=4, ofs=0 > Amp-In caps: ofs=0x17, nsteps=0x1f, stepsize=0x05, mute=1 > Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] > Connection: 5 > 0x18 0x19 0x1a 0x1b 0x1d > Node 0x0c [Audio Mixer] wcaps 0x20010b: Stereo Amp-In > Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-In vals: [0x00 0x00] [0x00 0x00] > Connection: 2 > 0x02 0x0b > Node 0x0d [Audio Mixer] wcaps 0x20010b: Stereo Amp-In > Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-In vals: [0x00 0x00] [0x00 0x00] > Connection: 2 > 0x03 0x0b > Node 0x0e [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x0f [Audio Mixer] wcaps 0x20010a: Mono Amp-In > Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-In vals: [0x00 0x00] > Connection: 1 > 0x0d > Node 0x10 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x11 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x12 [Pin Complex] wcaps 0x40040b: Stereo Amp-In > Control: name="Internal Mic Boost Volume", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=0, ofs=0 > Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 > Amp-In vals: [0x00 0x00] > Pincap 0x00000020: IN > Pin Default 0x90a60140: [Fixed] Mic at Int N/A > Conn = Digital, Color = Unknown > DefAssociation = 0x4, Sequence = 0x0 > Misc = NO_PRESENCE > Pin-ctls: 0x20: IN > Power states: D0 D1 D2 D3 EPSS > Power: setting=D0, actual=D0 > Node 0x13 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x14 [Pin Complex] wcaps 0x40058d: Stereo Amp-Out > Control: name="Speaker Playback Switch", index=0, device=0 > ControlAmp: chs=3, dir=Out, idx=0, ofs=0 > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x00 0x00] > Pincap 0x00010014: OUT EAPD Detect > EAPD 0x2: EAPD > Pin Default 0x90170110: [Fixed] Speaker at Int N/A > Conn = Analog, Color = Unknown > DefAssociation = 0x1, Sequence = 0x0 > Misc = NO_PRESENCE > Pin-ctls: 0x40: OUT > Unsolicited: tag=00, enabled=0 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D0, actual=D0 > Connection: 1 > 0x0c > Node 0x15 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x16 [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x17 [Pin Complex] wcaps 0x40050c: Mono Amp-Out > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x80] > Pincap 0x00000010: OUT > Pin Default 0x40000000: [N/A] Line Out at Ext N/A > Conn = Unknown, Color = Unknown > DefAssociation = 0x0, Sequence = 0x0 > Pin-ctls: 0x00: > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Connection: 1 > 0x0f > Node 0x18 [Pin Complex] wcaps 0x40048b: Stereo Amp-In > Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 > Amp-In vals: [0x00 0x00] > Pincap 0x00003724: IN Detect > Vref caps: HIZ 50 GRD 80 100 > Pin Default 0x411111f0: [N/A] Speaker at Ext Rear > Conn = 1/8, Color = Black > DefAssociation = 0xf, Sequence = 0x0 > Misc = NO_PRESENCE > Pin-ctls: 0x20: IN VREF_HIZ > Unsolicited: tag=00, enabled=0 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Node 0x19 [Pin Complex] wcaps 0x40048b: Stereo Amp-In > Control: name="Mic Boost Volume", index=0, device=0 > ControlAmp: chs=3, dir=In, idx=0, ofs=0 > Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 > Amp-In vals: [0x00 0x00] > Pincap 0x00003724: IN Detect > Vref caps: HIZ 50 GRD 80 100 > Pin Default 0x04a11030: [Jack] Mic at Ext Right > Conn = 1/8, Color = Black > DefAssociation = 0x3, Sequence = 0x0 > Pin-ctls: 0x24: IN VREF_80 > Unsolicited: tag=02, enabled=1 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Node 0x1a [Pin Complex] wcaps 0x40048b: Stereo Amp-In > Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 > Amp-In vals: [0x00 0x00] > Pincap 0x00003724: IN Detect > Vref caps: HIZ 50 GRD 80 100 > Pin Default 0x411111f0: [N/A] Speaker at Ext Rear > Conn = 1/8, Color = Black > DefAssociation = 0xf, Sequence = 0x0 > Misc = NO_PRESENCE > Pin-ctls: 0x00: VREF_HIZ > Unsolicited: tag=00, enabled=0 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Node 0x1b [Pin Complex] wcaps 0x40058f: Stereo Amp-In Amp-Out > Amp-In caps: ofs=0x00, nsteps=0x03, stepsize=0x27, mute=0 > Amp-In vals: [0x00 0x00] > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x80 0x80] > Pincap 0x0001373c: IN OUT HP EAPD Detect > Vref caps: HIZ 50 GRD 80 100 > EAPD 0x2: EAPD > Pin Default 0x411111f0: [N/A] Speaker at Ext Rear > Conn = 1/8, Color = Black > DefAssociation = 0xf, Sequence = 0x0 > Misc = NO_PRESENCE > Pin-ctls: 0x20: IN VREF_HIZ > Unsolicited: tag=00, enabled=0 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Connection: 2 > 0x0c* 0x0d > Node 0x1c [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x1d [Pin Complex] wcaps 0x400400: Mono > Pincap 0x00000020: IN > Pin Default 0x40f79a2d: [N/A] Other at Ext N/A > Conn = Analog, Color = Pink > DefAssociation = 0x2, Sequence = 0xd > Pin-ctls: 0x20: IN > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Node 0x1e [Pin Complex] wcaps 0x400781: Stereo Digital > Pincap 0x00000014: OUT Detect > Pin Default 0x411111f0: [N/A] Speaker at Ext Rear > Conn = 1/8, Color = Black > DefAssociation = 0xf, Sequence = 0x0 > Misc = NO_PRESENCE > Pin-ctls: 0x40: OUT > Unsolicited: tag=00, enabled=0 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Connection: 1 > 0x06 > Node 0x1f [Vendor Defined Widget] wcaps 0xf00000: Mono > Node 0x20 [Vendor Defined Widget] wcaps 0xf00040: Mono > Processing caps: benign=0, ncoeff=76 > Node 0x21 [Pin Complex] wcaps 0x40058d: Stereo Amp-Out > Control: name="Headphone Playback Switch", index=0, device=0 > ControlAmp: chs=3, dir=Out, idx=0, ofs=0 > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x80 0x80] > Pincap 0x0001001c: OUT HP EAPD Detect > EAPD 0x2: EAPD > Pin Default 0x04211020: [Jack] HP Out at Ext Right > Conn = 1/8, Color = Black > DefAssociation = 0x2, Sequence = 0x0 > Pin-ctls: 0xc0: OUT HP > Unsolicited: tag=01, enabled=1 > Power states: D0 D1 D2 D3 EPSS > Power: setting=D3, actual=D3 > Connection: 2 > 0x0c 0x0d* > Node 0x22 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In > Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] > Connection: 6 > 0x18 0x19 0x1a 0x1b 0x1d 0x0b > Node 0x23 [Audio Mixer] wcaps 0x20010b: Stereo Amp-In > Amp-In caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-In vals: [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x80 0x80] [0x00 0x00] > Connection: 7 > 0x18 0x19 0x1a 0x1b 0x1d 0x0b 0x12 > Codec: Intel Skylake HDMI > Address: 2 > AFG Function Id: 0x1 (unsol 0) > Vendor Id: 0x80862809 > Subsystem Id: 0x80860101 > Revision Id: 0x100000 > No Modem Function Group found > Default PCM: > rates [0x0]: > bits [0x0]: > formats [0x0]: > Default Amp-In caps: N/A > Default Amp-Out caps: N/A > State of AFG node 0x01: > Power states: D0 D3 CLKSTOP EPSS > Power: setting=D0, actual=D0, Clock-stop-OK > GPIO: io=0, o=0, i=0, unsolicited=0, wake=0 > Node 0x02 [Audio Output] wcaps 0x6611: 8-Channels Digital > Converter: stream=0, channel=0 > Digital: Enabled KAE > Digital category: 0x0 > IEC Coding Type: 0x0 > PCM: > rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 > bits [0x1a]: 16 24 32 > formats [0x5]: PCM AC3 > Power states: D0 D3 EPSS > Power: setting=D0, actual=D0 > Node 0x03 [Audio Output] wcaps 0x6611: 8-Channels Digital > Converter: stream=0, channel=0 > Digital: Enabled KAE > Digital category: 0x0 > IEC Coding Type: 0x0 > PCM: > rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 > bits [0x1a]: 16 24 32 > formats [0x5]: PCM AC3 > Power states: D0 D3 EPSS > Power: setting=D0, actual=D0 > Node 0x04 [Audio Output] wcaps 0x6611: 8-Channels Digital > Converter: stream=0, channel=0 > Digital: Enabled KAE > Digital category: 0x0 > IEC Coding Type: 0x0 > PCM: > rates [0x7f0]: 32000 44100 48000 88200 96000 176400 192000 > bits [0x1a]: 16 24 32 > formats [0x5]: PCM AC3 > Power states: D0 D3 EPSS > Power: setting=D0, actual=D0 > Node 0x05 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP > Control: name="IEC958 Playback Con Mask", index=0, device=0 > Control: name="IEC958 Playback Pro Mask", index=0, device=0 > Control: name="IEC958 Playback Default", index=0, device=0 > Control: name="IEC958 Playback Switch", index=0, device=0 > Control: name="ELD", index=0, device=3 > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x00 0x00] > Pincap 0x0b000094: OUT Detect HBR HDMI DP > Pin Default 0x18560010: [Jack] Digital Out at Int HDMI > Conn = Digital, Color = Unknown > DefAssociation = 0x1, Sequence = 0x0 > Pin-ctls: 0x00: > Unsolicited: tag=00, enabled=0 > Power states: D0 D3 EPSS > Power: setting=D0, actual=D0 > Devices: 0 > Connection: 0 > In-driver Connection: 3 > 0x02 0x03 0x04 > Node 0x06 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP > Control: name="IEC958 Playback Con Mask", index=1, device=0 > Control: name="IEC958 Playback Pro Mask", index=1, device=0 > Control: name="IEC958 Playback Default", index=1, device=0 > Control: name="IEC958 Playback Switch", index=1, device=0 > Control: name="ELD", index=0, device=7 > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x00 0x00] > Pincap 0x0b000094: OUT Detect HBR HDMI DP > Pin Default 0x18560010: [Jack] Digital Out at Int HDMI > Conn = Digital, Color = Unknown > DefAssociation = 0x1, Sequence = 0x0 > Pin-ctls: 0x00: > Unsolicited: tag=00, enabled=0 > Power states: D0 D3 EPSS > Power: setting=D0, actual=D0 > Devices: 0 > Connection: 0 > In-driver Connection: 3 > 0x02 0x03 0x04 > Node 0x07 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP > Control: name="IEC958 Playback Con Mask", index=2, device=0 > Control: name="IEC958 Playback Pro Mask", index=2, device=0 > Control: name="IEC958 Playback Default", index=2, device=0 > Control: name="IEC958 Playback Switch", index=2, device=0 > Control: name="ELD", index=0, device=8 > Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 > Amp-Out vals: [0x00 0x00] > Pincap 0x0b000094: OUT Detect HBR HDMI DP > Pin Default 0x18560010: [Jack] Digital Out at Int HDMI > Conn = Digital, Color = Unknown > DefAssociation = 0x1, Sequence = 0x0 > Pin-ctls: 0x00: > Unsolicited: tag=00, enabled=0 > Power states: D0 D3 EPSS > Power: setting=D0, actual=D0 > Devices: 0 > Connection: 0 > In-driver Connection: 3 > 0x02 0x03 0x04 > Node 0x08 [Vendor Defined Widget] wcaps 0xf00000: Mono > --endcollapse-- > > > !!ALSA Device nodes > !!----------------- > > crw-rw----+ 1 root audio 116, 2 Feb 24 21:02 /dev/snd/controlC0 > crw-rw----+ 1 root audio 116, 8 Feb 24 21:02 /dev/snd/hwC0D0 > crw-rw----+ 1 root audio 116, 9 Feb 24 21:02 /dev/snd/hwC0D2 > crw-rw----+ 1 root audio 116, 4 Feb 24 21:02 /dev/snd/pcmC0D0c > crw-rw----+ 1 root audio 116, 3 Feb 24 21:02 /dev/snd/pcmC0D0p > crw-rw----+ 1 root audio 116, 5 Feb 24 21:02 /dev/snd/pcmC0D3p > crw-rw----+ 1 root audio 116, 6 Feb 24 21:02 /dev/snd/pcmC0D7p > crw-rw----+ 1 root audio 116, 7 Feb 24 21:02 /dev/snd/pcmC0D8p > crw-rw----+ 1 root audio 116, 1 Feb 24 21:02 /dev/snd/seq > crw-rw----+ 1 root audio 116, 33 Feb 24 21:02 /dev/snd/timer > > /dev/snd/by-path: > total 0 > drwxr-xr-x 2 root root 60 Feb 24 21:02 . > drwxr-xr-x 3 root root 260 Feb 24 21:02 .. > lrwxrwxrwx 1 root root 12 Feb 24 21:02 pci-0000:00:1f.3 -> ../controlC0 > > > !!Aplay/Arecord output > !!-------------------- > > APLAY > > **** List of PLAYBACK Hardware Devices **** > card 0: PCH [HDA Intel PCH], device 0: ALC233 Analog [ALC233 Analog] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: PCH [HDA Intel PCH], device 3: HDMI 0 [HDMI 0] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: PCH [HDA Intel PCH], device 7: HDMI 1 [HDMI 1] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > card 0: PCH [HDA Intel PCH], device 8: HDMI 2 [HDMI 2] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > > ARECORD > > **** List of CAPTURE Hardware Devices **** > card 0: PCH [HDA Intel PCH], device 0: ALC233 Analog [ALC233 Analog] > Subdevices: 1/1 > Subdevice #0: subdevice #0 > > !!Amixer output > !!------------- > > !!-------Mixer controls for card 0 [PCH] > > Card hw:0 'PCH'/'HDA Intel PCH at 0x94320000 irq 132' > Mixer name : 'Realtek ALC233' > Components : 'HDA:10ec0235,17aa3829,00100002 HDA:80862809,80860101,00100000' > Controls : 44 > Simple ctrls : 14 > Simple mixer control 'Master',0 > Capabilities: pvolume pvolume-joined pswitch pswitch-joined > Playback channels: Mono > Limits: Playback 0 - 87 > Mono: Playback 80 [92%] [-5.25dB] [on] > Simple mixer control 'Headphone',0 > Capabilities: pvolume pswitch > Playback channels: Front Left - Front Right > Limits: Playback 0 - 87 > Mono: > Front Left: Playback 0 [0%] [-65.25dB] [off] > Front Right: Playback 0 [0%] [-65.25dB] [off] > Simple mixer control 'Speaker',0 > Capabilities: pvolume pswitch > Playback channels: Front Left - Front Right > Limits: Playback 0 - 87 > Mono: > Front Left: Playback 87 [100%] [0.00dB] [on] > Front Right: Playback 87 [100%] [0.00dB] [on] > Simple mixer control 'PCM',0 > Capabilities: pvolume > Playback channels: Front Left - Front Right > Limits: Playback 0 - 255 > Mono: > Front Left: Playback 255 [100%] [0.00dB] > Front Right: Playback 255 [100%] [0.00dB] > Simple mixer control 'Mic',0 > Capabilities: pvolume pswitch > Playback channels: Front Left - Front Right > Limits: Playback 0 - 31 > Mono: > Front Left: Playback 0 [0%] [-34.50dB] [off] > Front Right: Playback 0 [0%] [-34.50dB] [off] > Simple mixer control 'Mic Boost',0 > Capabilities: volume > Playback channels: Front Left - Front Right > Capture channels: Front Left - Front Right > Limits: 0 - 3 > Front Left: 0 [0%] [0.00dB] > Front Right: 0 [0%] [0.00dB] > Simple mixer control 'IEC958',0 > Capabilities: pswitch pswitch-joined > Playback channels: Mono > Mono: Playback [off] > Simple mixer control 'IEC958',1 > Capabilities: pswitch pswitch-joined > Playback channels: Mono > Mono: Playback [on] > Simple mixer control 'IEC958',2 > Capabilities: pswitch pswitch-joined > Playback channels: Mono > Mono: Playback [on] > Simple mixer control 'Beep',0 > Capabilities: pvolume pswitch > Playback channels: Front Left - Front Right > Limits: Playback 0 - 31 > Mono: > Front Left: Playback 0 [0%] [-34.50dB] [off] > Front Right: Playback 0 [0%] [-34.50dB] [off] > Simple mixer control 'Capture',0 > Capabilities: cvolume cswitch > Capture channels: Front Left - Front Right > Limits: Capture 0 - 63 > Front Left: Capture 48 [76%] [18.75dB] [on] > Front Right: Capture 48 [76%] [18.75dB] [on] > Simple mixer control 'Auto-Mute Mode',0 > Capabilities: enum > Items: 'Disabled' 'Enabled' > Item0: 'Enabled' > Simple mixer control 'Internal Mic Boost',0 > Capabilities: volume > Playback channels: Front Left - Front Right > Capture channels: Front Left - Front Right > Limits: 0 - 3 > Front Left: 0 [0%] [0.00dB] > Front Right: 0 [0%] [0.00dB] > Simple mixer control 'Loopback Mixing',0 > Capabilities: enum > Items: 'Disabled' 'Enabled' > Item0: 'Enabled' > > > !!Alsactl output > !!-------------- > > --startcollapse-- > state.PCH { > control.1 { > iface MIXER > name 'Headphone Playback Volume' > value.0 0 > value.1 0 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 87' > dbmin -6525 > dbmax 0 > dbvalue.0 -6525 > dbvalue.1 -6525 > } > } > control.2 { > iface MIXER > name 'Headphone Playback Switch' > value.0 false > value.1 false > comment { > access 'read write' > type BOOLEAN > count 2 > } > } > control.3 { > iface MIXER > name 'Speaker Playback Volume' > value.0 87 > value.1 87 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 87' > dbmin -6525 > dbmax 0 > dbvalue.0 0 > dbvalue.1 0 > } > } > control.4 { > iface MIXER > name 'Speaker Playback Switch' > value.0 true > value.1 true > comment { > access 'read write' > type BOOLEAN > count 2 > } > } > control.5 { > iface MIXER > name 'Loopback Mixing' > value Enabled > comment { > access 'read write' > type ENUMERATED > count 1 > item.0 Disabled > item.1 Enabled > } > } > control.6 { > iface MIXER > name 'Mic Playback Volume' > value.0 0 > value.1 0 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 31' > dbmin -3450 > dbmax 1200 > dbvalue.0 -3450 > dbvalue.1 -3450 > } > } > control.7 { > iface MIXER > name 'Mic Playback Switch' > value.0 false > value.1 false > comment { > access 'read write' > type BOOLEAN > count 2 > } > } > control.8 { > iface MIXER > name 'Auto-Mute Mode' > value Enabled > comment { > access 'read write' > type ENUMERATED > count 1 > item.0 Disabled > item.1 Enabled > } > } > control.9 { > iface MIXER > name 'Capture Volume' > value.0 48 > value.1 48 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 63' > dbmin -1725 > dbmax 3000 > dbvalue.0 1875 > dbvalue.1 1875 > } > } > control.10 { > iface MIXER > name 'Capture Switch' > value.0 true > value.1 true > comment { > access 'read write' > type BOOLEAN > count 2 > } > } > control.11 { > iface MIXER > name 'Mic Boost Volume' > value.0 0 > value.1 0 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 3' > dbmin 0 > dbmax 3000 > dbvalue.0 0 > dbvalue.1 0 > } > } > control.12 { > iface MIXER > name 'Internal Mic Boost Volume' > value.0 0 > value.1 0 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 3' > dbmin 0 > dbmax 3000 > dbvalue.0 0 > dbvalue.1 0 > } > } > control.13 { > iface MIXER > name 'Master Playback Volume' > value 80 > comment { > access 'read write' > type INTEGER > count 1 > range '0 - 87' > dbmin -6525 > dbmax 0 > dbvalue.0 -525 > } > } > control.14 { > iface MIXER > name 'Master Playback Switch' > value true > comment { > access 'read write' > type BOOLEAN > count 1 > } > } > control.15 { > iface CARD > name 'Mic Jack' > value false > comment { > access read > type BOOLEAN > count 1 > } > } > control.16 { > iface CARD > name 'Internal Mic Phantom Jack' > value true > comment { > access read > type BOOLEAN > count 1 > } > } > control.17 { > iface CARD > name 'Headphone Jack' > value false > comment { > access read > type BOOLEAN > count 1 > } > } > control.18 { > iface CARD > name 'Speaker Phantom Jack' > value true > comment { > access read > type BOOLEAN > count 1 > } > } > control.19 { > iface MIXER > name 'Beep Playback Volume' > value.0 0 > value.1 0 > comment { > access 'read write' > type INTEGER > count 2 > range '0 - 31' > dbmin -3450 > dbmax 1200 > dbvalue.0 -3450 > dbvalue.1 -3450 > } > } > control.20 { > iface MIXER > name 'Beep Playback Switch' > value.0 false > value.1 false > comment { > access 'read write' > type BOOLEAN > count 2 > } > } > control.21 { > iface PCM > name 'Playback Channel Map' > value.0 0 > value.1 0 > comment { > access read > type INTEGER > count 2 > range '0 - 36' > } > } > control.22 { > iface PCM > name 'Capture Channel Map' > value.0 0 > value.1 0 > comment { > access read > type INTEGER > count 2 > range '0 - 36' > } > } > control.23 { > iface CARD > name 'HDMI/DP,pcm=3 Jack' > value false > comment { > access read > type BOOLEAN > count 1 > } > } > control.24 { > iface MIXER > name 'IEC958 Playback Con Mask' > value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access read > type IEC958 > count 1 > } > } > control.25 { > iface MIXER > name 'IEC958 Playback Pro Mask' > value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access read > type IEC958 > count 1 > } > } > control.26 { > iface MIXER > name 'IEC958 Playback Default' > value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access 'read write' > type IEC958 > count 1 > } > } > control.27 { > iface MIXER > name 'IEC958 Playback Switch' > value false > comment { > access 'read write' > type BOOLEAN > count 1 > } > } > control.28 { > iface PCM > device 3 > name ELD > value '' > comment { > access 'read volatile' > type BYTES > count 0 > } > } > control.29 { > iface CARD > name 'HDMI/DP,pcm=7 Jack' > value false > comment { > access read > type BOOLEAN > count 1 > } > } > control.30 { > iface MIXER > name 'IEC958 Playback Con Mask' > index 1 > value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access read > type IEC958 > count 1 > } > } > control.31 { > iface MIXER > name 'IEC958 Playback Pro Mask' > index 1 > value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access read > type IEC958 > count 1 > } > } > control.32 { > iface MIXER > name 'IEC958 Playback Default' > index 1 > value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access 'read write' > type IEC958 > count 1 > } > } > control.33 { > iface MIXER > name 'IEC958 Playback Switch' > index 1 > value true > comment { > access 'read write' > type BOOLEAN > count 1 > } > } > control.34 { > iface PCM > device 7 > name ELD > value '' > comment { > access 'read volatile' > type BYTES > count 0 > } > } > control.35 { > iface CARD > name 'HDMI/DP,pcm=8 Jack' > value false > comment { > access read > type BOOLEAN > count 1 > } > } > control.36 { > iface MIXER > name 'IEC958 Playback Con Mask' > index 2 > value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access read > type IEC958 > count 1 > } > } > control.37 { > iface MIXER > name 'IEC958 Playback Pro Mask' > index 2 > value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access read > type IEC958 > count 1 > } > } > control.38 { > iface MIXER > name 'IEC958 Playback Default' > index 2 > value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' > comment { > access 'read write' > type IEC958 > count 1 > } > } > control.39 { > iface MIXER > name 'IEC958 Playback Switch' > index 2 > value true > comment { > access 'read write' > type BOOLEAN > count 1 > } > } > control.40 { > iface PCM > device 8 > name ELD > value '' > comment { > access 'read volatile' > type BYTES > count 0 > } > } > control.41 { > iface PCM > device 3 > name 'Playback Channel Map' > value.0 0 > value.1 0 > value.2 0 > value.3 0 > value.4 0 > value.5 0 > value.6 0 > value.7 0 > comment { > access 'read write' > type INTEGER > count 8 > range '0 - 36' > } > } > control.42 { > iface PCM > device 7 > name 'Playback Channel Map' > value.0 0 > value.1 0 > value.2 0 > value.3 0 > value.4 0 > value.5 0 > value.6 0 > value.7 0 > comment { > access 'read write' > type INTEGER > count 8 > range '0 - 36' > } > } > control.43 { > iface PCM > device 8 > name 'Playback Channel Map' > value.0 0 > value.1 0 > value.2 0 > value.3 0 > value.4 0 > value.5 0 > value.6 0 > value.7 0 > comment { > access 'read write' > type INTEGER > count 8 > range '0 - 36' > } > } > control.44 { > iface MIXER > name 'PCM Playback Volume' > value.0 255 > value.1 255 > comment { > access 'read write user' > type INTEGER > count 2 > range '0 - 255' > tlv '0000000100000008ffffec1400000014' > dbmin -5100 > dbmax 0 > dbvalue.0 0 > dbvalue.1 0 > } > } > } > --endcollapse-- > > > !!All Loaded Modules > !!------------------ > > Module > drbg > ansi_cprng > ctr > ccm > cmac > rfcomm > bnep > bbswitch > arc4 > binfmt_misc > nls_iso8859_1 > snd_hda_codec_hdmi > snd_hda_codec_realtek > snd_hda_codec_generic > intel_rapl > x86_pkg_temp_thermal > intel_powerclamp > coretemp > iwlmvm > kvm_intel > mac80211 > kvm > irqbypass > crct10dif_pclmul > snd_hda_intel > crc32_pclmul > uvcvideo > snd_hda_codec > ghash_clmulni_intel > videobuf2_vmalloc > videobuf2_memops > snd_hda_core > aesni_intel > videobuf2_v4l2 > snd_hwdep > aes_x86_64 > videobuf2_core > lrw > iwlwifi > gf128mul > glue_helper > ablk_helper > snd_pcm > videodev > cryptd > snd_seq_midi > media > snd_seq_midi_event > cfg80211 > input_leds > snd_rawmidi > joydev > snd_seq > serio_raw > snd_seq_device > snd_timer > btusb > btrtl > snd > soundcore > mei_me > shpchp > mei > ideapad_laptop > sparse_keymap > hci_uart > btbcm > btqca > btintel > bluetooth > intel_lpss_acpi > wmi > intel_lpss > mac_hid > tpm_crb > acpi_pad > ip6t_REJECT > nf_reject_ipv6 > nf_log_ipv6 > xt_hl > ip6t_rt > nf_conntrack_ipv6 > nf_defrag_ipv6 > ipt_REJECT > nf_reject_ipv4 > nf_log_ipv4 > nf_log_common > xt_LOG > xt_limit > xt_tcpudp > xt_addrtype > nf_conntrack_ipv4 > nf_defrag_ipv4 > xt_conntrack > ip6table_filter > ip6_tables > nf_conntrack_netbios_ns > nf_conntrack_broadcast > nf_nat_ftp > nf_nat > nf_conntrack_ftp > nf_conntrack > iptable_filter > parport_pc > ip_tables > ppdev > x_tables > lp > parport > autofs4 > hid_generic > usbhid > i915 > i2c_algo_bit > drm_kms_helper > psmouse > syscopyarea > sysfillrect > sysimgblt > fb_sys_fops > r8169 > drm > sdhci_pci > ahci > mii > sdhci > libahci > i2c_hid > pinctrl_sunrisepoint > video > hid > pinctrl_intel > fjes > > > !!Sysfs Files > !!----------- > > /sys/class/sound/hwC0D0/init_pin_configs: > 0x12 0x90a60140 > 0x14 0x90170110 > 0x17 0x40000000 > 0x18 0x411111f0 > 0x19 0x04a11030 > 0x1a 0x411111f0 > 0x1b 0x411111f0 > 0x1d 0x40f79a2d > 0x1e 0x411111f0 > 0x21 0x04211020 > > /sys/class/sound/hwC0D0/driver_pin_configs: > > /sys/class/sound/hwC0D0/user_pin_configs: > > /sys/class/sound/hwC0D0/init_verbs: > > /sys/class/sound/hwC0D0/hints: > > /sys/class/sound/hwC0D2/init_pin_configs: > 0x05 0x18560010 > 0x06 0x18560010 > 0x07 0x18560010 > > /sys/class/sound/hwC0D2/driver_pin_configs: > > /sys/class/sound/hwC0D2/user_pin_configs: > > /sys/class/sound/hwC0D2/init_verbs: > > /sys/class/sound/hwC0D2/hints: > > > !!ALSA/HDA dmesg > !!-------------- > > [ 3.118546] iwlwifi 0000:08:00.0: loaded firmware version 16.242414.0 op_mode iwlmvm > [ 3.119214] snd_hda_intel 0000:00:1f.3: bound 0000:00:02.0 (ops i915_audio_component_bind_ops [i915]) > [ 3.119989] uvcvideo 1-6:1.0: Entity type for entity Realtek Extended Controls Unit was not initialized! > -- > [ 3.159964] Bluetooth: hci0: Failed to send firmware data (-38) > [ 3.161319] snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC233: line_outs=1 (0x14/0x0/0x0/0x0/0x0) type:speaker > [ 3.161321] snd_hda_codec_realtek hdaudioC0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) > [ 3.161323] snd_hda_codec_realtek hdaudioC0D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) > [ 3.161324] snd_hda_codec_realtek hdaudioC0D0: mono: mono_out=0x0 > [ 3.161325] snd_hda_codec_realtek hdaudioC0D0: inputs: > [ 3.161326] snd_hda_codec_realtek hdaudioC0D0: Mic=0x19 > [ 3.161327] snd_hda_codec_realtek hdaudioC0D0: Internal Mic=0x12 > [ 3.170162] nvidia_uvm: Loaded the UVM driver, major device number 245 > [ 3.172370] Adding 32529404k swap on /dev/sda3. Priority:-1 extents:1 across:32529404k SSFS > [ 3.181718] input: HDA Intel PCH Mic as /devices/pci0000:00/0000:00:1f.3/sound/card0/input12 > [ 3.181763] input: HDA Intel PCH Headphone as /devices/pci0000:00/0000:00:1f.3/sound/card0/input13 > [ 3.181802] input: HDA Intel PCH HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input14 > [ 3.181846] input: HDA Intel PCH HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input15 > [ 3.181905] input: HDA Intel PCH HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input16 > [ 3.259924] audit: type=1400 audit(1456344123.829:2): apparmor="STATUS" operation="profile_load" name="/usr/lib/lightdm/lightdm-guest-session" pid=676 comm="apparmor_parser" > >

1 0

[alsa-devel] USB Sound card with unsafe characters
by Brian Jones 26 Feb '16

26 Feb '16

I have been trying to work on a fix for Bug 1498129 - https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1498129 on Ubuntu My USB soundcard is an Asus Xonar U7 Echelon Edition <https://www.asus.com/Sound-Cards/Xonar_U7_Echelon_Edition/> which identifies itself to alsa as "Xonar U7 Echelon Ed." The card is supported by alsa and works well in analog mode but I cannot get digital output via alsa or pulseaudio. It has iec958 as device 1 rather than device 0 and I can access digital output by referring to directly to hw:x,1 but cannot access digital output via alsa. The fix I believe is to add "Xonar U7 Echelon Ed." 1 to the USB-Audio.pcm.iec958_device section of USB-Audio.conf. This does not work. As I suspected, and now have confirmed by Raymond on the bug report, this is because the alsa name for this card contains the period character '.' Is there a workaround for this or do I need to await an alsa code change?

1 0

[alsa-devel] [RFC: PATCH] ALSA: hda - clear IRQ statu twice on some Intel platforms
by libin.yang＠linux.intel.com 26 Feb '16

26 Feb '16

From: Libin Yang <libin.yang(a)linux.intel.com> On some Intel platforms, we found the interrupt issue in the below scenario: 1. driver is in irq handler 2. there is another interrupt from HW after interrupt status is cleared and before exiting from interrupt handler 3. exit from the current irq handling After exiting the irq handler, it should raise another interrupt for driver to handle the new interrupt. But actually, it failed to raise the interrupt and driver will never have chance to clear the interrupt status. The patch clears the interrupt status again just before exiting for interrupt handler. This can reduce the contest dramatically. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/hda_controller.c | 3 +++ sound/pci/hda/hda_controller.h | 3 +++ sound/pci/hda/hda_intel.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 37cf9ce..2ca95c7 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -963,6 +963,9 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) azx_writeb(chip, RIRBSTS, RIRB_INT_MASK); } + if (chip->post_irq) + chip->post_irq(chip); + spin_unlock(&bus->reg_lock); return IRQ_HANDLED; diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index ec63bbf..ce59997 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -146,6 +146,9 @@ struct azx { const struct firmware *fw; #endif + /* callback at the end of interrupt handler */ + void (*post_irq)(struct azx *); + /* flags */ int bdl_pos_adj; int poll_count; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 4045dca..6a47d88 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1663,6 +1663,43 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, return 0; } +/* HSW, BDW, SKL and BXT need do post_irq() */ +#define INTEL_IRQ_POST(chip) \ + (((chip)->pci->vendor == PCI_VENDOR_ID_INTEL) && \ + (((chip)->pci->device == 0x0a0c) || \ + ((chip)->pci->device == 0x0c0c) || \ + ((chip)->pci->device == 0x0d0c) || \ + ((chip)->pci->device == 0x160c) || \ + ((chip)->pci->device == 0xa170) || \ + ((chip)->pci->device == 0x9d70) || \ + ((chip)->pci->device == 0x5a98))) + + +/* on some intel platforms, if there occurs an interrupt + * when irq is being handled, interrupt signal will not be raised + * after the irq handler returns. And the interrupt status may never + * be cleared. + * So let's clear all the interrupt status before return from irq handler. + * This can help to reduce the contest between the irq handler and the signal. + */ +static void intel_post_irq(struct azx *chip) +{ + struct hdac_bus *bus = azx_bus(chip); + struct hdac_stream *azx_dev; + + list_for_each_entry(azx_dev, &bus->stream_list, list) + snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); + + /* clear STATESTS */ + snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK); + + /* clear rirb status */ + snd_hdac_chip_writeb(bus, RIRBSTS, RIRB_INT_MASK); + + /* clear int status */ + snd_hdac_chip_writel(bus, INTSTS, AZX_INT_CTRL_EN | AZX_INT_ALL_STREAM); +} + static int azx_first_init(struct azx *chip) { int dev = chip->dev_index; @@ -1717,6 +1754,9 @@ static int azx_first_init(struct azx *chip) if (chip->pci->vendor == PCI_VENDOR_ID_AMD) dma_bits = 40; + if (INTEL_IRQ_POST(chip)) + chip->post_irq = intel_post_irq; + /* disable SB600 64bit support for safety */ if (chip->pci->vendor == PCI_VENDOR_ID_ATI) { struct pci_dev *p_smbus; -- 1.9.1

3 7

[alsa-devel] snd-hda-intel runtime PM fail after module reload
by Ville Syrjälä 26 Feb '16

26 Feb '16

Hi, My investigation into some sporadic i915 runtime PM failures seem to point the finger at snd-hda-intel. I just tried to play around unloding and reloading snd-hda-intel and sometimes I get snd-hda-intel loaded with runtime PM supposedly enabled, but actually the device won't runtime suspend. At which point frobbing with power/control is enough to kick it back into submission. # for i in `seq 1 3`; do sleep 1 ; grep . /sys/bus/pci/devices/0000\:00\:03.0/power/* ; done /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:117045 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:suspended /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:222657 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:117045 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:suspended /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:223666 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:117045 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:suspended /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:224674 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 # rmmod snd-hda-intel # modprobe snd-hda-intel # for i in `seq 1 3`; do sleep 1 ; grep . /sys/bus/pci/devices/0000\:00\:03.0/power/* ; done /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:121454 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:active /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:228560 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:122463 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:active /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:228560 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:123472 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:active /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:228560 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 # echo on > /sys/bus/pci/devices/0000:00:03.0/power/control # echo auto > /sys/bus/pci/devices/0000:00:03.0/power/control # for i in `seq 1 3`; do sleep 1 ; grep . /sys/bus/pci/devices/0000\:00\:03.0/power/* ; done /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:141459 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:suspended /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:231699 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:141459 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:suspended /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:232706 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 /sys/bus/pci/devices/0000:00:03.0/power/async:enabled grep: /sys/bus/pci/devices/0000:00:03.0/power/autosuspend_delay_ms: Input/output error /sys/bus/pci/devices/0000:00:03.0/power/control:auto /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_kids:0 /sys/bus/pci/devices/0000:00:03.0/power/runtime_active_time:141459 /sys/bus/pci/devices/0000:00:03.0/power/runtime_enabled:enabled /sys/bus/pci/devices/0000:00:03.0/power/runtime_status:suspended /sys/bus/pci/devices/0000:00:03.0/power/runtime_suspended_time:233713 /sys/bus/pci/devices/0000:00:03.0/power/runtime_usage:0 -- Ville Syrjälä Intel OTC

2 3

[alsa-devel] [PATCH 0/4 RESEND] Add I2S/ADV7511 audio support for ARC AXS10x boards
by Jose Abreu 26 Feb '16

26 Feb '16

ARC AXS10x platforms consist of a mainboard with several peripherals. One of those peripherals is an HDMI output port controlled by ADV7511 transmitter. This patch set adds audio for the ADV7511 transmitter and I2S audio for the AXS10x platform. Jose Abreu (4): [adv7511] Add audio support [adv7511] Update defconfigs so that audio is enabled [dwc] Add I2S HDMI audio support using custom platform driver [dwc] Update defconfigs so that I2S is enabled arch/arc/boot/dts/axs10x_mb.dtsi | 20 +- arch/arc/configs/axs101_defconfig | 4 + arch/arc/configs/axs103_defconfig | 6 + arch/arc/configs/axs103_smp_defconfig | 6 + drivers/gpu/drm/i2c/Kconfig | 8 + drivers/gpu/drm/i2c/Makefile | 2 + drivers/gpu/drm/i2c/adv7511.c | 1024 --------------------------------- drivers/gpu/drm/i2c/adv7511.h | 41 ++ drivers/gpu/drm/i2c/adv7511_audio.c | 310 ++++++++++ drivers/gpu/drm/i2c/adv7511_core.c | 1005 ++++++++++++++++++++++++++++++++ include/sound/soc-dai.h | 1 + sound/soc/dwc/Kconfig | 1 + sound/soc/dwc/Makefile | 4 +- sound/soc/dwc/designware_i2s.c | 139 ++++- sound/soc/dwc/designware_pcm.c | 264 +++++++++ sound/soc/dwc/designware_pcm.h | 21 + 16 files changed, 1813 insertions(+), 1043 deletions(-) delete mode 100644 drivers/gpu/drm/i2c/adv7511.c create mode 100644 drivers/gpu/drm/i2c/adv7511_audio.c create mode 100644 drivers/gpu/drm/i2c/adv7511_core.c create mode 100644 sound/soc/dwc/designware_pcm.c create mode 100644 sound/soc/dwc/designware_pcm.h -- 1.9.1

3 6

[alsa-devel] [PATCH 0/15 v2][RFC] cleanup regmap write functions
by Kuninori Morimoto 26 Feb '16

26 Feb '16

Hi Mark Current regmap has many similar functions regmap_update_bits() regmap_update_bits_async() regmap_update_bits_check() regmap_update_bits_check_async() But difference is very few. And I would like to have _force_ feature on it too. So, these patches add new regmap_update_bits_base() which has _check, _async, and _force option. Above functions are now defined as macro. I used [RFC], because regmap has big effects. 1), 6), 9) adds new regmap_xxx_update_bits_base() functions and current each functions are merged into it by macro. Please review carefully especially 7), 10). I think using ~0 mask is correct for regmap_field_write() <-> regmap_field_update_bits_base() 1) - 5) for regmap_xxx() 6) - 8) for regmap_field_xxx() 9) - 11) for regmap_fields_xxx() 12) - 13) adds _force_ macro 14) remove unused regmap_write_bits() which was one of _force_ function 15) rsnd driver uses _force_ function for register access BTW, I noticed #if - #else - #endif on ${LINUX}/include/linux/regmap.h are strange. Many functions/struct/macro are defined under #ifdef CONFIG_REGMAP, but few are defined under #else. It can be trouble ? Do we really need this #if ? Kuninori Morimoto (15): 1) regmap: add regmap_update_bits_base() 2) regmap: merge regmap_update_bits() into macro 3) regmap: merge regmap_update_bits_async() into macro 4) regmap: merge regmap_update_bits_check() into macro 5) regmap: merge regmap_update_bits_check_async() into macro 6) regmap: add regmap_field_update_bits_base() 7) regmap: merge regmap_field_write() into macro 8) regmap: merge regmap_field_update_bits() into macro 9) regmap: add regmap_fields_update_bits_base() 10) regmap: merge regmap_fields_write() into macro 11) regmap: merge regmap_fields_update_bits() into macro 12) regmap: add regmap_field_force_xxx() macros 13) regmap: add regmap_fields_force_xxx() macros 14) regmpa: remove regmap_write_bits() 15) ASoC: rsnd: rsnd_write() / rsnd_bset() uses regmap _force_ function drivers/base/regmap/regmap.c | 217 ++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------- include/linux/regmap.h | 94 ++++++++++++++++++++++++++++----------------------------- sound/soc/sh/rcar/gen.c | 21 ++----------- sound/soc/sh/rcar/rsnd.h | 2 -- 4 files changed, 87 insertions(+), 247 deletions(-) Best regards --- Kuninori Morimoto

2 29

[alsa-devel] [PATCH 0/6][RFC] cleanup regmap write functions
by Kuninori Morimoto 26 Feb '16

26 Feb '16

Hi Mark Current regmap has many similar functions regmap_update_bits() regmap_update_bits_async() regmap_update_bits_check() regmap_update_bits_check_async() But difference is very few. And I would like to have _force_ feature on it. So, these patches add new regmap_raw_update_bits() which has _check, _async, _force option. Above functions are now defined as macro. 4), 5) adds _force_ feature. We can easily add _check, _async. I used [RFC], because regmap has many effect. BTW, I noticed #if - #else - #endif on ${LINUX}/include/linux/regmap.h are strange. Many functions/struct/macro are defined under #ifdef CONFIG_REGMAP, but few are defined under #else. It can be trouble ? Do we really need this #if ? Kuninori Morimoto (7): 1) regmap: add regmap_raw_update_bits() and merge all regmap_update_bits_xxx() 2) regmap: regmap_field_xxx() uses regmap_raw_update_bits() 3) regmap: regmap_fields_xxx() uses regmap_raw_update_bits() 4) regmap: add regmap_field_force_xxx() functions 5) regmap: add regmap_fields_force_xxx() functions 6) regmpa: remove regmap_write_bits() 7) ASoC: rsnd: rsnd_write() / rsnd_bset() uses regmap _force_ function drivers/base/regmap/regmap.c | 191 +++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------ include/linux/regmap.h | 102 ++++++++++++++++++++++++++++++---------------------------------------- sound/soc/sh/rcar/gen.c | 21 ++------------- sound/soc/sh/rcar/rsnd.h | 2 -- 4 files changed, 88 insertions(+), 228 deletions(-) Best regards --- Kuninori Morimoto

2 10

[alsa-devel] [PATCH] ASoC: mediatek: Add I03/I04 widgets and corresponding routes
by PC Liao 26 Feb '16

26 Feb '16

From: Koro Chen <koro.chen(a)mediatek.com> Add these widgets to allow another path from I2S input. Change-Id: Ib6804bbbde388830d8359245fe13bbb0f2bb36ba Signed-off-by: Koro Chen <koro.chen(a)mediatek.com> Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- sound/soc/mediatek/mtk-afe-pcm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/mediatek/mtk-afe-pcm.c b/sound/soc/mediatek/mtk-afe-pcm.c index 689c51f..5de878f 100644 --- a/sound/soc/mediatek/mtk-afe-pcm.c +++ b/sound/soc/mediatek/mtk-afe-pcm.c @@ -40,6 +40,7 @@ #define AFE_CONN1 0x0024 #define AFE_CONN2 0x0028 +#define AFE_CONN3 0x002c #define AFE_CONN7 0x0460 #define AFE_CONN8 0x0464 #define AFE_HDMI_CONN0 0x0390 @@ -63,6 +64,7 @@ #define AFE_HDMI_OUT_CUR 0x0378 #define AFE_HDMI_OUT_END 0x037c +#define AFE_ADDA_TOP_CON0 0x0120 #define AFE_ADDA2_TOP_CON0 0x0600 #define AFE_HDMI_OUT_CON0 0x0370 @@ -259,6 +261,7 @@ static int mtk_afe_set_i2s(struct mtk_afe *afe, unsigned int rate) return -EINVAL; /* from external ADC */ + regmap_update_bits(afe->regmap, AFE_ADDA_TOP_CON0, 0x1, 0x1); regmap_update_bits(afe->regmap, AFE_ADDA2_TOP_CON0, 0x1, 0x1); /* set input */ @@ -903,15 +906,19 @@ static const struct snd_kcontrol_new mtk_afe_o04_mix[] = { }; static const struct snd_kcontrol_new mtk_afe_o09_mix[] = { + SOC_DAPM_SINGLE_AUTODISABLE("I03 Switch", AFE_CONN3, 0, 1, 0), SOC_DAPM_SINGLE_AUTODISABLE("I17 Switch", AFE_CONN7, 30, 1, 0), }; static const struct snd_kcontrol_new mtk_afe_o10_mix[] = { + SOC_DAPM_SINGLE_AUTODISABLE("I04 Switch", AFE_CONN3, 3, 1, 0), SOC_DAPM_SINGLE_AUTODISABLE("I18 Switch", AFE_CONN8, 0, 1, 0), }; static const struct snd_soc_dapm_widget mtk_afe_pcm_widgets[] = { /* inter-connections */ + SND_SOC_DAPM_MIXER("I03", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER("I04", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("I05", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("I06", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("I17", SND_SOC_NOPM, 0, 0, NULL, 0), @@ -934,12 +941,16 @@ static const struct snd_soc_dapm_route mtk_afe_pcm_routes[] = { {"I2S Playback", NULL, "O04"}, {"VUL", NULL, "O09"}, {"VUL", NULL, "O10"}, + {"I03", NULL, "I2S Capture"}, + {"I04", NULL, "I2S Capture"}, {"I17", NULL, "I2S Capture"}, {"I18", NULL, "I2S Capture"}, { "O03", "I05 Switch", "I05" }, { "O04", "I06 Switch", "I06" }, { "O09", "I17 Switch", "I17" }, + { "O09", "I03 Switch", "I03" }, { "O10", "I18 Switch", "I18" }, + { "O10", "I04 Switch", "I04" }, }; static const struct snd_soc_dapm_route mtk_afe_hdmi_routes[] = { -- 1.7.9.5

2 4

[alsa-devel] [patch 2/2] ASoC: max9867: silence and array overflow warning
by Dan Carpenter 26 Feb '16

26 Feb '16

Smatch complains that we might reach the end of this loop without finding what we're looking for leading to a buffer overflow. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 4fb6fc7..9fb03c6 100755 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -156,6 +156,8 @@ static inline int get_ni_value(int mclk, int rate) if (ni_div[i].mclk >= mclk) break; } + if (i == ARRAY_SIZE(ni_div)) + return -EINVAL; switch (rate) { case 8000:

3 2

[alsa-devel] [PATCH] sound: hdmi: avoid dereferencing uninitialized 'jack' pointer
by Arnd Bergmann 26 Feb '16

26 Feb '16

When CONFIG_SND_JACK is disabled, the hdmi driver tries to create a new output jack structure and dereferences it even though the pointer is never assigned: sound/pci/hda/patch_hdmi.c: In function 'generic_hdmi_build_jack': sound/pci/hda/patch_hdmi.c:2534:30: error: 'jack' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/pci/hda/patch_hdmi.c:2526:19: note: 'jack' was declared here This uses a compile-time check to avoid calling a nonworking snd_jack_new() function, and sets an explicit NULL pointer instead. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 788d441a164c ("ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling") --- sound/pci/hda/patch_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index f4443b5fbf6e..c0872ad80aa0 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2526,6 +2526,11 @@ static int add_hdmi_jack_kctl(struct hda_codec *codec, struct snd_jack *jack; int err; + if (!IS_ENABLED(CONFIG_SND_JACK)) { + spec->pcm_rec[pcm_idx].jack = NULL; + return 0; + } + err = snd_jack_new(codec->card, name, SND_JACK_AVOUT, &jack, true, false); if (err < 0) -- 2.7.0

3 17

[alsa-devel] [PATCH 1/2] ASoC: rt5645: improve headphone pop when system resumes from S3
by John Lin 26 Feb '16

26 Feb '16

When playing audio through headphone, headphone makes pop noise if system resumes from S3 to S0. We modify the sequence of writing register for avoiding pop sound. Signed-off-by: John Lin <john.lin(a)realtek.com> --- sound/soc/codecs/rt5645.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 93e8c90..d57119d 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3029,13 +3029,18 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, RT5645_PWR_BG | RT5645_PWR_VREF2, RT5645_PWR_VREF1 | RT5645_PWR_MB | RT5645_PWR_BG | RT5645_PWR_VREF2); + mdelay(10); snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_FV1 | RT5645_PWR_FV2, RT5645_PWR_FV1 | RT5645_PWR_FV2); - if (rt5645->en_button_func && - snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) - queue_delayed_work(system_power_efficient_wq, - &rt5645->jack_detect_work, msecs_to_jiffies(0)); + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + snd_soc_write(codec, RT5645_DEPOP_M2, 0x1140); + msleep(40); + if (rt5645->en_button_func) + queue_delayed_work(system_power_efficient_wq, + &rt5645->jack_detect_work, + msecs_to_jiffies(0)); + } break; case SND_SOC_BIAS_OFF: -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [PATCH] ASoC: pxa: remove incorrect do_div() call
by Arnd Bergmann 26 Feb '16

26 Feb '16

The new optimized do_div implementation (now in asm-generic/next) exposes a glitch in the brownstone audio driver by producing a compile-time warning: sound/soc/pxa/brownstone.c: In function 'brownstone_wm8994_hw_params': sound/soc/pxa/brownstone.c:67:85: warning: comparison of distinct pointer types lacks a cast sound/soc/pxa/brownstone.c:67:10125: warning: right shift count >= width of type [-Wshift-count-overflow] sound/soc/pxa/brownstone.c:67:10254: warning: passing argument 1 of '__div64_32' from incompatible pointer type [-Wincompatible-pointer-types] The driver just divides two plain integer values, so it should not use do_div to start with, but has apparently done so ever since the code was first merged. This replaces do_div with a simple division operator. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- I think this one is harmless, so we only need it in 4.5 to avoid the warning, but not backported to earlier kernels. Found today on ARM allmodconfig diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 6147e86e9b0f..416ea646c3b1 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -63,8 +63,7 @@ static int brownstone_wm8994_hw_params(struct snd_pcm_substream *substream, sysclk = params_rate(params) * 512; sspa_mclk = params_rate(params) * 64; } - sspa_div = freq_out; - do_div(sspa_div, sspa_mclk); + sspa_div = freq_out / sspa_mclk; snd_soc_dai_set_sysclk(cpu_dai, MMP_SSPA_CLK_AUDIO, freq_out, 0); snd_soc_dai_set_pll(cpu_dai, MMP_SYSCLK, 0, freq_out, sysclk);

3 4

[alsa-devel] [PATCH] ASoC: mediatek: remove soft reset and add second I2S clock
by PC Liao 26 Feb '16

26 Feb '16

To improve I2S flow, this patch removes soft reset and adds second I2S clock to use. Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- sound/soc/mediatek/mtk-afe-pcm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mtk-afe-pcm.c b/sound/soc/mediatek/mtk-afe-pcm.c index 689c51f..3456bfa 100644 --- a/sound/soc/mediatek/mtk-afe-pcm.c +++ b/sound/soc/mediatek/mtk-afe-pcm.c @@ -283,20 +283,13 @@ static void mtk_afe_set_i2s_enable(struct mtk_afe *afe, bool enable) regmap_read(afe->regmap, AFE_I2S_CON2, &val); if (!!(val & AFE_I2S_CON2_EN) == enable) - return; /* must skip soft reset */ - - /* I2S soft reset begin */ - regmap_update_bits(afe->regmap, AUDIO_TOP_CON1, 0x4, 0x4); + return; /* input */ regmap_update_bits(afe->regmap, AFE_I2S_CON2, 0x1, enable); /* output */ regmap_update_bits(afe->regmap, AFE_I2S_CON1, 0x1, enable); - - /* I2S soft reset end */ - udelay(1); - regmap_update_bits(afe->regmap, AUDIO_TOP_CON1, 0x4, 0); } static int mtk_afe_dais_enable_clks(struct mtk_afe *afe, @@ -365,6 +358,7 @@ static int mtk_afe_i2s_startup(struct snd_pcm_substream *substream, return 0; mtk_afe_dais_enable_clks(afe, afe->clocks[MTK_CLK_I2S1_M], NULL); + mtk_afe_dais_enable_clks(afe, afe->clocks[MTK_CLK_I2S2_M], NULL); regmap_update_bits(afe->regmap, AUDIO_TOP_CON0, AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M, 0); return 0; @@ -384,6 +378,7 @@ static void mtk_afe_i2s_shutdown(struct snd_pcm_substream *substream, AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M, AUD_TCON0_PDN_22M | AUD_TCON0_PDN_24M); mtk_afe_dais_disable_clks(afe, afe->clocks[MTK_CLK_I2S1_M], NULL); + mtk_afe_dais_disable_clks(afe, afe->clocks[MTK_CLK_I2S2_M], NULL); } static int mtk_afe_i2s_prepare(struct snd_pcm_substream *substream, @@ -397,6 +392,9 @@ static int mtk_afe_i2s_prepare(struct snd_pcm_substream *substream, mtk_afe_dais_set_clks(afe, afe->clocks[MTK_CLK_I2S1_M], runtime->rate * 256, NULL, 0); + mtk_afe_dais_set_clks(afe, + afe->clocks[MTK_CLK_I2S2_M], runtime->rate * 256, + NULL, 0); /* config I2S */ ret = mtk_afe_set_i2s(afe, substream->runtime->rate); if (ret) -- 1.7.9.5

2 1

[alsa-devel] [RESEND PATCH] ASoC: cs4271: add regulator consumer support
by pascal.huerst＠gmail.com 26 Feb '16

26 Feb '16

From: Pascal Huerst <pascal.huerst(a)gmail.com> The cs4271 has three power domains: vd, vl and va. Enable them all, as long as the codec is in use. While at it, factored out the reset code into its own function. Signed-off-by: Pascal Huerst <pascal.huerst(a)gmail.com> --- Documentation/devicetree/bindings/sound/cs4271.txt | 7 +++ sound/soc/codecs/cs4271.c | 69 +++++++++++++++++++--- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/cs4271.txt b/Documentation/devicetree/bindings/sound/cs4271.txt index e2cd1d7..6e699ce 100644 --- a/Documentation/devicetree/bindings/sound/cs4271.txt +++ b/Documentation/devicetree/bindings/sound/cs4271.txt @@ -33,12 +33,19 @@ Optional properties: Note that this is not needed in case the clocks are stable throughout the entire runtime of the codec. + - vd-supply: Digital power + - vl-supply: Logic power + - va-supply: Analog Power + Examples: codec_i2c: cs4271@10 { compatible = "cirrus,cs4271"; reg = <0x10>; reset-gpio = <&gpio 23 0>; + vd-supply = <&vdd_3v3_reg>; + vl-supply = <&vdd_3v3_reg>; + va-supply = <&vdd_3v3_reg>; }; codec_spi: cs4271@0 { diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index e770ee6..0c0010b 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -26,6 +26,7 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_gpio.h> +#include <linux/regulator/consumer.h> #include <sound/pcm.h> #include <sound/soc.h> #include <sound/tlv.h> @@ -157,6 +158,10 @@ static bool cs4271_volatile_reg(struct device *dev, unsigned int reg) return reg == CS4271_CHIPID; } +static const char * const supply_names[] = { + "vd", "vl", "va" +}; + struct cs4271_private { unsigned int mclk; bool master; @@ -170,6 +175,7 @@ struct cs4271_private { int gpio_disable; /* enable soft reset workaround */ bool enable_soft_reset; + struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; }; static const struct snd_soc_dapm_widget cs4271_dapm_widgets[] = { @@ -487,6 +493,20 @@ static struct snd_soc_dai_driver cs4271_dai = { .symmetric_rates = 1, }; +static int cs4271_reset(struct snd_soc_codec *codec) +{ + struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); + + if (gpio_is_valid(cs4271->gpio_nreset)) { + gpio_set_value(cs4271->gpio_nreset, 0); + mdelay(1); + gpio_set_value(cs4271->gpio_nreset, 1); + mdelay(1); + } + + return 0; +} + #ifdef CONFIG_PM static int cs4271_soc_suspend(struct snd_soc_codec *codec) { @@ -499,6 +519,9 @@ static int cs4271_soc_suspend(struct snd_soc_codec *codec) if (ret < 0) return ret; + regcache_mark_dirty(cs4271->regmap); + regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); + return 0; } @@ -507,6 +530,16 @@ static int cs4271_soc_resume(struct snd_soc_codec *codec) int ret; struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); + ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies), + cs4271->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + + /* Do a proper reset after power up */ + cs4271_reset(codec); + /* Restore codec state */ ret = regcache_sync(cs4271->regmap); if (ret < 0) @@ -553,19 +586,24 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec) } #endif + ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies), + cs4271->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + if (cs4271plat) { amutec_eq_bmutec = cs4271plat->amutec_eq_bmutec; cs4271->enable_soft_reset = cs4271plat->enable_soft_reset; } - if (gpio_is_valid(cs4271->gpio_nreset)) { - /* Reset codec */ - gpio_direction_output(cs4271->gpio_nreset, 0); - mdelay(1); - gpio_set_value(cs4271->gpio_nreset, 1); - /* Give the codec time to wake up */ - mdelay(1); - } + /* Reset codec */ + cs4271_reset(codec); + + ret = regcache_sync(cs4271->regmap); + if (ret < 0) + return ret; ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, CS4271_MODE2_PDN | CS4271_MODE2_CPEN, @@ -595,6 +633,9 @@ static int cs4271_codec_remove(struct snd_soc_codec *codec) /* Set codec to the reset state */ gpio_set_value(cs4271->gpio_nreset, 0); + regcache_mark_dirty(cs4271->regmap); + regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); + return 0; }; @@ -617,6 +658,7 @@ static int cs4271_common_probe(struct device *dev, { struct cs4271_platform_data *cs4271plat = dev->platform_data; struct cs4271_private *cs4271; + int i, ret; cs4271 = devm_kzalloc(dev, sizeof(*cs4271), GFP_KERNEL); if (!cs4271) @@ -638,6 +680,17 @@ static int cs4271_common_probe(struct device *dev, return ret; } + for (i = 0; i < ARRAY_SIZE(supply_names); i++) + cs4271->supplies[i].supply = supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(cs4271->supplies), + cs4271->supplies); + + if (ret < 0) { + dev_err(dev, "Failed to get regulators: %d\n", ret); + return ret; + } + *c = cs4271; return 0; } -- 2.4.3

2 1

[alsa-devel] [PATCH 0/1] ALSA: hda - Use acpi_dev_present()
by Lukas Wunner 25 Feb '16

25 Feb '16

Hi Takashi, the acpi_dev_present() API has now landed in Linus' tree. Thus, after Linus' tree gets merged back into yours, it would be possible to use the API in the Thinkpad hda drivers as per the following patch. I've also pushed it to GitHub in case anyone prefers perusing it in a browser: https://github.com/l1k/linux/commit/a1473d726b57eaf97c4de8812c5967603068e261 An ack for this patch was kindly provided by Hui Wang with: Message-ID: <5653C291.9090607(a)canonical.com> http://mailman.alsa-project.org/pipermail/alsa-devel/2015-November/100962.h… Thanks, Lukas Lukas Wunner (1): ALSA: hda - Use acpi_dev_present() sound/pci/hda/thinkpad_helper.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) -- 2.1.0

3 8

Re: [alsa-devel] [PATCH] ASoC: nau8825: Modify power management and add interrupt wakeup
by John Hsu 25 Feb '16

25 Feb '16

Hi Mark, This patch has cancel and only submit enhance codec suspend and resume patch. Please review the following link for the patch. Many thanks. http://mailman.alsa-project.org/pipermail/alsa-devel/2016-January/102924.ht… [alsa-devel] [PATCH] ASoC: nau8825: fix interrupt fails and unstable after resume On 1/8/2016 9:14 PM, Mark Brown wrote: > On Fri, Jan 08, 2016 at 03:11:22PM +0800, John Hsu wrote: > >> 1. Enhance codec suspend and resume sequence 2. Add interrupt wakeup >> function >> > > If this is two or more separate changes you should be sending two or more separate patches. You also need a better changelog which describes what the patch is supposed to do, in what way is suspend and resume enhanced for example? > > >> +/** >> + * nau8825_init_wakeup - set wakeup capability for codec >> + * >> + * @codec: codec device component >> + * >> + * After this function done, codec can support system wakeup by button. >> + */ >> +int nau8825_init_wakeup(struct snd_soc_codec *codec) { >> + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); >> + >> + device_init_wakeup(nau8825->dev, true); >> + >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(nau8825_init_wakeup); >> > > You need a bit more explanation as to what's going on here. Why is this not something the driver just does or if this should be done elsewhere why do we need the wrapper function? > > >> +int nau8825_irq_wakeup(struct snd_soc_codec *codec, int on) { >> + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); >> > > Same thing here, this looks like an unclear interface. >

2 2

[alsa-devel] Headset doesn't work for HP EliteBook 755 G2
by Derick Eddington 25 Feb '16

25 Feb '16

Hi, first time here, following suggestion [1] to report non-working default configuration, which I found how to make work. I checked using the latest stable kernel 4.4.2 and my headset jack doesn't work by default but my fix does work, on Scientific Linux 7.2 using the 4.4.2 kernel from the ELRepo repository. I also checked using Ubuntu 16.04 alpha with its 4.4.0 kernel and the problem and fix are the same. My laptop is an HP EliteBook 755 G2 from mid 2015 [2] that has a combined headset (headphone + mic) jack that doesn't work by default. The speakers work fine by default and they mute when a headset is plugged in, but the headphones don't work. The snd-hda-intel module handles my device. The codec is Realtek ALC3228. I have the latest BIOS update from HP. I got it working by passing model=hp,headset-mic to snd-hda-intel. I found this fix in an alsa-user message about a different HP laptop with the same codec [3], but I had to modify the message's fix by only including the module option for model= and omitting the other options and aliases that seem to be specific to Arch Linux. I tried using only "hp" or only "headset-mic" as the value for model= but neither worked. Attached are my outputs of alsa-info.sh from before and after I did model=hp,headset-mic. Also, there's another problem after enabling model=hp,headset-mic, which I found how to fix: There is a very annoying squeaky background noise in the headphones that's independent of adjusting the volume level but it does stop when the headphones are muted. I tried a different headset and it's the same. I found how to suppress this by using the white_noise_fix.py script from [4] as described at [5,6], which apparently does some ioctl verbs to adjust the amp gain. I thought this might be something that should be fixed/adjusted in the kernel module(s) that handle this device, so that the white_noise_fix.py isn't needed. If so, maybe it's worth mentioning that when my laptop resumes from sleep, the background noise comes back, so I have to run white_noise_fix.py again. I'm willing to help investigate my hardware more or try other configurations or distros if requested. If it's worth mentioning, I found someone else with the same laptop who has the same non-working headset problem, see [7]. I'd like to help get this fixed in Ubuntu 16.04 before its release. If the proper fix is in the kernel ALSA, I'm willing to go through Ubuntu's process for asking them to incorporate it in 16.04. Apologies if I've misdirected this report. Thanks for your work on ALSA! -- Derick [1] linux-doc/sound/alsa/ALSA-Configuration.txt [2] Product number L9H51UT#ABA [3] https://sourceforge.net/p/alsa/mailman/message/33087916/ [4] http://xps13-9333.appspot.com/root/usr/local/bin/white_noise_fix.py [5] http://xps13-9333.appspot.com/#background_noise [6] http://askubuntu.com/questions/524344/noise-from-headphones [7] http://askubuntu.com/questions/714920/audio-card-alc3228-issue

2 3

[alsa-devel] [PATCH] hda-emu: add acpi_dev_present
by David Henningsson 25 Feb '16

25 Feb '16

Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- include/acpi/acpi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h index d7d6cb9..9fd9c86 100644 --- a/include/acpi/acpi.h +++ b/include/acpi/acpi.h @@ -33,4 +33,6 @@ acpi_get_devices(const char *HID, return user_function(NULL, 0, context, NULL); } +static inline bool acpi_dev_present(const char *hid) { return true; } + #endif /* __ACPI_H__ */ -- 1.9.1

2 1

[alsa-devel] [PATCH v2] ALSA: hda - Fixup speaker pass-through control for nid 0x14 on ALC225
by David Henningsson 25 Feb '16

25 Feb '16

On one of the machines we enable, we found that the actual speaker volume did not always correspond to the volume set in alsamixer. This patch fixes that problem. This patch was orginally written by Kailang @ Realtek, I've rebased it to fit sound git master. Cc: stable(a)vger.kernel.org BugLink: https://bugs.launchpad.net/bugs/1549660 Co-Authored-By: Kailang <kailang(a)realtek.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 72fa58d..7fded69 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3801,6 +3801,10 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, static void alc_headset_mode_default(struct hda_codec *codec) { + static struct coef_fw coef0225[] = { + UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10), + {} + }; static struct coef_fw coef0255[] = { WRITE_COEF(0x45, 0xc089), WRITE_COEF(0x45, 0xc489), @@ -3842,6 +3846,9 @@ static void alc_headset_mode_default(struct hda_codec *codec) }; switch (codec->core.vendor_id) { + case 0x10ec0225: + alc_process_coef_fw(codec, coef0225); + break; case 0x10ec0255: case 0x10ec0256: alc_process_coef_fw(codec, coef0255); @@ -4750,6 +4757,7 @@ enum { ALC293_FIXUP_LENOVO_SPK_NOISE, ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, ALC255_FIXUP_DELL_SPK_NOISE, + ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, }; static const struct hda_fixup alc269_fixups[] = { @@ -5375,6 +5383,17 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE }, + [ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { + /* Disable pass-through path for FRONT 14h */ + { 0x20, AC_VERB_SET_COEF_INDEX, 0x36 }, + { 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 }, + {} + }, + .chained = true, + .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -5646,10 +5665,10 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {0x21, 0x03211020} static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { - SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, + SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, {0x14, 0x901701a0}), - SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, + SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, {0x14, 0x901701b0}), SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: hda - Fixup speaker pass-through control for nid 0x14 on ALC225
by David Henningsson 25 Feb '16

25 Feb '16

On one of the machines we enable, we found that the actual speaker volume did not always correspond to the volume set in alsamixer. This patch fixes that problem. This patch was orginally written by Kailang @ Realtek, I've rebased it to fit sound git master. BugLink: https://bugs.launchpad.net/bugs/1549660 Co-Authored-By: Kailang <kailang(a)realtek.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index efd4980..ab353b0 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3801,6 +3801,10 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, static void alc_headset_mode_default(struct hda_codec *codec) { + static struct coef_fw coef0225[] = { + UPDATE_COEF(0x45, 0x3f<<10, 0x34<<10), + {} + }; static struct coef_fw coef0255[] = { WRITE_COEF(0x45, 0xc089), WRITE_COEF(0x45, 0xc489), @@ -3842,6 +3846,9 @@ static void alc_headset_mode_default(struct hda_codec *codec) }; switch (codec->core.vendor_id) { + case 0x10ec0225: + alc_process_coef_fw(codec, coef0225); + break; case 0x10ec0255: case 0x10ec0256: alc_process_coef_fw(codec, coef0255); @@ -4749,6 +4756,7 @@ enum { ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, ALC293_FIXUP_LENOVO_SPK_NOISE, ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, + ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, }; static const struct hda_fixup alc269_fixups[] = { @@ -5368,6 +5376,17 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc233_fixup_lenovo_line2_mic_hotkey, }, + [ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { + /* Disable pass-through path for FRONT 14h */ + { 0x20, AC_VERB_SET_COEF_INDEX, 0x36 }, + { 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 }, + {} + }, + .chained = true, + .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -5638,10 +5657,10 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {0x21, 0x03211020} static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { - SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, + SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, {0x14, 0x901701a0}), - SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, + SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC225_STANDARD_PINS, {0x14, 0x901701b0}), SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE, -- 1.9.1

2 2

[alsa-devel] [patch 1/2] ASoC: max9867: signedness bug in max9867_dai_hw_params()
by Dan Carpenter 25 Feb '16

25 Feb '16

"value" needs to be signed for the error handling to work. Fixes: 805d132dcbbd ('ASoC: Add max9867 codec driver') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index ab7a94d..4fb6fc7 100755 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -180,7 +180,8 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); - unsigned int ni_h, ni_l, value; + unsigned int ni_h, ni_l; + int value; value = get_ni_value(max9867->sysclk, params_rate(params)); if (value < 0)

2 1

[alsa-devel] [PATCH] ALSA: hda - Fixing background noise on Dell Inspiron 3162
by Kai-Heng Feng 25 Feb '16

25 Feb '16

After login to the desktop on Dell Inspiron 3162, there's a very loud background noise comes from the builtin speaker. The noise does not go away even if the speaker is muted. The noise disappears after using the aamix fixup. Codec: Realtek ALC3234 Address: 0 AFG Function Id: 0x1 (unsol 1) Vendor Id: 0x10ec0255 Subsystem Id: 0x10280725 Revision Id: 0x100002 No Modem Function Group found BugLink: http://bugs.launchpad.net/bugs/1549620 Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index efd4980..72fa58d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4749,6 +4749,7 @@ enum { ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE, ALC293_FIXUP_LENOVO_SPK_NOISE, ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, + ALC255_FIXUP_DELL_SPK_NOISE, }; static const struct hda_fixup alc269_fixups[] = { @@ -5368,6 +5369,12 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc233_fixup_lenovo_line2_mic_hotkey, }, + [ALC255_FIXUP_DELL_SPK_NOISE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_disable_aamix, + .chained = true, + .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -5410,6 +5417,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x06df, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), SND_PCI_QUIRK(0x1028, 0x06e0, "Dell", ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK), SND_PCI_QUIRK(0x1028, 0x0704, "Dell XPS 13", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE), + SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE), SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), -- 2.5.0

2 1

[alsa-devel] [PATCH 0/2 v2] ALSA: oxfw: implement retries for scs1x at transaction failure
by Takashi Sakamoto 25 Feb '16

25 Feb '16

Hi, This patchset updates my former post below. Changes are just adding my sign (I forgot it...) and improvements of commit messages. [alsa-devel] [PATCH 0/2] ALSA: oxfw: implement retries for scs1x at transaction failure http://mailman.alsa-project.org/pipermail/alsa-devel/2016-February/104579.h… In thread of the post, I got some comments about work to extend ALSA rawmidi core. I've investigated it in a few days ago and realized that it may not so light work, mainly because of a lack of unified state management[0]. In this development cycle, I'd like to give it up and use my time for the other work within my plan for the cycle. Please just apply these two patches. [0] In short, the state management is understandable for developers who can understand it, and I'm not. Regards Takashi Sakamoto (2): ALSA: oxfw: retry MIDI transferring for scs1x at transaction failure ALSA: oxfw: discontinue MIDI substream for scs1x at transaction failure sound/firewire/oxfw/oxfw-scs1x.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) -- 2.5.0

2 4

[alsa-devel] [PATCH] ASoC: arizona: Make logging of FLL calculations clearer
by Richard Fitzgerald 25 Feb '16

25 Feb '16

The debug logging of FLL calculations was confusing. Values were printed in hex without indicating this by a leading 0x, and despite these normally being required in decimal. Also where the register value isn't the actual value (it s a power-of-two or 0 means 1, 1 means 2, ...) it was unclear whether the actual or register value was shown. This patch changes the log print so that all mathematical values are shown in decimal, all register values are shown in hex with a 0x prefix, and where the register value isn't the actual integer value the decimal integer value is shown in () after the hex register value. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/arizona.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 913cfa8..92d22a0 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -2149,11 +2149,12 @@ static int arizona_calc_fll(struct arizona_fll *fll, return -EINVAL; } - arizona_fll_dbg(fll, "N=%x THETA=%x LAMBDA=%x\n", + arizona_fll_dbg(fll, "N=%d THETA=%d LAMBDA=%d\n", cfg->n, cfg->theta, cfg->lambda); - arizona_fll_dbg(fll, "FRATIO=%x(%d) OUTDIV=%x REFCLK_DIV=%x\n", - cfg->fratio, cfg->fratio, cfg->outdiv, cfg->refdiv); - arizona_fll_dbg(fll, "GAIN=%d\n", cfg->gain); + arizona_fll_dbg(fll, "FRATIO=0x%x(%d) OUTDIV=%d REFCLK_DIV=0x%x(%d)\n", + cfg->fratio, ratio, cfg->outdiv, + cfg->refdiv, 1 << cfg->refdiv); + arizona_fll_dbg(fll, "GAIN=0x%x(%d)\n", cfg->gain, 1 << cfg->gain); return 0; -- 1.9.1

2 4

Re: [alsa-devel] Fwd: Lenovo Y700-17ISK notebook - multiple issues
by Takashi Iwai 24 Feb '16

24 Feb '16

On Wed, 24 Feb 2016 19:00:36 +0100, Aljosa wrote: > > Hi Takashi, > thank you very much for your reply. > Notebook subwoofer doesn't work at all (it does not produce any sound). OK, could you give more details? Which kernel did you test? Did you test any model option? Also give alsa-info.sh output (run it with --no-upload option and attach the output). This contains the h/w details. Last but not least, don't drop Cc to ML. thanks, Takashi > Regards, Aljosa > > > > On 2016-02-24 16:35, Takashi Iwai wrote: > > On Tue, 23 Feb 2016 20:37:21 +0100, > > Aljosa wrote: > >> > >> Hello, > >> advised by one of the kernel developers - I'm reporting you the > >> problem > >> nr.2 from the below link. > > > > Could you describe what are the exact issues, instead of pointing some > > URL? > > > > > > thanks, > > > > Takashi >

1 0

[alsa-devel] Codec "virtual multiplexer" representation
by Petr Kulhavy 24 Feb '16

24 Feb '16

Hi, I'm writing an ASoC driver for the TAS5721 amplifier. This 2.1 amplifier provides a complex configuration of the audio channels (3), PWMs(4) and output(4) mappings. However only few (about 6) configurations really make sense. I'm trying to model the output configurations in ALSA. In order to avoid a complicated set of switches and multiplexers I would like to add just one multiplexer like control which selects one of these 6 output configurations and a callback function which sets the proper registers accordingly (there are 5 affected registers). Is there a way to create such a "virtual multiplexer" in ALSA? Thanks Petr

2 2

[alsa-devel] Fwd: Lenovo Y700-17ISK notebook - multiple issues
by Aljosa 24 Feb '16

24 Feb '16

Hello, advised by one of the kernel developers - I'm reporting you the problem nr.2 from the below link. Best regards, Aljosa -------- Original Message -------- Subject: Lenovo Y700-17ISK notebook - multiple issues Date: 2016-02-21 11:18 From: Aljosa <aljosa(a)cromalternativemoney.org> To: jkosina(a)suse.com Reply-To: aljosa(a)cromalternativemoney.org Hi, please excuse me if I contact you in this way - I found your email by googling "Lenovo" inside the Linux kernel mailing list archive. Few days ago I purchased a new Lenovo Y700-17ISK notebook, and after installing "current Ubuntu 16.04 daily build" I'm facing some issues which I think are kernel related: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1547934 Consequently, I would like to inform kernel developers about these problems. If you are not the right person to contact on this subject, please route this e-mail to whomever can help me or let me know who to contact - thank you very much in advance. Best regards, Aljosa PS. I have just tried freshly released kernel v4.5-rc5-wily (http://kernel.ubuntu.com/~kernel-ppa/mainline/?C=N;O=D), and with it my wireless connection now works, but there are still plenty problematic lines inside DMESG output.

2 1

[alsa-devel] [BUG] [REGRESSION] [BISECTED] -rc1 breaks audio over HDMI for i915
by Martin Kepplinger 24 Feb '16

24 Feb '16

The following change: 788d441 ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling breaks audio over HDMI on my snd_hda_intel laptop. It is the first bad commit. This was merged for -rc1 and isn't fixed until now, so I got nervous. There are no errors in the log that stand out. I'm no sound or alsa developer, and just reverting it isn't easy since there is stuff depending on this. I'm happy to test possible fixes and hope v4.5 not to ship with such a big regression ;)

4 23

[alsa-devel] ASoC: simultaneous start of input/output channels
by Jonah Petri 24 Feb '16

24 Feb '16

Hello! Our application is very low-latency full duplex audio on a Freescale SoC. ALSA is configured with 2 64-frame buffers, with DSP happening on a realtime user thread. With small buffer sizes, we're obviously very tight on timing, and I've run into an issue which seems architectural in nature, and seemingly is worthy of consulting the list. What we're seeing is a large temporal latency between the DMA completion IRQ for the audio input DMA and audio output DMA. This delay is on the order of 200 microseconds, but also somewhat variable (ok, "large" is relative here, but it matters to us!). In the ideal case, these two interrupts would be perfectly aligned in time, allowing us to run DSP for the full buffer's duration. However, since the interrupts are offset by about 20% of a buffer, we effectively lose that time for our DSP. And, since the timing is variable, and we're in a realtime application, this produces scared engineers. Working backwards from the hardware drivers, I see that snd_soc_dai_ops's trigger callback is used to start and stop the DMA. The fundamental "start" action comes down to a single register write which can easily start both input and output streams in the same write. However, it seems that the snd_soc_dai_ops does not provide for simultaneous start of both input and output streams. Tracing back through the kernel interface and into user space, it seems that starting both the input and output streams necessitates two separate calls from userspace, which could explain the delay, and some of the variability in timing. My question is: * Did I miss some API or technique which could allow simultaneous start of full duplex streams? * If not, I would certainly appreciate advice on where we could fit this into the existing architecture! We would be glad to do the kernel work to make this change, as this capability seems generally useful! Thanks much for any help, Jonah

2 2

[alsa-devel] [asoc:topic/intel 18/22] sound/soc/intel/boards/skl_nau88l25_max98357a.c:25:36: fatal error: ../../codecs/hdac_hdmi.h: No such file or directory
by kbuild test robot 24 Feb '16

24 Feb '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 8be3838af0e992846d4725fae152b818560c1068 commit: 0ab338ff33762d50e5005d8d28b30b25f23aa934 [18/22] ASoC: Intel: boards: Enable HDMI and DP on SKL nau88l25_max98357 machine config: i386-allmodconfig (attached as .config) reproduce: git checkout 0ab338ff33762d50e5005d8d28b30b25f23aa934 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> sound/soc/intel/boards/skl_nau88l25_max98357a.c:25:36: fatal error: ../../codecs/hdac_hdmi.h: No such file or directory compilation terminated. vim +25 sound/soc/intel/boards/skl_nau88l25_max98357a.c 19 #include <sound/core.h> 20 #include <sound/jack.h> 21 #include <sound/pcm.h> 22 #include <sound/pcm_params.h> 23 #include <sound/soc.h> 24 #include "../../codecs/nau8825.h" > 25 #include "../../codecs/hdac_hdmi.h" 26 27 #define SKL_NUVOTON_CODEC_DAI "nau8825-hifi" 28 #define SKL_MAXIM_CODEC_DAI "HiFi" --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:topic/intel 16/22] sound/soc/intel/boards/skl_rt286.c:29:36: fatal error: ../../codecs/hdac_hdmi.h: No such file or directory
by kbuild test robot 24 Feb '16

24 Feb '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 8be3838af0e992846d4725fae152b818560c1068 commit: 23905cd1ca48cbc852a670a3dbbfc5e7d694580f [16/22] ASoC: Intel: boards: Enable HDMI and DP on skl_rt286 machine config: i386-allmodconfig (attached as .config) reproduce: git checkout 23905cd1ca48cbc852a670a3dbbfc5e7d694580f # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> sound/soc/intel/boards/skl_rt286.c:29:36: fatal error: ../../codecs/hdac_hdmi.h: No such file or directory compilation terminated. vim +29 sound/soc/intel/boards/skl_rt286.c 23 #include <sound/core.h> 24 #include <sound/pcm.h> 25 #include <sound/soc.h> 26 #include <sound/jack.h> 27 #include <sound/pcm_params.h> 28 #include "../../codecs/rt286.h" > 29 #include "../../codecs/hdac_hdmi.h" 30 31 static struct snd_soc_jack skylake_headset; 32 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [asoc:topic/intel 17/22] sound/soc/intel/boards/skl_nau88l25_ssm4567.c:29:36: fatal error: ../../codecs/hdac_hdmi.h: No such file or directory
by kbuild test robot 24 Feb '16

24 Feb '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 8be3838af0e992846d4725fae152b818560c1068 commit: bc5f6ac9a66f90f8e16e568ebd463cbe44f46b81 [17/22] ASoC: Intel: boards: Enable HDMI and DP on nau88l2 machine config: i386-allmodconfig (attached as .config) reproduce: git checkout bc5f6ac9a66f90f8e16e568ebd463cbe44f46b81 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:29:36: fatal error: ../../codecs/hdac_hdmi.h: No such file or directory compilation terminated. vim +29 sound/soc/intel/boards/skl_nau88l25_ssm4567.c 23 #include <sound/core.h> 24 #include <sound/pcm.h> 25 #include <sound/soc.h> 26 #include <sound/jack.h> 27 #include <sound/pcm_params.h> 28 #include "../../codecs/nau8825.h" > 29 #include "../../codecs/hdac_hdmi.h" 30 31 #define SKL_NUVOTON_CODEC_DAI "nau8825-hifi" 32 #define SKL_SSM_CODEC_DAI "ssm4567-hifi" --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 1/3] ASoC: rt298: enable IRQ for jack detection
by Bard Liao 24 Feb '16

24 Feb '16

There are some registers needed for enabling rt298 IRQ missed on current driver. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 6 ++++++ sound/soc/codecs/rt298.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 30c6de6..e67ef5f 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1225,6 +1225,12 @@ static int rt298_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt298->regmap, RT298_WIND_FILTER_CTRL, 0x0082, 0x0082); regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2); + + regmap_write(rt298->regmap, RT298_UNSOLICITED_INLINE_CMD, 0x81); + regmap_write(rt298->regmap, RT298_UNSOLICITED_HP_OUT, 0x82); + regmap_write(rt298->regmap, RT298_UNSOLICITED_MIC1, 0x84); + regmap_update_bits(rt298->regmap, RT298_IRQ_FLAG_CTRL, 0x2, 0x2); + rt298->is_hp_in = -1; if (rt298->i2c->irq) { diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h index 31da162..d66f884 100644 --- a/sound/soc/codecs/rt298.h +++ b/sound/soc/codecs/rt298.h @@ -34,6 +34,7 @@ #define RT298_HP_OUT 0x21 #define RT298_MIXER_IN1 0x22 #define RT298_MIXER_IN2 0x23 +#define RT298_INLINE_CMD 0x55 #define RT298_SET_PIN_SFT 6 #define RT298_SET_PIN_ENABLE 0x40 @@ -124,6 +125,12 @@ VERB_CMD(AC_VERB_SET_COEF_INDEX, RT298_VENDOR_REGISTERS, 0) #define RT298_PROC_COEF\ VERB_CMD(AC_VERB_SET_PROC_COEF, RT298_VENDOR_REGISTERS, 0) +#define RT298_UNSOLICITED_INLINE_CMD\ + VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_INLINE_CMD, 0) +#define RT298_UNSOLICITED_HP_OUT\ + VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_HP_OUT, 0) +#define RT298_UNSOLICITED_MIC1\ + VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_MIC1, 0) /* Index registers */ #define RT298_A_BIAS_CTRL1 0x01 @@ -148,6 +155,7 @@ #define RT298_DEPOP_CTRL2 0x67 #define RT298_DEPOP_CTRL3 0x68 #define RT298_DEPOP_CTRL4 0x69 +#define RT298_IRQ_FLAG_CTRL 0x7c /* SPDIF (0x06) */ #define RT298_SPDIF_SEL_SFT 0 -- 1.8.1.1.439.g50a6b54

2 7

[alsa-devel] [PATCH 0/7] ASoC: Intel: boards: Enabled HDMI/DP and update WOV on SKL machines
by Vinod Koul 24 Feb '16

24 Feb '16

This series adds the multiple port support for HDMI and DP on respective SKL machine drivers. Also the WoV sink is removed as that needs to be associated with PCM device and not a DAPM Sink Jeeja KP (5): ASoC: Intel: boards: Enable HDMI and DP on skl_rt286 machine ASoC: Intel: boards: Enable HDMI and DP on nau88l2 machine ASoC: Intel: boards: Remove WoV sink in skl_rt286 ASoC: Intel: boards: Remove WoV sink in nau88125_ssm4567 machine ASoC: Intel: boards: Remove WoV sink in nau88125_max98357a machine Sathya Prakash M R (1): ASoC: Intel: boards: Add IV feedback route for nau88l25_ssm4567 machine Sathyanarayana Nujella (1): ASoC: Intel: boards: Enable HDMI and DP on SKL nau88l25_max98357 machine sound/soc/intel/Kconfig | 3 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 122 +++++++++++++++++--- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 145 +++++++++++++++++++++--- sound/soc/intel/boards/skl_rt286.c | 113 ++++++++++++++++-- 4 files changed, 339 insertions(+), 44 deletions(-) -- 1.9.1

2 14

[alsa-devel] [PATCH RESEND 1/2] ASoC: rt298: enable IRQ for jack detection
by Bard Liao 24 Feb '16

24 Feb '16

There are some registers needed for enabling rt298 IRQ missed on current driver. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 6 ++++++ sound/soc/codecs/rt298.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 30c6de6..e67ef5f 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1225,6 +1225,12 @@ static int rt298_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt298->regmap, RT298_WIND_FILTER_CTRL, 0x0082, 0x0082); regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2); + + regmap_write(rt298->regmap, RT298_UNSOLICITED_INLINE_CMD, 0x81); + regmap_write(rt298->regmap, RT298_UNSOLICITED_HP_OUT, 0x82); + regmap_write(rt298->regmap, RT298_UNSOLICITED_MIC1, 0x84); + regmap_update_bits(rt298->regmap, RT298_IRQ_FLAG_CTRL, 0x2, 0x2); + rt298->is_hp_in = -1; if (rt298->i2c->irq) { diff --git a/sound/soc/codecs/rt298.h b/sound/soc/codecs/rt298.h index 31da162..d66f884 100644 --- a/sound/soc/codecs/rt298.h +++ b/sound/soc/codecs/rt298.h @@ -34,6 +34,7 @@ #define RT298_HP_OUT 0x21 #define RT298_MIXER_IN1 0x22 #define RT298_MIXER_IN2 0x23 +#define RT298_INLINE_CMD 0x55 #define RT298_SET_PIN_SFT 6 #define RT298_SET_PIN_ENABLE 0x40 @@ -124,6 +125,12 @@ VERB_CMD(AC_VERB_SET_COEF_INDEX, RT298_VENDOR_REGISTERS, 0) #define RT298_PROC_COEF\ VERB_CMD(AC_VERB_SET_PROC_COEF, RT298_VENDOR_REGISTERS, 0) +#define RT298_UNSOLICITED_INLINE_CMD\ + VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_INLINE_CMD, 0) +#define RT298_UNSOLICITED_HP_OUT\ + VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_HP_OUT, 0) +#define RT298_UNSOLICITED_MIC1\ + VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_MIC1, 0) /* Index registers */ #define RT298_A_BIAS_CTRL1 0x01 @@ -148,6 +155,7 @@ #define RT298_DEPOP_CTRL2 0x67 #define RT298_DEPOP_CTRL3 0x68 #define RT298_DEPOP_CTRL4 0x69 +#define RT298_IRQ_FLAG_CTRL 0x7c /* SPDIF (0x06) */ #define RT298_SPDIF_SEL_SFT 0 -- 1.8.1.1.439.g50a6b54

1 1

[alsa-devel] [PATCH 2/2] ASoC: max9867: fix type of variable containing error codes
by Andrzej Hajda 24 Feb '16

24 Feb '16

value variable can contain error values and is compared with zero. Its type must be signed. The problem has been detected using coccinelle script scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci Signed-off-by: Andrzej Hajda <a.hajda(a)samsung.com> --- sound/soc/codecs/max9867.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index ab7a94d..4fb6fc7 100755 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -180,7 +180,8 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); - unsigned int ni_h, ni_l, value; + unsigned int ni_h, ni_l; + int value; value = get_ni_value(max9867->sysclk, params_rate(params)); if (value < 0) -- 1.9.1

3 2

[alsa-devel] [PATCH] ASoC: max9867: Use params_width instead of open-coded
by Axel Lin 24 Feb '16

24 Feb '16

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/max9867.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index ab7a94d..e3ee391 100755 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -206,10 +206,9 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, unsigned long int bclk_rate, pclk_bclk_ratio; int bclk_value; - bclk_rate = params_rate(params) * 2 * - snd_pcm_format_width(params_format(params)); + bclk_rate = params_rate(params) * 2 * params_width(params); pclk_bclk_ratio = max9867->pclk/bclk_rate; - switch (snd_pcm_format_width(params_format(params))) { + switch (params_width(params)) { case 8: case 16: switch (pclk_bclk_ratio) { -- 2.1.4

2 1

[alsa-devel] [PATCH 0/4] ASoC: adau17x1: Minor fixes and DT support
by Andreas Irestål 24 Feb '16

24 Feb '16

This set of patches fixes some minor typos and adds DT support for the adau17x1 codec drivers. I've only been able to test the 1761 part on real hardware since I don't have any adau1781 hardware at the moment. Currently, quite a lot of options are provided through the platform_data struct, so it made sense parsing the DT and create a platform_data struct from these parameters not to break anything. I've peeked at a few other drivers and the TI tlv320aic31xx driver works this way as well. Andreas Irestål (4): ASoC: adau17x1: Fix incorrect BCLK ratio definitions ASoc: adau17x1: Correct typos in file headers ASoC: adau17x1: Add basic DT support for adau17x1 ASoC: adau17x1: Add option to provide platform data via DT .../devicetree/bindings/sound/adi,adau17x1.txt | 54 +++++++++ include/dt-bindings/sound/adau17x1.h | 14 +++ include/linux/platform_data/adau17x1.h | 2 +- sound/soc/codecs/adau1761-i2c.c | 14 ++- sound/soc/codecs/adau1761-spi.c | 14 ++- sound/soc/codecs/adau1761.c | 133 ++++++++++++++++++++- sound/soc/codecs/adau1781-i2c.c | 10 ++ sound/soc/codecs/adau1781-spi.c | 10 ++ sound/soc/codecs/adau1781.c | 59 ++++++++- sound/soc/codecs/adau17x1.h | 6 +- 10 files changed, 308 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt create mode 100644 include/dt-bindings/sound/adau17x1.h -- 2.1.4

3 8

[alsa-devel] [PATCH v2 0/5] Minor fixes and DT support
by Andreas Irestål 24 Feb '16

24 Feb '16

This set of patches fixes some minor typos and adds DT support for the adau17x1 codec drivers. I've only been able to test the 1761 part on real hardware since I don't have any adau1781 hardware at the moment. Currently, quite a lot of options are provided through the platform_data struct, so it made sense parsing the DT and create a platform_data struct from these parameters not to break anything. Changes since v1: - Added vendor prefix "adi," to DT properties - DT parsing moved to main probe function Andreas Irestål (5): ASoC: adau17x1: Fix incorrect BCLK ratio definitions ASoC: adau17x1: Correct typos in file headers ASoC: adau17x1: Add adau17x1 bindings document ASoC: adau17x1: Add basic DT support for adau17x1 ASoC: adau17x1: Support platform data via DT .../devicetree/bindings/sound/adi,adau17x1.txt | 55 +++++++++ include/dt-bindings/sound/adau17x1.h | 14 +++ include/linux/platform_data/adau17x1.h | 2 +- sound/soc/codecs/adau1761-i2c.c | 14 ++- sound/soc/codecs/adau1761-spi.c | 14 ++- sound/soc/codecs/adau1761.c | 129 ++++++++++++++++++++- sound/soc/codecs/adau1781-i2c.c | 10 ++ sound/soc/codecs/adau1781-spi.c | 10 ++ sound/soc/codecs/adau1781.c | 50 +++++++- sound/soc/codecs/adau17x1.h | 6 +- 10 files changed, 296 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt create mode 100644 include/dt-bindings/sound/adau17x1.h -- 2.1.4

4 12

[alsa-devel] [PATCH v8 1/2] ASoC: hdac_hdmi: Fix to wait for D3 before powering off codec
by Subhransu S. Prusty 24 Feb '16

24 Feb '16

Powering off codec immediately after sending D3 verb may not set the node to D3 state. So wait for a confirmation response before shutting down codec. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 2445b43..aa953a5 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1486,6 +1486,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdac = &edev->hdac; struct hdac_bus *bus = hdac->bus; + unsigned long timeout; int err; dev_dbg(dev, "Enter: %s\n", __func__); @@ -1495,10 +1496,19 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) return 0; /* Power down afg */ - if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3)) + if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3)) { snd_hdac_codec_write(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D3); + /* Wait till power state is set to D3 */ + timeout = jiffies + msecs_to_jiffies(1000); + while (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3) + && time_before(jiffies, timeout)) { + + msleep(50); + } + } + err = snd_hdac_display_power(bus, false); if (err < 0) { dev_err(bus->dev, "Cannot turn on display power on i915\n"); -- 1.9.1

3 4

[alsa-devel] [PATCH v9 1/2] ASoC: hdac_hdmi: Fix to wait for D3 before powering off codec
by Subhransu S. Prusty 24 Feb '16

24 Feb '16

Powering off codec immediately after sending D3 verb may not set the node to D3 state. So wait for a confirmation response before shutting down codec. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 2445b43..aa953a5 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1486,6 +1486,7 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdac = &edev->hdac; struct hdac_bus *bus = hdac->bus; + unsigned long timeout; int err; dev_dbg(dev, "Enter: %s\n", __func__); @@ -1495,10 +1496,19 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) return 0; /* Power down afg */ - if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3)) + if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3)) { snd_hdac_codec_write(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D3); + /* Wait till power state is set to D3 */ + timeout = jiffies + msecs_to_jiffies(1000); + while (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3) + && time_before(jiffies, timeout)) { + + msleep(50); + } + } + err = snd_hdac_display_power(bus, false); if (err < 0) { dev_err(bus->dev, "Cannot turn on display power on i915\n"); -- 1.9.1

2 2

[alsa-devel] [PATCH v2] ASoC: wm9713: fix regmap free path
by Robert Jarzmik 24 Feb '16

24 Feb '16

In the conversion to regmap, I assumed that the devm_() variant could be used in the soc probe function. As a mater of fact with the current code the regmap is freed twice because of the devm_() call: (mutex_lock) from [<c01f6624>] (debugfs_remove_recursive+0x50/0x1d0) (debugfs_remove_recursive) from [<c02bf800>] (regmap_debugfs_exit+0x1c/0xd4) (regmap_debugfs_exit) from [<c02ba1f8>] (regmap_exit+0x28/0xc8) (regmap_exit) from [<c02aa258>] (release_nodes+0x18c/0x204) (release_nodes) from [<c02a278c>] (device_release+0x18/0x90) (device_release) from [<c0239030>] (kobject_release+0x90/0x1bc) (kobject_release) from [<c0395c94>] (wm9713_soc_remove+0x1c/0x24) (wm9713_soc_remove) from [<c0384884>] (soc_remove_component+0x50/0x7c) (soc_remove_component) from [<c0386c28>] (soc_remove_dai_links+0x118/0x228) (soc_remove_dai_links) from [<c038721c>] (snd_soc_register_card+0x4e4/0xdd4) (snd_soc_register_card) from [<c0393c54>] (devm_snd_soc_register_card+0x34/0x70) Fix this by replacing the devm_regmap initialization code with the non devm_() variant. Fixes: 700dadfefc3d ASoC: wm9713: convert to regmap Cc: Lars-Peter Clausen <lars(a)metafoo.de> Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- Since v1: changed the fix into removing the devm_() variant --- sound/soc/codecs/wm9713.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 4e522302bb8a..edd270f6d8e5 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1212,7 +1212,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) if (IS_ERR(wm9713->ac97)) return PTR_ERR(wm9713->ac97); - regmap = devm_regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); + regmap = regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); if (IS_ERR(regmap)) { snd_soc_free_ac97_codec(wm9713->ac97); return PTR_ERR(regmap); -- 2.1.4

4 3

[alsa-devel] [PATCH] ASoC: rockchip: i2s: add default values for registers
by Sugar Zhang 24 Feb '16

24 Feb '16

this patch add default values for registers according description from TRM. Signed-off-by: Sugar Zhang <sugar.zhang(a)rock-chips.com> --- sound/soc/rockchip/rockchip_i2s.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 6561c4c..a0b0942 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -440,11 +440,21 @@ static bool rockchip_i2s_precious_reg(struct device *dev, unsigned int reg) } } +static const struct reg_default rockchip_i2s_reg_defaults[] = { + {0x00, 0x0000000f}, + {0x04, 0x0000000f}, + {0x08, 0x00071f1f}, + {0x10, 0x001f0000}, + {0x14, 0x01f00000}, +}; + static const struct regmap_config rockchip_i2s_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, .max_register = I2S_RXDR, + .reg_defaults = rockchip_i2s_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(rockchip_i2s_reg_defaults), .writeable_reg = rockchip_i2s_wr_reg, .readable_reg = rockchip_i2s_rd_reg, .volatile_reg = rockchip_i2s_volatile_reg, -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: compress: Add DSP private metadata interface
by Tim Sheridan 23 Feb '16

23 Feb '16

Provides an area to communicate with a DSP to implement support for weird and wonderful features of DSP hardware that aren't supported in the compress offload API. Signed-off-by: Tim Sheridan <tim.sheridan(a)imgtec.com> --- include/uapi/sound/compress_offload.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index e00d8cb..65ac445 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -30,7 +30,7 @@ #include <sound/compress_params.h> -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2) +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 3) /** * struct snd_compressed_buffer - compressed buffer * @fragment_size: size of buffer fragment in bytes @@ -150,6 +150,8 @@ struct snd_compr_metadata { * SNDRV_COMPRESS_SET_PARAMS: Set codec and stream parameters * Note: only codec params can be changed runtime and stream params cant be * SNDRV_COMPRESS_GET_PARAMS: Query codec params + * SNDRV_COMPRESS_SET_DSP_PRIV: Set private DSP metadata + * SNDRV_COMPRESS_GET_DSP_PRIV: Get private DSP metadata * SNDRV_COMPRESS_TSTAMP: get the current timestamp value * SNDRV_COMPRESS_AVAIL: get the current buffer avail value. * This also queries the tstamp properties @@ -171,6 +173,8 @@ struct snd_compr_metadata { struct snd_compr_metadata) #define SNDRV_COMPRESS_GET_METADATA _IOWR('C', 0x15,\ struct snd_compr_metadata) +#define SNDRV_COMPRESS_SET_DSP_PRIV _IOW('C', 0x16, struct snd_compr_metadata) +#define SNDRV_COMPRESS_GET_DSP_PRIV _IOWR('C', 0x17, struct snd_compr_metadata) #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) -- 1.7.1

4 6

[alsa-devel] [RFC PATCH] ALSA: hda - hdmi eld control created based on pcm
by libin.yang＠linux.intel.com 23 Feb '16

23 Feb '16

From: Libin Yang <libin.yang(a)linux.intel.com> eld control is created based on pcm now. When monitor is connected, eld control will be bound to pin automatically. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 74 ++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 541986f..d77509a 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -86,7 +86,6 @@ struct hdmi_spec_per_pin { struct hdmi_eld sink_eld; struct mutex lock; struct delayed_work work; - struct snd_kcontrol *eld_ctl; struct hdmi_pcm *pcm; /* pointer to spec->pcm_rec[n] dynamically*/ int pcm_idx; /* which pcm is attached. -1 means no pcm is attached */ int repoll_count; @@ -136,6 +135,7 @@ struct hdmi_ops { struct hdmi_pcm { struct hda_pcm *pcm; struct snd_jack *jack; + struct snd_kcontrol *eld_ctl; }; struct hdmi_spec { @@ -471,17 +471,22 @@ static int hdmi_eld_ctl_info(struct snd_kcontrol *kcontrol, struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_pin *per_pin; struct hdmi_eld *eld; - int pin_idx; + int pcm_idx; uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; - pin_idx = kcontrol->private_value; - per_pin = get_pin(spec, pin_idx); + pcm_idx = kcontrol->private_value; + mutex_lock(&spec->pcm_lock); + per_pin = pcm_idx_to_pin(spec, pcm_idx); + if (!per_pin) { + /* no pin is bound to the pcm */ + uinfo->count = 0; + mutex_unlock(&spec->pcm_lock); + return 0; + } eld = &per_pin->sink_eld; - - mutex_lock(&per_pin->lock); uinfo->count = eld->eld_valid ? eld->eld_size : 0; - mutex_unlock(&per_pin->lock); + mutex_unlock(&spec->pcm_lock); return 0; } @@ -493,16 +498,23 @@ static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol, struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_pin *per_pin; struct hdmi_eld *eld; - int pin_idx; + int pcm_idx; - pin_idx = kcontrol->private_value; - per_pin = get_pin(spec, pin_idx); + pcm_idx = kcontrol->private_value; + mutex_lock(&spec->pcm_lock); + per_pin = pcm_idx_to_pin(spec, pcm_idx); + if (!per_pin) { + /* no pin is bound to the pcm */ + memset(ucontrol->value.bytes.data, 0, + ARRAY_SIZE(ucontrol->value.bytes.data)); + mutex_unlock(&spec->pcm_lock); + return 0; + } eld = &per_pin->sink_eld; - mutex_lock(&per_pin->lock); if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data) || eld->eld_size > ELD_MAX_SIZE) { - mutex_unlock(&per_pin->lock); + mutex_unlock(&spec->pcm_lock); snd_BUG(); return -EINVAL; } @@ -512,7 +524,7 @@ static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol, if (eld->eld_valid) memcpy(ucontrol->value.bytes.data, eld->eld_buffer, eld->eld_size); - mutex_unlock(&per_pin->lock); + mutex_unlock(&spec->pcm_lock); return 0; } @@ -525,7 +537,7 @@ static struct snd_kcontrol_new eld_bytes_ctl = { .get = hdmi_eld_ctl_get, }; -static int hdmi_create_eld_ctl(struct hda_codec *codec, int pin_idx, +static int hdmi_create_eld_ctl(struct hda_codec *codec, int pcm_idx, int device) { struct snd_kcontrol *kctl; @@ -535,14 +547,17 @@ static int hdmi_create_eld_ctl(struct hda_codec *codec, int pin_idx, kctl = snd_ctl_new1(&eld_bytes_ctl, codec); if (!kctl) return -ENOMEM; - kctl->private_value = pin_idx; + kctl->private_value = pcm_idx; kctl->id.device = device; - err = snd_hda_ctl_add(codec, get_pin(spec, pin_idx)->pin_nid, kctl); + /* no pin nid is associated with the kctl now + * tbd: associate pin nid to eld ctl later + */ + err = snd_hda_ctl_add(codec, 0, kctl); if (err < 0) return err; - get_pin(spec, pin_idx)->eld_ctl = kctl; + get_hdmi_pcm(spec, pcm_idx)->eld_ctl = kctl; return 0; } @@ -1841,7 +1856,10 @@ static void update_eld(struct hda_codec *codec, struct hdmi_spec *spec = codec->spec; bool old_eld_valid = pin_eld->eld_valid; bool eld_changed; + int pcm_idx = -1; + /* for monitor disconnection, save pcm_idx firstly */ + pcm_idx = per_pin->pcm_idx; if (spec->dyn_pcm_assign) { if (eld->eld_valid) { hdmi_attach_hda_pcm(spec, per_pin); @@ -1851,6 +1869,11 @@ static void update_eld(struct hda_codec *codec, hdmi_detach_hda_pcm(spec, per_pin); } } + /* if pcm_idx == -1, it means this is in monitor connection event + * we can get the correct pcm_idx now. + */ + if (pcm_idx == -1) + pcm_idx = per_pin->pcm_idx; if (eld->eld_valid) snd_hdmi_show_eld(codec, &eld->info); @@ -1884,11 +1907,11 @@ static void update_eld(struct hda_codec *codec, hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); } - if (eld_changed) + if (eld_changed && pcm_idx >= 0) snd_ctl_notify(codec->card, SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO, - &per_pin->eld_ctl->id); + &get_hdmi_pcm(spec, pcm_idx)->eld_ctl->id); } /* update ELD and jack state via HD-audio verbs */ @@ -2629,17 +2652,16 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) if (err < 0) return err; snd_hda_spdif_ctls_unassign(codec, pcm_idx); - } - - for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { - struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); /* add control for ELD Bytes */ - err = hdmi_create_eld_ctl(codec, pin_idx, - get_pcm_rec(spec, pin_idx)->device); - + err = hdmi_create_eld_ctl(codec, pcm_idx, + get_pcm_rec(spec, pcm_idx)->device); if (err < 0) return err; + } + + for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { + struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hdmi_present_sense(per_pin, 0); } -- 1.9.1

3 3

[alsa-devel] [alsa-lib][PATCH 0/6] control: add APIs for control element set
by Takashi Sakamoto 23 Feb '16

23 Feb '16

This patchset adds some APIs for control element set, according to design of ALSA control core. Additionally, for the APIs, some API documentation is improved. In ALSA control core, each sound card can have control elements. The elements are managed according to below design. * element set * A set of elements with the same attribute (i.e. name, get/put operations). Some element sets can be added to a sound card. [0] * element * An element can be identified by userspace applications. * channel * An element has channels which can be changed by userspace applications or hardware device itself. * value * Each channel has its own value. The place to kept the value depends on design of each device driver (i.e. in hardware register or kernel space). There're two ways to identify the element; by identification number(numid), or by a combination of name of the element set and index from the first element in the element set [1]. Both of device drivers in kernel land and ALSA control applications in user land can add the element set. When userspace applications add them, ALSA control core works as Inter Process Communication mechanism between event-listening applications and usual control applications. Such element is referred as 'user-defined control elements' in alsa-lib. Typically, device drivers in kernel land adds one element set for a single element. So users and userspace developers are hard to realize that an existence of the element set. There are more items to describe the design. But here I focus on what relates to this patchset. Well, current alsa-lib implementation includes small bugs, some misleadings, a lack of feature related to user-defined control elements. This patchset is my attempt to improves them. [0] In kernel, the element set is represented by 'struct snd_kcontrol'. Some developers call it as 'kernel control'. The others call it as 'control group'. Here, I suggest 'element set', because from userspace the 'struct snd_kcontrol' is not visible and any elements are just visible. Furthermore, I'd like to use unique name against Linux control groups. [1] Actually, when identifying an element according to name/index pair, the other members of 'struct snd_ctl_elem_id' such as iface, device and subdevice are required. They're required to seek element set, then index is used to find an element. Regards Takashi Sakamoto (6): control: rename variables so that it represents the number of channels which an element has control: improve API documentation for functions to add elements control: improve API documentation for functions to set/get channel values for an element control: rename variables so that it represents a channel in element control: add a function to add an element of bytes type control: add functions to add element set include/control.h | 55 +++-- src/control/control.c | 589 ++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 487 insertions(+), 157 deletions(-) -- 2.5.0

3 10

[alsa-devel] Compute Stick baytrail audio problem
by Giacomo Comes 23 Feb '16

23 Feb '16

Hi, I have recently bought a Intel Compute Stick and I am having trouble with the audio. Intel provides a custom Ubuntu release that support audio, but I want to run the linux distribution of my choice on it (openSUSE 13.2 for the moment). In order to have HDMI audio support it is necessary to compile a kernel with this patch (https://raw.githubusercontent.com/01org/baytrailaudio/master/hdmi_audio_201…) provided by Intel for kernel 3.16.7 (https://01.org/ubuntu-hdmi) I compiled the openSUSE kernel using the default openSUSE .config plus the following: CONFIG_SUPPORT_HDMI=y CONFIG_SND_SOC=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m I booted the new kernel and aplay -l gives this output: **** List of PLAYBACK Hardware Devices **** card 0: IntelHDMI [IntelHDMI], device 0: IntelHDMI [IntelHDMI] Subdevices: 0/1 Subdevice #0: subdevice #0 but when I run: aplay /usr/share/sounds/alsa/test.wav the audio plays for .2 seconds and then nothing more. Sometime it will play later a little bit more and stop again. At some point these messages appears: underrun!!! (at least 29325.946 ms long) underrun!!! (at least 1535.889 ms long) underrun!!! (at least 3196.213 ms long) I have looked around on google for a hint on how to fix this issue but I found nothing. Any idea where to look for a solution? Attached there are the dmesg and lsmod output for ubuntu with the working audio and openSUSE 13.2 plus patch without the working audio. I can provide any other information you need. Thanks for any help. Giacomo

2 2

[alsa-devel] [PATCH v1 0/2] patches to add support for rockchip rt5640 card
by Sugar Zhang 23 Feb '16

23 Feb '16

add default values for i2s registers from TRM. rt5640: add master clock handing. Sugar Zhang (2): ASoC: rockchip: i2s: add default values for registers ASoC: rt5640: add master clock handling for rt5640 Documentation/devicetree/bindings/sound/rt5640.txt | 3 +++ sound/soc/codecs/rt5640.c | 31 ++++++++++++++++++++++ sound/soc/codecs/rt5640.h | 2 ++ sound/soc/rockchip/rockchip_i2s.c | 10 +++++++ 4 files changed, 46 insertions(+) -- 1.9.1

3 6

[alsa-devel] Compress offload: DSP buffer timestamp passing
by Tim Sheridan 22 Feb '16

22 Feb '16

Hi, I've been working on the Imagination Technologies AXD (audio DSP) compress offload driver. One of the features of the DSP is scheduled playback of audio using timestamps (that are obtained by an application from userspace). A current problem with the compress offload API is that there's no "blessed" way to get these timestamps from tinycompress through to our compress offload driver. Currently, I've added a SNDRV_COMPRESS_ENCODER_PTS value to the sndrv_compress_encoder enum, and exposed this with an API in tinycompress, handling this in my driver to pass it to the DSP. Does this sound like a reasonable approach to go about adding compress offload API support for this? Or is there some other part of the ALSA API which would be more appropriate to use instead of this? Cheers, Tim -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in

2 2

[alsa-devel] [PATCH] ALSA: hda - Apply clock gate workaround to Skylake, too
by Takashi Iwai 22 Feb '16

22 Feb '16

Some Skylake machines show the codec probe errors in certain situations, e.g. HP Z240 desktop fails to probe the onboard Realtek codec at reloading the snd-hda-intel module like: snd_hda_intel 0000:00:1f.3: spurious response 0x200:0x2, last cmd=0x000000 snd_hda_intel 0000:00:1f.3: azx_get_response timeout, switching to polling mode: lastcmd=0x000f0000 snd_hda_intel 0000:00:1f.3: No response from codec, disabling MSI: last cmd=0x000f0000 snd_hda_intel 0000:00:1f.3: Codec #0 probe error; disabling it... hdaudio hdaudioC0D2: no AFG or MFG node found snd_hda_intel 0000:00:1f.3: no codecs initialized Also, HP G470 G3 suffers from the similar problem, as reported in bugzilla below. On this machine, the codec probe error appears even at a fresh boot. As Libin suggested, the same workaround used for Broxton in the commit [6639484ddaf6: ALSA: hda - disable dynamic clock gating on Broxton before reset] can be applied for Skylake in order to fix this problem. The Intel HW team also confirmed that this is needed for SKL. This patch makes the workaround applied to both SKL and BXT platforms. The referred macros are moved and one superfluous macro (IS_BROXTON()) is another one (IS_BXT()) as well. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=112731 Suggested-by: Libin Yang <libin.yang(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v4.4+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ce6b97f31390..e5240cb3749f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -363,7 +363,10 @@ enum { ((pci)->device == 0x0d0c) || \ ((pci)->device == 0x160c)) -#define IS_BROXTON(pci) ((pci)->device == 0x5a98) +#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170) +#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70) +#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) +#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) static char *driver_short_names[] = { [AZX_DRIVER_ICH] = "HDA Intel", @@ -540,13 +543,13 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset) if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) snd_hdac_set_codec_wakeup(bus, true); - if (IS_BROXTON(pci)) { + if (IS_SKL_PLUS(pci)) { pci_read_config_dword(pci, INTEL_HDA_CGCTL, &val); val = val & ~INTEL_HDA_CGCTL_MISCBDCGE; pci_write_config_dword(pci, INTEL_HDA_CGCTL, val); } azx_init_chip(chip, full_reset); - if (IS_BROXTON(pci)) { + if (IS_SKL_PLUS(pci)) { pci_read_config_dword(pci, INTEL_HDA_CGCTL, &val); val = val | INTEL_HDA_CGCTL_MISCBDCGE; pci_write_config_dword(pci, INTEL_HDA_CGCTL, val); @@ -555,7 +558,7 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset) snd_hdac_set_codec_wakeup(bus, false); /* reduce dma latency to avoid noise */ - if (IS_BROXTON(pci)) + if (IS_BXT(pci)) bxt_reduce_dma_latency(chip); } @@ -977,11 +980,6 @@ static int azx_resume(struct device *dev) /* put codec down to D3 at hibernation for Intel SKL+; * otherwise BIOS may still access the codec and screw up the driver */ -#define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170) -#define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70) -#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) -#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) - static int azx_freeze_noirq(struct device *dev) { struct pci_dev *pci = to_pci_dev(dev); -- 2.7.1

1 0

[alsa-devel] [PATCH] ALSA: mts64: use new parport device model
by Sudip Mukherjee 22 Feb '16

22 Feb '16

Modify mts64 driver to use the new parallel port device model. The advantage of using the device model is that the driver gets binded to the hardware, we get the feature of hotplug, we can bind/unbind the driver at runtime. The changes are in the way the driver gets registered with the parallel port subsystem and the temporary device to probe mts64 card is removed and mts64_probe() is used in the probe callback. Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- exactly same changes as done in portman2x4. BTW, there is one portman2x4 available on ebay. I was bidding for it but someone is more desperate than I am and outbidding me everytime :( sound/drivers/mts64.c | 95 +++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 52 deletions(-) diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index 2a008a9..c76bd87 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c @@ -65,8 +65,6 @@ struct mts64 { struct snd_card *card; struct snd_rawmidi *rmidi; struct pardevice *pardev; - int pardev_claimed; - int open_count; int current_midi_output_port; int current_midi_input_port; @@ -850,30 +848,6 @@ __out: spin_unlock(&mts->lock); } -static int snd_mts64_probe_port(struct parport *p) -{ - struct pardevice *pardev; - int res; - - pardev = parport_register_device(p, DRIVER_NAME, - NULL, NULL, NULL, - 0, NULL); - if (!pardev) - return -EIO; - - if (parport_claim(pardev)) { - parport_unregister_device(pardev); - return -EIO; - } - - res = mts64_probe(p); - - parport_release(pardev); - parport_unregister_device(pardev); - - return res; -} - static void snd_mts64_attach(struct parport *p) { struct platform_device *device; @@ -907,10 +881,20 @@ static void snd_mts64_detach(struct parport *p) /* nothing to do here */ } +static int snd_mts64_dev_probe(struct pardevice *pardev) +{ + if (strcmp(pardev->name, DRIVER_NAME)) + return -ENODEV; + + return 0; +} + static struct parport_driver mts64_parport_driver = { - .name = "mts64", - .attach = snd_mts64_attach, - .detach = snd_mts64_detach + .name = "mts64", + .probe = snd_mts64_dev_probe, + .match_port = snd_mts64_attach, + .detach = snd_mts64_detach, + .devmodel = true, }; /********************************************************************* @@ -922,8 +906,7 @@ static void snd_mts64_card_private_free(struct snd_card *card) struct pardevice *pardev = mts->pardev; if (pardev) { - if (mts->pardev_claimed) - parport_release(pardev); + parport_release(pardev); parport_unregister_device(pardev); } @@ -938,6 +921,12 @@ static int snd_mts64_probe(struct platform_device *pdev) struct snd_card *card = NULL; struct mts64 *mts = NULL; int err; + struct pardev_cb mts64_cb = { + .preempt = NULL, + .wakeup = NULL, + .irq_func = snd_mts64_interrupt, /* ISR */ + .flags = PARPORT_DEV_EXCL, /* flags */ + }; p = platform_get_drvdata(pdev); platform_set_drvdata(pdev, NULL); @@ -946,8 +935,6 @@ static int snd_mts64_probe(struct platform_device *pdev) return -ENODEV; if (!enable[dev]) return -ENOENT; - if ((err = snd_mts64_probe_port(p)) < 0) - return err; err = snd_card_new(&pdev->dev, index[dev], id[dev], THIS_MODULE, 0, &card); @@ -960,23 +947,32 @@ static int snd_mts64_probe(struct platform_device *pdev) sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, p->base, p->irq); - pardev = parport_register_device(p, /* port */ - DRIVER_NAME, /* name */ - NULL, /* preempt */ - NULL, /* wakeup */ - snd_mts64_interrupt, /* ISR */ - PARPORT_DEV_EXCL, /* flags */ - (void *)card); /* private */ - if (pardev == NULL) { + mts64_cb.private = card; /* private */ + pardev = parport_register_dev_model(p, /* port */ + DRIVER_NAME, /* name */ + &mts64_cb, /* callbacks */ + pdev->id); /* device number */ + if (!pardev) { snd_printd("Cannot register pardevice\n"); err = -EIO; goto __err; } + /* claim parport */ + if (parport_claim(pardev)) { + snd_printd("Cannot claim parport 0x%lx\n", pardev->port->base); + err = -EIO; + goto free_pardev; + } + err = mts64_probe(p); + if (err) { + err = -EIO; + goto release_pardev; + } + if ((err = snd_mts64_create(card, pardev, &mts)) < 0) { snd_printd("Cannot create main component\n"); - parport_unregister_device(pardev); - goto __err; + goto release_pardev; } card->private_data = mts; card->private_free = snd_mts64_card_private_free; @@ -986,14 +982,6 @@ static int snd_mts64_probe(struct platform_device *pdev) goto __err; } - /* claim parport */ - if (parport_claim(pardev)) { - snd_printd("Cannot claim parport 0x%lx\n", pardev->port->base); - err = -EIO; - goto __err; - } - mts->pardev_claimed = 1; - /* init device */ if ((err = mts64_device_init(p)) < 0) goto __err; @@ -1009,6 +997,10 @@ static int snd_mts64_probe(struct platform_device *pdev) snd_printk(KERN_INFO "ESI Miditerminal 4140 on 0x%lx\n", p->base); return 0; +release_pardev: + parport_release(pardev); +free_pardev: + parport_unregister_device(pardev); __err: snd_card_free(card); return err; @@ -1024,7 +1016,6 @@ static int snd_mts64_remove(struct platform_device *pdev) return 0; } - static struct platform_driver snd_mts64_driver = { .probe = snd_mts64_probe, .remove = snd_mts64_remove, -- 1.9.1

2 1

[alsa-devel] [PATCH] control: keep consistent usage of assertion
by Takashi Sakamoto 22 Feb '16

22 Feb '16

In most codes for control APIs, assertions are used to check given arguments from applications. If the arguments are not expected, the application is forced to abort. When NDEBUG is defined in the beginning of the codes, no checks are performed. Although, in snd_ctl_elem_set_bytes(), assertion is used with condition statement. There's an intention to check the arguments regardless of NDEBUG. However, this is not the same fashion in the codes. This commit applies the same fashion to the function, to keep consistent usage of assertion. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/control/control.c b/src/control/control.c index 328920d..70d168d 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -2627,10 +2627,7 @@ void snd_ctl_elem_value_set_byte(snd_ctl_elem_value_t *obj, unsigned int idx, un void snd_ctl_elem_set_bytes(snd_ctl_elem_value_t *obj, void *data, size_t size) { assert(obj); - if (size >= ARRAY_SIZE(obj->value.bytes.data)) { - assert(0); - return; - } + assert(size < ARRAY_SIZE(obj->value.bytes.data)); memcpy(obj->value.bytes.data, data, size); } -- 2.5.0

2 1

[alsa-devel] [alsa-lib][PATCH] control: correct assertion in snd_ctl_elem_set_bytes()
by Takashi Sakamoto 22 Feb '16

22 Feb '16

The assert(3) aborts running process when expression arguments is false (zero). Although, the snd_ctl_elem_set_bytes() has return statement after assert(3). It has meaningless. This commit corrects the statements. Fixes: 7893ea238d5a('Added mode argument to open functions where it was missing. First part of CTL documentation') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/control/control.c b/src/control/control.c index 328920d..70d168d 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -2627,10 +2627,7 @@ void snd_ctl_elem_value_set_byte(snd_ctl_elem_value_t *obj, unsigned int idx, un void snd_ctl_elem_set_bytes(snd_ctl_elem_value_t *obj, void *data, size_t size) { assert(obj); - if (size >= ARRAY_SIZE(obj->value.bytes.data)) { - assert(0); - return; - } + assert(size < ARRAY_SIZE(obj->value.bytes.data)); memcpy(obj->value.bytes.data, data, size); } -- 2.5.0

2 5

[alsa-devel] [PATCH] ASoC: mediatek: Add machine driver for ALC5650 codec
by PC Liao 22 Feb '16

22 Feb '16

From: Koro Chen <koro.chen(a)mediatek.com> This is the DPCM based machine driver with rt5650 Signed-off-by: Nicolas Boichat <drinkcat(a)chromium.org> Signed-off-by: Koro Chen <koro.chen(a)mediatek.com> Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- .../devicetree/bindings/sound/mt8173-rt5650.txt | 15 ++ sound/soc/mediatek/Kconfig | 10 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/mt8173-rt5650.c | 236 ++++++++++++++++++++ 4 files changed, 262 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650.txt create mode 100644 sound/soc/mediatek/mt8173-rt5650.c diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt new file mode 100644 index 0000000..fe5a5ef --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt @@ -0,0 +1,15 @@ +MT8173 with RT5650 CODECS + +Required properties: +- compatible : "mediatek,mt8173-rt5650" +- mediatek,audio-codec: the phandles of rt5650 codecs +- mediatek,platform: the phandle of MT8173 ASoC platform + +Example: + + sound { + compatible = "mediatek,mt8173-rt5650"; + mediatek,audio-codec = <&rt5650>; + mediatek,platform = <&afe>; + }; + diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 9769676..6c88087 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -17,6 +17,16 @@ config SND_SOC_MT8173_MAX98090 Select Y if you have such device. If unsure select "N". +config SND_SOC_MT8173_RT5650 + tristate "ASoC Audio driver for MT8173 with RT5650 codec" + depends on SND_SOC_MEDIATEK && I2C + select SND_SOC_RT5645 + help + This adds ASoC driver for Mediatek MT8173 boards + with the RT5650 audio codec. + Select Y if you have such device. + If unsure select "N". + config SND_SOC_MT8173_RT5650_RT5676 tristate "ASoC Audio driver for MT8173 with RT5650 RT5676 codecs" depends on SND_SOC_MEDIATEK && I2C diff --git a/sound/soc/mediatek/Makefile b/sound/soc/mediatek/Makefile index 75effbe..bcdcb06 100644 --- a/sound/soc/mediatek/Makefile +++ b/sound/soc/mediatek/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_SND_SOC_MEDIATEK) += mtk-afe-pcm.o # Machine support obj-$(CONFIG_SND_SOC_MT8173_MAX98090) += mt8173-max98090.o obj-$(CONFIG_SND_SOC_MT8173_RT5650_RT5676) += mt8173-rt5650-rt5676.o +obj-$(CONFIG_SND_SOC_MT8173_RT5650) += mt8173-rt5650.o diff --git a/sound/soc/mediatek/mt8173-rt5650.c b/sound/soc/mediatek/mt8173-rt5650.c new file mode 100644 index 0000000..bb09bb1 --- /dev/null +++ b/sound/soc/mediatek/mt8173-rt5650.c @@ -0,0 +1,236 @@ +/* + * mt8173-rt5650.c -- MT8173 machine driver with RT5650 codecs + * + * Copyright (c) 2016 MediaTek Inc. + * Author: Koro Chen <koro.chen(a)mediatek.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include "../codecs/rt5645.h" + +#define MCLK_FOR_CODECS 12288000 + +static const struct snd_soc_dapm_widget mt8173_rt5650_widgets[] = { + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), +}; + +static const struct snd_soc_dapm_route mt8173_rt5650_routes[] = { + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + {"DMIC L1", NULL, "Int Mic"}, + {"DMIC R1", NULL, "Int Mic"}, + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"Headset Mic", NULL, "micbias1"}, + {"Headset Mic", NULL, "micbias2"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, +}; + +static const struct snd_kcontrol_new mt8173_rt5650_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), +}; + +static int mt8173_rt5650_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + int i, ret; + + for (i = 0; i < rtd->num_codecs; i++) { + struct snd_soc_dai *codec_dai = rtd->codec_dais[i]; + + /* pll from mclk 12.288M */ + ret = snd_soc_dai_set_pll(codec_dai, 0, 0, MCLK_FOR_CODECS, + params_rate(params) * 512); + if (ret) + return ret; + + /* sysclk from pll */ + ret = snd_soc_dai_set_sysclk(codec_dai, 1, + params_rate(params) * 512, + SND_SOC_CLOCK_IN); + if (ret) + return ret; + } + return 0; +} + +static struct snd_soc_ops mt8173_rt5650_ops = { + .hw_params = mt8173_rt5650_hw_params, +}; + +static struct snd_soc_jack mt8173_rt5650_jack; + +static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) +{ + struct snd_soc_card *card = runtime->card; + struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; + int ret; + + rt5645_sel_asrc_clk_src(codec, + RT5645_DA_STEREO_FILTER | + RT5645_AD_STEREO_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + /* enable jack detection */ + ret = snd_soc_card_jack_new(card, "Headset Jack", + SND_JACK_HEADPHONE | SND_JACK_MICROPHONE | + SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3, + &mt8173_rt5650_jack, NULL, 0); + if (ret) { + dev_err(card->dev, "Can't new Headset Jack %d\n", ret); + return ret; + } + + return rt5645_set_jack_detect(codec, + &mt8173_rt5650_jack, + &mt8173_rt5650_jack, + &mt8173_rt5650_jack); +} + +static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = { + { + .dai_name = "rt5645-aif1", + }, +}; + +enum { + DAI_LINK_PLAYBACK, + DAI_LINK_CAPTURE, + DAI_LINK_CODEC_I2S, +}; + +/* Digital audio interface glue - connects codec <---> CPU */ +static struct snd_soc_dai_link mt8173_rt5650_dais[] = { + /* Front End DAI links */ + [DAI_LINK_PLAYBACK] = { + .name = "rt5650 Playback", + .stream_name = "rt5650 Playback", + .cpu_dai_name = "DL1", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, + .dynamic = 1, + .dpcm_playback = 1, + }, + [DAI_LINK_CAPTURE] = { + .name = "rt5650 Capture", + .stream_name = "rt5650 Capture", + .cpu_dai_name = "VUL", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, + .dynamic = 1, + .dpcm_capture = 1, + }, + /* Back End DAI links */ + [DAI_LINK_CODEC_I2S] = { + .name = "Codec", + .cpu_dai_name = "I2S", + .no_pcm = 1, + .codecs = mt8173_rt5650_codecs, + .num_codecs = 1, + .init = mt8173_rt5650_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ops = &mt8173_rt5650_ops, + .ignore_pmdown_time = 1, + .dpcm_playback = 1, + .dpcm_capture = 1, + }, +}; + +static struct snd_soc_card mt8173_rt5650_card = { + .name = "mtk-rt5650", + .owner = THIS_MODULE, + .dai_link = mt8173_rt5650_dais, + .num_links = ARRAY_SIZE(mt8173_rt5650_dais), + .controls = mt8173_rt5650_controls, + .num_controls = ARRAY_SIZE(mt8173_rt5650_controls), + .dapm_widgets = mt8173_rt5650_widgets, + .num_dapm_widgets = ARRAY_SIZE(mt8173_rt5650_widgets), + .dapm_routes = mt8173_rt5650_routes, + .num_dapm_routes = ARRAY_SIZE(mt8173_rt5650_routes), +}; + +static int mt8173_rt5650_dev_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &mt8173_rt5650_card; + struct device_node *platform_node; + int i, ret; + + platform_node = of_parse_phandle(pdev->dev.of_node, + "mediatek,platform", 0); + if (!platform_node) { + dev_err(&pdev->dev, "Property 'platform' missing or invalid\n"); + return -EINVAL; + } + + for (i = 0; i < card->num_links; i++) { + if (mt8173_rt5650_dais[i].platform_name) + continue; + mt8173_rt5650_dais[i].platform_of_node = platform_node; + } + + mt8173_rt5650_codecs[0].of_node = + of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0); + if (!mt8173_rt5650_codecs[0].of_node) { + dev_err(&pdev->dev, + "Property 'audio-codec' missing or invalid\n"); + return -EINVAL; + } + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) + dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", + __func__, ret); + return ret; +} + +static const struct of_device_id mt8173_rt5650_dt_match[] = { + { .compatible = "mediatek,mt8173-rt5650", }, + { } +}; +MODULE_DEVICE_TABLE(of, mt8173_rt5650_dt_match); + +static struct platform_driver mt8173_rt5650_driver = { + .driver = { + .name = "mtk-rt5650", + .of_match_table = mt8173_rt5650_dt_match, +#ifdef CONFIG_PM + .pm = &snd_soc_pm_ops, +#endif + }, + .probe = mt8173_rt5650_dev_probe, +}; + +module_platform_driver(mt8173_rt5650_driver); + +/* Module information */ +MODULE_DESCRIPTION("MT8173 RT5650 SoC machine driver"); +MODULE_AUTHOR("Koro Chen <koro.chen(a)mediatek.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:mtk-rt5650"); + -- 1.7.9.5

2 3

[alsa-devel] [PATCH 0/3] ALSA: hda: Move chmap helpers to core
by Subhransu S. Prusty 22 Feb '16

22 Feb '16

The HDMI channel map helper APIs and control registration can be reused by ASoC skylake HDMI drivers. A common chmap object is created, channel map control callback handlers, helper APIs and data structures are moved to the core. Driver object store an instance of this chmap object to register chmap controls and program channel allocation for HDMI infoframe. Driver registers ops for specific operations. Subhransu S. Prusty (3): ALSA: hda - Create common chmap object ALSA: hda - Move chmap support helpers/structures to core ALSA: hda - Use the helpers from HDA core include/sound/hdaudio.h | 1 + include/sound/hdmi_chmap.h | 84 +++++ sound/hda/Makefile | 2 +- sound/hda/hdmi_chmap.c | 763 +++++++++++++++++++++++++++++++++++++++++++ sound/pci/hda/hda_eld.c | 31 +- sound/pci/hda/patch_hdmi.c | 794 ++++----------------------------------------- 6 files changed, 923 insertions(+), 752 deletions(-) create mode 100644 include/sound/hdmi_chmap.h create mode 100644 sound/hda/hdmi_chmap.c -- 1.9.1

2 7

[alsa-devel] [PATCH] ASoC: rockchip: add bindings for rk3399 i2s
by jianqun.xu 22 Feb '16

22 Feb '16

From: Jianqun Xu <jay.xu(a)rock-chips.com> Add devicetree bindings for i2s controller found on rk3399 processors from rockchip. It's helpful to add full set of compatible strings for serials of Rockchip SoCs (rk3066, rk3188, rk3288, rk3399). Acked-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Jianqun Xu <jay.xu(a)rock-chips.com> --- Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 1 + sound/soc/rockchip/rockchip_i2s.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index b7f3a93..6e86d8a 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -9,6 +9,7 @@ Required properties: - "rockchip,rk3066-i2s": for rk3066 - "rockchip,rk3188-i2s", "rockchip,rk3066-i2s": for rk3188 - "rockchip,rk3288-i2s", "rockchip,rk3066-i2s": for rk3288 + - "rockchip,rk3399-i2s", "rockchip,rk3066-i2s": for rk3399 - reg: physical base address of the controller and length of memory mapped region. - interrupts: should contain the I2S interrupt. diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 6561c4c..531a6d2 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -575,6 +575,9 @@ static int rockchip_i2s_remove(struct platform_device *pdev) static const struct of_device_id rockchip_i2s_match[] = { { .compatible = "rockchip,rk3066-i2s", }, + { .compatible = "rockchip,rk3188-i2s", }, + { .compatible = "rockchip,rk3288-i2s", }, + { .compatible = "rockchip,rk3399-i2s", }, {}, }; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: topology: fix build warning
by Sudip Mukherjee 22 Feb '16

22 Feb '16

We are getting build warning about: sound/soc/soc-topology.c:249:31: warning: 'get_dobj_type' defined but not used commit 64527e8a3529 has removed the only caller of get_dobj_type() but missed to remove the function which is now unused. And after removing get_dobj_type() we do not have any use of get_dobj_mixer_type(). Fixes: 64527e8a3529 ("ASoC: topology: Add FE DAIs dynamically") CC: Mengdong Lin <mengdong.lin(a)linux.intel.com> Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- sound/soc/soc-topology.c | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 0eb01e8..07f61a6 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -223,51 +223,6 @@ static int get_widget_id(int tplg_type) return -EINVAL; } -static enum snd_soc_dobj_type get_dobj_mixer_type( - struct snd_soc_tplg_ctl_hdr *control_hdr) -{ - if (control_hdr == NULL) - return SND_SOC_DOBJ_NONE; - - switch (control_hdr->ops.info) { - case SND_SOC_TPLG_CTL_VOLSW: - case SND_SOC_TPLG_CTL_VOLSW_SX: - case SND_SOC_TPLG_CTL_VOLSW_XR_SX: - case SND_SOC_TPLG_CTL_RANGE: - case SND_SOC_TPLG_CTL_STROBE: - return SND_SOC_DOBJ_MIXER; - case SND_SOC_TPLG_CTL_ENUM: - case SND_SOC_TPLG_CTL_ENUM_VALUE: - return SND_SOC_DOBJ_ENUM; - case SND_SOC_TPLG_CTL_BYTES: - return SND_SOC_DOBJ_BYTES; - default: - return SND_SOC_DOBJ_NONE; - } -} - -static enum snd_soc_dobj_type get_dobj_type(struct snd_soc_tplg_hdr *hdr, - struct snd_soc_tplg_ctl_hdr *control_hdr) -{ - switch (hdr->type) { - case SND_SOC_TPLG_TYPE_MIXER: - return get_dobj_mixer_type(control_hdr); - case SND_SOC_TPLG_TYPE_DAPM_GRAPH: - case SND_SOC_TPLG_TYPE_MANIFEST: - return SND_SOC_DOBJ_NONE; - case SND_SOC_TPLG_TYPE_DAPM_WIDGET: - return SND_SOC_DOBJ_WIDGET; - case SND_SOC_TPLG_TYPE_DAI_LINK: - return SND_SOC_DOBJ_DAI_LINK; - case SND_SOC_TPLG_TYPE_PCM: - return SND_SOC_DOBJ_PCM; - case SND_SOC_TPLG_TYPE_CODEC_LINK: - return SND_SOC_DOBJ_CODEC_LINK; - default: - return SND_SOC_DOBJ_NONE; - } -} - static inline void soc_bind_err(struct soc_tplg *tplg, struct snd_soc_tplg_ctl_hdr *hdr, int index) { -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: fix memory leak
by Sudip Mukherjee 22 Feb '16

22 Feb '16

If dai_link is already bound then we just returned and leaked rtd and rtd->codec_dais which were allocated by soc_new_pcm_runtime(). We do not need this newly allocated rtd to check if dai_link is already binded. Lets check first if it is already binded before allocating this memory. Signed-off-by: Sudip Mukherjee <sudip.mukherjee(a)codethink.co.uk> --- sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 790ee2b..d2e62b15 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -986,16 +986,16 @@ static int soc_bind_dai_link(struct snd_soc_card *card, dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name); - rtd = soc_new_pcm_runtime(card, dai_link); - if (!rtd) - return -ENOMEM; - if (soc_is_dai_link_bound(card, dai_link)) { dev_dbg(card->dev, "ASoC: dai link %s already bound\n", dai_link->name); return 0; } + rtd = soc_new_pcm_runtime(card, dai_link); + if (!rtd) + return -ENOMEM; + cpu_dai_component.name = dai_link->cpu_name; cpu_dai_component.of_node = dai_link->cpu_of_node; cpu_dai_component.dai_name = dai_link->cpu_dai_name; -- 1.9.1

2 1

[alsa-devel] [PATCH v2]ASoC: topology: Fix setting of stream rates, rate_min and rate_max
by mengdong.lin＠linux.intel.com 22 Feb '16

22 Feb '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Directly set a stream's rates, rate_min and rate_max from the topology info. Also define set_stream_info to wrap setting of the stream info. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 0eb01e8..726cea7 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1575,6 +1575,18 @@ static int soc_tplg_dapm_complete(struct soc_tplg *tplg) return 0; } +static void set_stream_info(struct snd_soc_pcm_stream *stream, + struct snd_soc_tplg_stream_caps *caps) +{ + stream->stream_name = kstrdup(caps->name, GFP_KERNEL); + stream->channels_min = caps->channels_min; + stream->channels_max = caps->channels_max; + stream->rates = caps->rates; + stream->rate_min = caps->rate_min; + stream->rate_max = caps->rate_max; + stream->formats = caps->formats; +} + static int soc_tplg_dai_create(struct soc_tplg *tplg, struct snd_soc_tplg_pcm *pcm) { @@ -1593,25 +1605,13 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, if (pcm->playback) { stream = &dai_drv->playback; caps = &pcm->caps[SND_SOC_TPLG_STREAM_PLAYBACK]; - - stream->stream_name = kstrdup(caps->name, GFP_KERNEL); - stream->channels_min = caps->channels_min; - stream->channels_max = caps->channels_max; - stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min, - caps->rate_max); - stream->formats = caps->formats; + set_stream_info(stream, caps); } if (pcm->capture) { stream = &dai_drv->capture; caps = &pcm->caps[SND_SOC_TPLG_STREAM_CAPTURE]; - - stream->stream_name = kstrdup(caps->name, GFP_KERNEL); - stream->channels_min = caps->channels_min; - stream->channels_max = caps->channels_max; - stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min, - caps->rate_max); - stream->formats = caps->formats; + set_stream_info(stream, caps); } /* pass control to component driver for optional further init */ -- 2.5.0

2 1

[alsa-devel] [RFC 0/4] Add support for DAI link addition dynamically
by Vaibhav Agarwal 22 Feb '16

22 Feb '16

Following patches are based on for-next branch from broonie tree. First 2 patches include changes in existing soc, core framework to prepare for adding support for dynamic DAI link addition/ removal Patch 3 & 4 contains actual changes to enable dynamic DAI link support NOTE: Currently, the code is tested on Pandaboad ES revB3 for playback usecase. Vaibhav Agarwal (4): ASoc: Use ref_count for soc DAI & component alsa: add locked variant for snd_ctl_remove_id ASoC: Enable dynamic DAIlink insertion & removal ASoC: Change soc-card codec_conf array to a list include/sound/control.h | 1 + include/sound/soc-dai.h | 1 + include/sound/soc-dapm.h | 7 +- include/sound/soc-dpcm.h | 1 + include/sound/soc.h | 18 ++- sound/core/control.c | 23 +++ sound/soc/Kconfig | 4 + sound/soc/soc-core.c | 359 ++++++++++++++++++++++++++++++++++++++++++++--- sound/soc/soc-dapm.c | 105 +++++++++++--- sound/soc/soc-pcm.c | 25 ++++ 10 files changed, 501 insertions(+), 43 deletions(-) -- 2.1.4

5 22

Re: [alsa-devel] [PATCH] ASoC: topology: Fix setting of stream rates, rate_min and rate_max
by Mark Brown 22 Feb '16

22 Feb '16

On Tue, Feb 16, 2016 at 02:27:32PM +0800, kbuild test robot wrote: > sound/soc/soc-topology.c: In function 'set_stream_info': > >> sound/soc/soc-topology.c:1588:1: warning: no return statement in function returning non-void [-Wreturn-type] > } > ^ This is a real bug that 0day has identified.

2 1

[alsa-devel] [PATCH v7 0/2] ASoC: Add SPDIF support for Allwinner SoCs
by codekipper＠gmail.com 22 Feb '16

22 Feb '16

From: Marcus Cooper <codekipper(a)gmail.com> For now just the SPDIF transmitter has been tested on a Mele A2000(A10) and a Itead Ibox(A20). In order for this patch set to be functional we require an audio clock patch which will be delivered separately. For those that are interested I've pushed the patches here with all the required changes to get SPDIF audio out of the device. https://github.com/codekipper/linux-sunxi/commits/spdif_delivery Thanks in advance, CK --- Changes since v6: - removed legacy dapm components that are no longer needed. - changed dt-bindings patch subject styling to match that of the sound subsystem Changes since v5: - fixed warning that had sneaked in. Changes since v4: - corrected indentation issues - removed old macros - removed unnecessary enabling of apb clock Changes since v3: - removed code required for spdif capture - added disable/enable of apb clk to suspend/resume. - removed unnecessary dt checks in probe - fixed error conditions in probe/resume - modified pm_runtime functionality and confirmed that driver worked when PM was disabled. - removed .owner from platform driver - renamed bindings file Changes since v2: - removed sunxi-machine-spdif and replaced with simple audio card - removed untested compatibilities from device tree documentation - added pm_runtime and remove shutdown - removed pll2 as it's the parent of the spdif clock - rename clk to spdif_clk - removed enabling of mclk output - removed interrupts status being cleared as it's not being used - use default fifo settings for now - fixed alignments for wrapped lines Changes since v1: - Moved sunxi-machine-spdif.c to separate patch - replaced sunxi in naming scheme with sun4i in the sun4i-spdif driver. - split tx controller into separate enable/disable functions - moved setclk and setfmt functionality into hw params - added support for mono signals. - cleaned up probe clock set up. - removed all writes to transmit status registers. - removed of_id - removed power management code. - Added support for more rates. Marcus Cooper (2): ASoC: sunxi :add sun4i SPDIF dt bindings ASoC: sunxi: Add support for the SPDIF block .../bindings/sound/sunxi,sun4i-spdif.txt | 39 ++ sound/soc/sunxi/Kconfig | 8 + sound/soc/sunxi/Makefile | 1 + sound/soc/sunxi/sun4i-spdif.c | 542 +++++++++++++++++++++ 4 files changed, 590 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt create mode 100644 sound/soc/sunxi/sun4i-spdif.c -- 2.7.1

3 4

[alsa-devel] [PATCH 1/3] ASoC: Intel: Skylake: fix pointer scaling
by Vinod Koul 22 Feb '16

22 Feb '16

From: Alan <gnomes(a)lxorguk.ukuu.org.uk> skl_tplg_tlv_control_set does pointer maths on data but forgets that data is not uint8_t so the maths is already scaled in the pointer type. Signed-off-by: Alan Cox <alan(a)linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/skylake/skl-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index ba0d02d1613e..22a9e6fe1c05 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1111,7 +1111,7 @@ static int skl_tplg_tlv_control_set(struct snd_kcontrol *kcontrol, return -EFAULT; } else { if (copy_from_user(ac->params, - data + 2 * sizeof(u32), size)) + data + 2, size)) return -EFAULT; } -- 1.9.1

2 9

[alsa-devel] [PATCH v2] ASoC: Intel: Skylake: remove bogus comparison of an array with NULL
by Vinod Koul 22 Feb '16

22 Feb '16

From: Alan Cox <alan(a)linux.intel.com> dfw_ac->params is an array not a pointer. It will never be NULL. The check on ac->max appears sufficient. Signed-off-by: Alan Cox <alan(a)linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/skylake/skl-topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 22a9e6fe1c05..99f50a034e1d 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1657,8 +1657,7 @@ static int skl_init_algo_data(struct device *dev, struct soc_bytes_ext *be, if (!ac->params) return -ENOMEM; - if (dfw_ac->params) - memcpy(ac->params, dfw_ac->params, ac->max); + memcpy(ac->params, dfw_ac->params, ac->max); } be->dobj.private = ac; -- 1.9.1

1 0

[alsa-devel] Applied "regmap: Add explict native endian flag to DT bindings" to the asoc tree
by Mark Brown 22 Feb '16

22 Feb '16

The patch regmap: Add explict native endian flag to DT bindings has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From a06c488da0b0c1eebf710017675f00b9d5f9cf42 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Tue, 26 Jan 2016 17:59:30 +0000 Subject: [PATCH] regmap: Add explict native endian flag to DT bindings Currently the binding document says that if no endianness is configured we use native endian but this is not in fact true for all binding types and we do have some devices that really want native endianness such as Broadcom MIPS SoCs where switching the endianness of the CPU also switches the endianness of external IPs. Provide an explicit option for this. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Documentation/devicetree/bindings/regmap/regmap.txt | 11 +++++++---- drivers/base/regmap/regmap.c | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/regmap/regmap.txt b/Documentation/devicetree/bindings/regmap/regmap.txt index b494f8b..e98a9652 100644 --- a/Documentation/devicetree/bindings/regmap/regmap.txt +++ b/Documentation/devicetree/bindings/regmap/regmap.txt @@ -5,15 +5,18 @@ Index Device Endianness properties --------------------------------------------------- 1 BE 'big-endian' 2 LE 'little-endian' +3 Native 'native-endian' For one device driver, which will run in different scenarios above on different SoCs using the devicetree, we need one way to simplify this. -Required properties: -- {big,little}-endian: these are boolean properties, if absent - meaning that the CPU and the Device are in the same endianness mode, - these properties are for register values and all the buffers only. +Optional properties: +- {big,little,native}-endian: these are boolean properties, if absent + then the implementation will choose a default based on the device + being controlled. These properties are for register values and all + the buffers only. Native endian means that the CPU and device have + the same endianness. Examples: Scenario 1 : CPU in LE mode & device in LE mode. diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index ee54e84..3432634 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -557,6 +557,8 @@ enum regmap_endian regmap_get_val_endian(struct device *dev, endian = REGMAP_ENDIAN_BIG; else if (of_property_read_bool(np, "little-endian")) endian = REGMAP_ENDIAN_LITTLE; + else if (of_property_read_bool(np, "native-endian")) + endian = REGMAP_ENDIAN_NATIVE; /* If the endianness was specified in DT, use that */ if (endian != REGMAP_ENDIAN_DEFAULT) -- 2.7.0

1 0

[alsa-devel] Applied "MIPS: dt: Explicitly specify native endian behaviour for syscon" to the asoc tree
by Mark Brown 22 Feb '16

22 Feb '16

The patch MIPS: dt: Explicitly specify native endian behaviour for syscon has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 25d6463e48ea41149c88dc40648a888699e77158 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Tue, 26 Jan 2016 18:08:06 +0000 Subject: [PATCH] MIPS: dt: Explicitly specify native endian behaviour for syscon On many MIPS systems the endianness of IP blocks is kept the same as that of the CPU by the hardware. This includes the system controllers on these systems which are controlled via syscon which uses the regmap API which used readl() and writel() to interact with the hardware, meaning that all writes are converted to little endian when writing to the hardware. This caused a bad interaction with the regmap core in big endian mode since it was not aware of the byte swapping and so ended up performing little endian writes. Unfortunately when this issue was noticed it was addressed by updating the DT for the affected devices to specify them as little endian. This happened to work since it resulted in two endianness swaps which cancelled each other out and gave little endian behaviour but meant that the DT was clearly not accurately describing the hardware. The intention of commit 29bb45f25ff305 (regmap-mmio: Use native endianness for read/write) was to fix this by making regmap default to native endianness but this breaks most other MMIO users where the hardware has a fixed endianness and the implementation uses the __raw accessors which are not intended to be used outside of architecture code. Instead use the newly added native-endian DT property to say exactly what we want for these systems. Fixes: 29bb45f25ff305 (regmap-mmio: Use native endianness for read/write) Reported-by: Johannes Berg <johannes(a)sipsolutions.net> Signed-off-by: Mark Brown <broonie(a)kernel.org> Acked-by: Ralf Baechle <ralf(a)linux-mips.org> --- arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 + arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +- arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 + 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/mips/boot/dts/brcm/bcm6328.dtsi b/arch/mips/boot/dts/brcm/bcm6328.dtsi index 459b9b2..9d19236 100644 --- a/arch/mips/boot/dts/brcm/bcm6328.dtsi +++ b/arch/mips/boot/dts/brcm/bcm6328.dtsi @@ -74,6 +74,7 @@ timer: timer@10000040 { compatible = "syscon"; reg = <0x10000040 0x2c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm6368.dtsi b/arch/mips/boot/dts/brcm/bcm6368.dtsi index 9c8d3fe2..1f6b9b5 100644 --- a/arch/mips/boot/dts/brcm/bcm6368.dtsi +++ b/arch/mips/boot/dts/brcm/bcm6368.dtsi @@ -54,7 +54,7 @@ periph_cntl: syscon@10000000 { compatible = "syscon"; reg = <0x10000000 0x14>; - little-endian; + native-endian; }; reboot: syscon-reboot@10000008 { diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm/bcm7125.dtsi index 4fc7ece..3ae1605 100644 --- a/arch/mips/boot/dts/brcm/bcm7125.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7125.dtsi @@ -98,6 +98,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7125-sun-top-ctrl", "syscon"; reg = <0x404000 0x60c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi index a3039bb..be79919 100644 --- a/arch/mips/boot/dts/brcm/bcm7346.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi @@ -118,6 +118,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7346-sun-top-ctrl", "syscon"; reg = <0x404000 0x51c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm/bcm7358.dtsi index 4274ff4..060805b 100644 --- a/arch/mips/boot/dts/brcm/bcm7358.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7358.dtsi @@ -112,6 +112,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7358-sun-top-ctrl", "syscon"; reg = <0x404000 0x51c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm/bcm7360.dtsi index 0dcc9163..bcdb09b 100644 --- a/arch/mips/boot/dts/brcm/bcm7360.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7360.dtsi @@ -112,6 +112,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7360-sun-top-ctrl", "syscon"; reg = <0x404000 0x51c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi index 2f3f9fc..d3b1b76 100644 --- a/arch/mips/boot/dts/brcm/bcm7362.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi @@ -118,6 +118,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7362-sun-top-ctrl", "syscon"; reg = <0x404000 0x51c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm/bcm7420.dtsi index bee221b..3302a1b 100644 --- a/arch/mips/boot/dts/brcm/bcm7420.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7420.dtsi @@ -99,6 +99,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7420-sun-top-ctrl", "syscon"; reg = <0x404000 0x60c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi index 571f30f..15b27aa 100644 --- a/arch/mips/boot/dts/brcm/bcm7425.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi @@ -100,6 +100,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7425-sun-top-ctrl", "syscon"; reg = <0x404000 0x51c>; + native-endian; }; reboot { diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm/bcm7435.dtsi index 614ee21..adb33e3 100644 --- a/arch/mips/boot/dts/brcm/bcm7435.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7435.dtsi @@ -114,6 +114,7 @@ sun_top_ctrl: syscon@404000 { compatible = "brcm,bcm7425-sun-top-ctrl", "syscon"; reg = <0x404000 0x51c>; + native-endian; }; reboot { -- 2.7.0

1 0

[alsa-devel] Applied "regmap: mmio: Convert to regmap_bus and fix accessor usage" to the asoc tree
by Mark Brown 22 Feb '16

22 Feb '16

The patch regmap: mmio: Convert to regmap_bus and fix accessor usage has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 922a9f936e40001f9b921379aab90047d5990923 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Wed, 27 Jan 2016 04:50:07 +0000 Subject: [PATCH] regmap: mmio: Convert to regmap_bus and fix accessor usage Currently regmap-mmio uses the __raw accessors to read and write from memory. This is not safe as these interact poorly with spinlocks and are not guaranteed to generate emulated instructions on at least ARM where regmap is commonly used. The APIs that are provided all provide some byte swapping so this is difficult to do with the current regmap-mmio implementation which attempts to use the regmap core byte swapping. We can fix this by modernising the MMIO implementation to use reg_read() and reg_write() operations which were added after the API was implemented and pass simple unsigned integers through to the bus, making use of the formatting provided by the I/O accessors using a similar pattern to that used by the core. This will be less efficient for block I/O operations since we now enable and disable any required clocks per register but it is not clear that any users of regmap-mmio actually use block I/O and there is room to optimise later. This removes support for big endian I/O on 64 bit registers since no I/O accessors are provided, no current users were found and support can be added easily once they are available. In addition make the default endianness little endian. This was the behaviour prior to 29bb45f25ff305 (regmap-mmio: Use native endianness for read/write) and is the behaviour desired by most existing users, the users have been audited and those that need native endianness converted to request it explicitly. Previously native was documented as the default but due to the byte swapping in the accessors this was not correctly implemented. Fixes: 29bb45f25ff305 (regmap-mmio: Use native endianness for read/write) Reported-by: Johannes Berg <johannes(a)sipsolutions.net> Tested-by: Johannes Berg <johannes(a)sipsolutions.net> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/base/regmap/regmap-mmio.c | 259 ++++++++++++++++++++------------------ 1 file changed, 139 insertions(+), 120 deletions(-) diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index 8812bfb..7526906 100644 --- a/drivers/base/regmap/regmap-mmio.c +++ b/drivers/base/regmap/regmap-mmio.c @@ -25,26 +25,14 @@ struct regmap_mmio_context { void __iomem *regs; - unsigned reg_bytes; unsigned val_bytes; - unsigned pad_bytes; struct clk *clk; -}; -static inline void regmap_mmio_regsize_check(size_t reg_size) -{ - switch (reg_size) { - case 1: - case 2: - case 4: -#ifdef CONFIG_64BIT - case 8: -#endif - break; - default: - BUG(); - } -} + void (*reg_write)(struct regmap_mmio_context *ctx, + unsigned int reg, unsigned int val); + unsigned int (*reg_read)(struct regmap_mmio_context *ctx, + unsigned int reg); +}; static int regmap_mmio_regbits_check(size_t reg_bits) { @@ -88,72 +76,62 @@ static int regmap_mmio_get_min_stride(size_t val_bits) return min_stride; } -static inline void regmap_mmio_count_check(size_t count, u32 offset) +static void regmap_mmio_write8(struct regmap_mmio_context *ctx, + unsigned int reg, + unsigned int val) +{ + writeb(val, ctx->regs + reg); +} + +static void regmap_mmio_write16le(struct regmap_mmio_context *ctx, + unsigned int reg, + unsigned int val) { - BUG_ON(count <= offset); + writew(val, ctx->regs + reg); } -static inline unsigned int -regmap_mmio_get_offset(const void *reg, size_t reg_size) +static void regmap_mmio_write16be(struct regmap_mmio_context *ctx, + unsigned int reg, + unsigned int val) { - switch (reg_size) { - case 1: - return *(u8 *)reg; - case 2: - return *(u16 *)reg; - case 4: - return *(u32 *)reg; + iowrite16be(val, ctx->regs + reg); +} + +static void regmap_mmio_write32le(struct regmap_mmio_context *ctx, + unsigned int reg, + unsigned int val) +{ + writel(val, ctx->regs + reg); +} + +static void regmap_mmio_write32be(struct regmap_mmio_context *ctx, + unsigned int reg, + unsigned int val) +{ + iowrite32be(val, ctx->regs + reg); +} + #ifdef CONFIG_64BIT - case 8: - return *(u64 *)reg; -#endif - default: - BUG(); - } +static void regmap_mmio_write64le(struct regmap_mmio_context *ctx, + unsigned int reg, + unsigned int val) +{ + writeq(val, ctx->regs + reg); } +#endif -static int regmap_mmio_gather_write(void *context, - const void *reg, size_t reg_size, - const void *val, size_t val_size) +static int regmap_mmio_write(void *context, unsigned int reg, unsigned int val) { struct regmap_mmio_context *ctx = context; - unsigned int offset; int ret; - regmap_mmio_regsize_check(reg_size); - if (!IS_ERR(ctx->clk)) { ret = clk_enable(ctx->clk); if (ret < 0) return ret; } - offset = regmap_mmio_get_offset(reg, reg_size); - - while (val_size) { - switch (ctx->val_bytes) { - case 1: - __raw_writeb(*(u8 *)val, ctx->regs + offset); - break; - case 2: - __raw_writew(*(u16 *)val, ctx->regs + offset); - break; - case 4: - __raw_writel(*(u32 *)val, ctx->regs + offset); - break; -#ifdef CONFIG_64BIT - case 8: - __raw_writeq(*(u64 *)val, ctx->regs + offset); - break; -#endif - default: - /* Should be caught by regmap_mmio_check_config */ - BUG(); - } - val_size -= ctx->val_bytes; - val += ctx->val_bytes; - offset += ctx->val_bytes; - } + ctx->reg_write(ctx, reg, val); if (!IS_ERR(ctx->clk)) clk_disable(ctx->clk); @@ -161,59 +139,56 @@ static int regmap_mmio_gather_write(void *context, return 0; } -static int regmap_mmio_write(void *context, const void *data, size_t count) +static unsigned int regmap_mmio_read8(struct regmap_mmio_context *ctx, + unsigned int reg) { - struct regmap_mmio_context *ctx = context; - unsigned int offset = ctx->reg_bytes + ctx->pad_bytes; + return readb(ctx->regs + reg); +} + +static unsigned int regmap_mmio_read16le(struct regmap_mmio_context *ctx, + unsigned int reg) +{ + return readw(ctx->regs + reg); +} + +static unsigned int regmap_mmio_read16be(struct regmap_mmio_context *ctx, + unsigned int reg) +{ + return ioread16be(ctx->regs + reg); +} + +static unsigned int regmap_mmio_read32le(struct regmap_mmio_context *ctx, + unsigned int reg) +{ + return readl(ctx->regs + reg); +} - regmap_mmio_count_check(count, offset); +static unsigned int regmap_mmio_read32be(struct regmap_mmio_context *ctx, + unsigned int reg) +{ + return ioread32be(ctx->regs + reg); +} - return regmap_mmio_gather_write(context, data, ctx->reg_bytes, - data + offset, count - offset); +#ifdef CONFIG_64BIT +static unsigned int regmap_mmio_read64le(struct regmap_mmio_context *ctx, + unsigned int reg) +{ + return readq(ctx->regs + reg); } +#endif -static int regmap_mmio_read(void *context, - const void *reg, size_t reg_size, - void *val, size_t val_size) +static int regmap_mmio_read(void *context, unsigned int reg, unsigned int *val) { struct regmap_mmio_context *ctx = context; - unsigned int offset; int ret; - regmap_mmio_regsize_check(reg_size); - if (!IS_ERR(ctx->clk)) { ret = clk_enable(ctx->clk); if (ret < 0) return ret; } - offset = regmap_mmio_get_offset(reg, reg_size); - - while (val_size) { - switch (ctx->val_bytes) { - case 1: - *(u8 *)val = __raw_readb(ctx->regs + offset); - break; - case 2: - *(u16 *)val = __raw_readw(ctx->regs + offset); - break; - case 4: - *(u32 *)val = __raw_readl(ctx->regs + offset); - break; -#ifdef CONFIG_64BIT - case 8: - *(u64 *)val = __raw_readq(ctx->regs + offset); - break; -#endif - default: - /* Should be caught by regmap_mmio_check_config */ - BUG(); - } - val_size -= ctx->val_bytes; - val += ctx->val_bytes; - offset += ctx->val_bytes; - } + *val = ctx->reg_read(ctx, reg); if (!IS_ERR(ctx->clk)) clk_disable(ctx->clk); @@ -232,14 +207,11 @@ static void regmap_mmio_free_context(void *context) kfree(context); } -static struct regmap_bus regmap_mmio = { +static const struct regmap_bus regmap_mmio = { .fast_io = true, - .write = regmap_mmio_write, - .gather_write = regmap_mmio_gather_write, - .read = regmap_mmio_read, + .reg_write = regmap_mmio_write, + .reg_read = regmap_mmio_read, .free_context = regmap_mmio_free_context, - .reg_format_endian_default = REGMAP_ENDIAN_NATIVE, - .val_format_endian_default = REGMAP_ENDIAN_NATIVE, }; static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, @@ -265,24 +237,71 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, if (config->reg_stride < min_stride) return ERR_PTR(-EINVAL); - switch (config->reg_format_endian) { - case REGMAP_ENDIAN_DEFAULT: - case REGMAP_ENDIAN_NATIVE: - break; - default: - return ERR_PTR(-EINVAL); - } - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) return ERR_PTR(-ENOMEM); ctx->regs = regs; ctx->val_bytes = config->val_bits / 8; - ctx->reg_bytes = config->reg_bits / 8; - ctx->pad_bytes = config->pad_bits / 8; ctx->clk = ERR_PTR(-ENODEV); + switch (config->reg_format_endian) { + case REGMAP_ENDIAN_DEFAULT: + case REGMAP_ENDIAN_LITTLE: +#ifdef __LITTLE_ENDIAN + case REGMAP_ENDIAN_NATIVE: +#endif + switch (config->val_bits) { + case 8: + ctx->reg_read = regmap_mmio_read8; + ctx->reg_write = regmap_mmio_write8; + break; + case 16: + ctx->reg_read = regmap_mmio_read16le; + ctx->reg_write = regmap_mmio_write16le; + break; + case 32: + ctx->reg_read = regmap_mmio_read32le; + ctx->reg_write = regmap_mmio_write32le; + break; +#ifdef CONFIG_64BIT + case 64: + ctx->reg_read = regmap_mmio_read64le; + ctx->reg_write = regmap_mmio_write64le; + break; +#endif + default: + ret = -EINVAL; + goto err_free; + } + break; + case REGMAP_ENDIAN_BIG: +#ifdef __BIG_ENDIAN + case REGMAP_ENDIAN_NATIVE: +#endif + switch (config->val_bits) { + case 8: + ctx->reg_read = regmap_mmio_read8; + ctx->reg_write = regmap_mmio_write8; + break; + case 16: + ctx->reg_read = regmap_mmio_read16be; + ctx->reg_write = regmap_mmio_write16be; + break; + case 32: + ctx->reg_read = regmap_mmio_read32be; + ctx->reg_write = regmap_mmio_write32be; + break; + default: + ret = -EINVAL; + goto err_free; + } + break; + default: + ret = -EINVAL; + goto err_free; + } + if (clk_id == NULL) return ctx; -- 2.7.0

1 0

[alsa-devel] [PATCH 1/2] regmap: Return an error if a caller attempts to do an unsupported raw read
by Mark Brown 22 Feb '16

22 Feb '16

regmaps without raw I/O access can't implement raw I/O operations, return an error if someone tries to do that rather than crashing. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/base/regmap/regmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 343263449aff..e2f68807d970 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -2255,6 +2255,9 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val, WARN_ON(!map->bus); + if (!map->bus || !map->bus->read) + return -EINVAL; + range = _regmap_range_lookup(map, reg); if (range) { ret = _regmap_select_page(map, &reg, range, -- 2.7.0.rc3

3 7

[alsa-devel] Applied "regmap: cache: Fall back to register by register read for cache defaults" to the asoc tree
by Mark Brown 22 Feb '16

22 Feb '16

The patch regmap: cache: Fall back to register by register read for cache defaults has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3245d460a1eb55b5c3ca31dde7b5c5ac71546edf Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Tue, 2 Feb 2016 10:16:51 -0200 Subject: [PATCH] regmap: cache: Fall back to register by register read for cache defaults If we are unable to read the cache defaults for a regmap then fall back on attempting to read them word by word. This is going to be painfully slow for large regmaps but might be adequate for smaller ones. Signed-off-by: Mark Brown <broonie(a)kernel.org> [maciej: Use cache_bypass around read and skipping of unreadable regs] Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> Tested-by: Fabio Estevam <fabio.estevam(a)nxp.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/base/regmap/regcache.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 348be3a..cccceb5 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -30,7 +30,7 @@ static int regcache_hw_init(struct regmap *map) int i, j; int ret; int count; - unsigned int val; + unsigned int reg, val; void *tmp_buf; if (!map->num_reg_defaults_raw) @@ -67,27 +67,46 @@ static int regcache_hw_init(struct regmap *map) ret = regmap_raw_read(map, 0, tmp_buf, map->num_reg_defaults_raw); map->cache_bypass = cache_bypass; - if (ret < 0) - goto err_cache_free; - - map->reg_defaults_raw = tmp_buf; - map->cache_free = 1; + if (ret == 0) { + map->reg_defaults_raw = tmp_buf; + map->cache_free = 1; + } else { + kfree(tmp_buf); + } } /* fill the reg_defaults */ for (i = 0, j = 0; i < map->num_reg_defaults_raw; i++) { - if (regmap_volatile(map, i * map->reg_stride)) + reg = i * map->reg_stride; + + if (!regmap_readable(map, reg)) continue; - val = regcache_get_val(map, map->reg_defaults_raw, i); - map->reg_defaults[j].reg = i * map->reg_stride; + + if (regmap_volatile(map, reg)) + continue; + + if (map->reg_defaults_raw) { + val = regcache_get_val(map, map->reg_defaults_raw, i); + } else { + bool cache_bypass = map->cache_bypass; + + map->cache_bypass = true; + ret = regmap_read(map, reg, &val); + map->cache_bypass = cache_bypass; + if (ret != 0) { + dev_err(map->dev, "Failed to read %d: %d\n", + reg, ret); + goto err_free; + } + } + + map->reg_defaults[j].reg = reg; map->reg_defaults[j].def = val; j++; } return 0; -err_cache_free: - kfree(tmp_buf); err_free: kfree(map->reg_defaults); -- 2.7.0

1 0

[alsa-devel] [PATCH 3/3] ASoC: fsl_ssi: remove register defaults
by Maciej S. Szmigiero 22 Feb '16

22 Feb '16

There is no guarantee that on fsl_ssi module load SSI registers will have their power-on-reset values. In fact, if the driver is reloaded the values in registers will be whatever they were set to previously. This fixes hard lockup on fsl_ssi module reload, at least in AC'97 mode. Fixes: 05cf237972fe ("ASoC: fsl_ssi: Add driver suspend and resume to support MEGA Fast") Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- sound/soc/fsl/fsl_ssi.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 40dfd8a36484..f6ef7d64acb3 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -112,20 +112,6 @@ struct fsl_ssi_rxtx_reg_val { struct fsl_ssi_reg_val tx; }; -static const struct reg_default fsl_ssi_reg_defaults[] = { - {CCSR_SSI_SCR, 0x00000000}, - {CCSR_SSI_SIER, 0x00003003}, - {CCSR_SSI_STCR, 0x00000200}, - {CCSR_SSI_SRCR, 0x00000200}, - {CCSR_SSI_STCCR, 0x00040000}, - {CCSR_SSI_SRCCR, 0x00040000}, - {CCSR_SSI_SACNT, 0x00000000}, - {CCSR_SSI_STMSK, 0x00000000}, - {CCSR_SSI_SRMSK, 0x00000000}, - {CCSR_SSI_SACCEN, 0x00000000}, - {CCSR_SSI_SACCDIS, 0x00000000}, -}; - static bool fsl_ssi_readable_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -190,8 +176,6 @@ static const struct regmap_config fsl_ssi_regconfig = { .val_bits = 32, .reg_stride = 4, .val_format_endian = REGMAP_ENDIAN_NATIVE, - .reg_defaults = fsl_ssi_reg_defaults, - .num_reg_defaults = ARRAY_SIZE(fsl_ssi_reg_defaults), .readable_reg = fsl_ssi_readable_reg, .volatile_reg = fsl_ssi_volatile_reg, .precious_reg = fsl_ssi_precious_reg,

4 27

[alsa-devel] [PATCH v2] ASoC: wm9713: fix regmap free path
by Robert Jarzmik 22 Feb '16

22 Feb '16

In the conversion to regmap, I assumed that the 2 following functions was working symetrically: - snd_soc_codec_init_regmap() - snd_soc_codec_exit_regmap(codec) As a mater of fact with the current code the regmap is freed twice because of the devm_() call: (mutex_lock) from (debugfs_remove_recursive+0x50/0x1d0) (debugfs_remove_recursive) from (regmap_debugfs_exit+0x1c/0xd4) (regmap_debugfs_exit) from (regmap_exit+0x28/0xc8) (regmap_exit) from (release_nodes+0x18c/0x204) (release_nodes) from (device_release+0x18/0x90) (device_release) from (kobject_release+0x90/0x1bc) (kobject_release) from (wm9713_soc_remove+0x1c/0x24) (wm9713_soc_remove) from (soc_remove_component+0x50/0x7c) (soc_remove_component) from (soc_remove_dai_links+0x118/0x228) (soc_remove_dai_links) from (snd_soc_register_card+0x4e4/0xdd4) (snd_soc_register_card) from (devm_snd_soc_register_card+0x34/0x70) Fix this by removing the doubled regmap free. Fixes: 700dadfefc3d ASoC: wm9713: convert to regmap Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- Since v1: fix the diff second hunk, god knows where it came from. --- sound/soc/codecs/wm9713.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 79e143625ac3..dd31a5207527 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1230,7 +1230,6 @@ static int wm9713_soc_remove(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - snd_soc_codec_exit_regmap(codec); snd_soc_free_ac97_codec(wm9713->ac97); return 0; } -- 2.1.4

3 3

[alsa-devel] [alsa-lib][PATCH] control: initialize element channel values according to identification number at adding a new element
by Takashi Sakamoto 21 Feb '16

21 Feb '16

In ALSA control core, there're two ways to identify elements. One is by numid. Another is by name/index. The former way is lighter than the latter way. In control API, after adding elements by snd_ctl_elem_add_integer() and snd_ctl_elem_add_integer64(), these functions initialize value of each channel. When executing this operation, used ID information is still given by applications. Although, in this time, the element can be identified according to numid. This commit uses the numid instead of name/index pair. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/control/control.c b/src/control/control.c index a44ae96..8a5d530 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -292,7 +292,7 @@ int snd_ctl_elem_add_integer(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, if (err < 0) return err; snd_ctl_elem_value_alloca(&val); - val->id = *id; + val->id = info->id; for (i = 0; i < count; i++) val->value.integer.value[i] = min; err = ctl->ops->element_write(ctl, val); @@ -330,7 +330,7 @@ int snd_ctl_elem_add_integer64(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, if (err < 0) return err; snd_ctl_elem_value_alloca(&val); - val->id = *id; + val->id = info->id; for (i = 0; i < count; i++) val->value.integer64.value[i] = min; err = ctl->ops->element_write(ctl, val); -- 2.5.0

2 1

[alsa-devel] [alsa-lib][PATCH] control: fulfill a description about element type with integer64
by Takashi Sakamoto 21 Feb '16

21 Feb '16

In UAPI of asound.h, there're 6 types of control element; boolean, integer, enumerated, bytes, iec958 and integer64 (The none type seems to be added to start the value at non-zero). Although, current description in alsa-lib has a lack of integer64 type. This commit fulfil the type. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/control/control.c b/src/control/control.c index 70d168d..a44ae96 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -35,7 +35,7 @@ also interface notifying about control and structure changes. \section control_general_overview General overview -The primitive controls can be integer, boolean, enumerators, bytes +The primitive controls can be integer, inter64, boolean, enumerators, bytes and IEC958 structure. */ -- 2.5.0

2 1

[alsa-devel] [PATCH 1/4] ASoC: wm_adsp: Avoid narrow race condition on compr pointer
by Charles Keepax 20 Feb '16

20 Feb '16

There is a very small window between then wm_adsp_compr_free gets call and when the DSP is actually powered down. If we get an IRQ from the DSP in this window then the wm_adsp_compr pointer will be NULL. This patch adds a check for this into the IRQ handler to avoid any issues when this happens. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index ed90e12..00a7d68 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -2857,7 +2857,7 @@ int wm_adsp_compr_handle_irq(struct wm_adsp *dsp) goto out; } - if (compr->stream) + if (compr && compr->stream) snd_compr_fragment_elapsed(compr->stream); out: -- 2.1.4

2 7

[alsa-devel] [PATCH] ASoC: max98926: Constify max98926_reg and max98926_regmap
by Axel Lin 20 Feb '16

20 Feb '16

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/max98926.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index 5245e10..8d14ada 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -40,7 +40,7 @@ static const char *const max98926_hpf_cutoff_txt[] = { "200Hz", "400Hz", "800Hz", }; -static struct reg_default max98926_reg[] = { +static const struct reg_default max98926_reg[] = { { 0x0B, 0x00 }, /* IRQ Enable0 */ { 0x0C, 0x00 }, /* IRQ Enable1 */ { 0x0D, 0x00 }, /* IRQ Enable2 */ @@ -506,7 +506,7 @@ static struct snd_soc_codec_driver soc_codec_dev_max98926 = { .num_dapm_widgets = ARRAY_SIZE(max98926_dapm_widgets), }; -static struct regmap_config max98926_regmap = { +static const struct regmap_config max98926_regmap = { .reg_bits = 8, .val_bits = 8, .max_register = MAX98926_VERSION, -- 2.1.4

3 2

[alsa-devel] [PATCH 1/3] ASoC: max9867: Add CONFIG_SND_SOC_MAX9867 to build
by Axel Lin 20 Feb '16

20 Feb '16

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 621c0a3..185a712 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -283,6 +283,7 @@ obj-$(CONFIG_SND_SOC_MAX98088) += snd-soc-max98088.o obj-$(CONFIG_SND_SOC_MAX98090) += snd-soc-max98090.o obj-$(CONFIG_SND_SOC_MAX98095) += snd-soc-max98095.o obj-$(CONFIG_SND_SOC_MAX98357A) += snd-soc-max98357a.o +obj-$(CONFIG_SND_SOC_MAX9867) += snd-soc-max9867.o obj-$(CONFIG_SND_SOC_MAX98925) += snd-soc-max98925.o obj-$(CONFIG_SND_SOC_MAX98926) += snd-soc-max98926.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o -- 2.1.4

3 6

[alsa-devel] [PATCH] ASoC: wm9713: fix regmap free path
by Robert Jarzmik 20 Feb '16

20 Feb '16

In the conversion to regmap, I assumed that the 2 following functions was working symetrically: - snd_soc_codec_init_regmap() - snd_soc_codec_exit_regmap(codec) As a mater of fact with the current code the regmap is freed twice because of the devm_() call: (mutex_lock) from (debugfs_remove_recursive+0x50/0x1d0) (debugfs_remove_recursive) from (regmap_debugfs_exit+0x1c/0xd4) (regmap_debugfs_exit) from (regmap_exit+0x28/0xc8) (regmap_exit) from (release_nodes+0x18c/0x204) (release_nodes) from (device_release+0x18/0x90) (device_release) from (kobject_release+0x90/0x1bc) (kobject_release) from (wm9713_soc_remove+0x1c/0x24) (wm9713_soc_remove) from (soc_remove_component+0x50/0x7c) (soc_remove_component) from (soc_remove_dai_links+0x118/0x228) (soc_remove_dai_links) from (snd_soc_register_card+0x4e4/0xdd4) (snd_soc_register_card) from (devm_snd_soc_register_card+0x34/0x70) Fix this by removing the doubled regmap free. Fixes: 700dadfefc3d ASoC: wm9713: convert to regmap Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- sound/soc/codecs/wm9713.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 79e143625ac3..0242b7dcc1bb 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1230,7 +1230,6 @@ static int wm9713_soc_remove(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - snd_soc_codec_exit_regmap(codec); snd_soc_free_ac97_codec(wm9713->ac97); return 0; } @@ -1272,3 +1271,2 @@ static int wm9713_remove(struct platform_device *pdev) return 0; } -- 2.1.4

2 1

[alsa-devel] [PATCH 0/11] ASoC: rsnd: cleanup SSI multi mode and sequence
by Kuninori Morimoto 20 Feb '16

20 Feb '16

Hi Mark Current rsnd driver is supporting many features, and now we are confirming these register settings sequence. These patches fixup not good sequence (and bug) Kuninori Morimoto (11): ASoC: rsnd: rename RSND_DVC_CHANNELS to RSND_MAX_CHANNELS ASoC: rsnd: setup SRC_ROUTE_MODE0 before SRC_SRCIR ASoC: rsnd: indicates status failed SSI ASoC: rsnd: SSI function parameter uses "mod" instead of "ssi" ASoC: rsnd: fixup forever loop bug on SSI ASoC: rsnd: add missing .irq callback for DMA ASoC: rsnd: tidyup SSI init/start sequence ASoC: rsnd: Parent SSI attach is not needed if not clock master ASoC: rsnd: move rsnd_ssi_irq() position ASoC: rsnd: judge multi SSI in runtime ASoC: rsnd: judge work SSI in runtime sound/soc/sh/rcar/core.c | 4 ++-- sound/soc/sh/rcar/dvc.c | 6 ++--- sound/soc/sh/rcar/rsnd.h | 6 ++--- sound/soc/sh/rcar/src.c | 3 ++- sound/soc/sh/rcar/ssi.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- sound/soc/sh/rcar/ssiu.c | 6 ++--- 6 files changed, 126 insertions(+), 65 deletions(-)

2 22

[alsa-devel] [PATCH v5 00/14] ASoC: hdac_hdmi: Add DP & notification support
by Subhransu S. Prusty 20 Feb '16

20 Feb '16

This patch series adds DP audio and hotplug notification support. In skylake platform the DP is on a different port which is not enabled by default. A vendor widget is programmed to enable playback on all ports. This also enables all the converters. Codec Dais, widgets, graph are now created dynamically based on the nodes enumerated, thus removing the hardcoding. Mux controls are used to establish routing stream to a specific port. For DP audio support, infoframe needs to be different. Based on ELD queried we either pack HDMI or DP infoframe. Also with this series, Jack notification support is added and Jack event is reported to userspace as is done in case of legacy driver. Few fixes are added to check for possible memory leak, reconfiguring register during resume from D3 etc. The 8th patch is adding a small macro for getting connection type in drm header. It is reviewed by drm folks, CCed them. Please merge it through sound trees. Changes in v5: - Added more comments and reworded some commit messages - Jack reporting support to user space added - Fix to check for possible memory leak in hw_params - Fix not to fail in dai startup to make userland APIs happy Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter(a)intel.com> Jeeja KP (2): ASoC: hdac_hdmi: Add jack reporting ASoC: hdac_hdmi: Add PM support Ramesh Babu (1): ASoC: hdac_hdmi: Fix to keep codec power active during enumeration. Subhransu S. Prusty (11): ASoC: hdac_hdmi: Add hotplug notification and read eld ASoC: hdac_hdmi: Apply constraints based on ELD ASoC: hdac_hdmi: Enable DP1.2 and all converters/pins ASoC: hdac_hdmi: create dais based on number of cvts ASoC: hdac_hdmi: Create widget/route based on nodes enumerated ASoC: hdac_hdmi: Enable playback on all enumerated ports drm/edid: Add API to help find connection type ASoC: hdac_hdmi: Add infoframe support for dp audio ASoC: hdac_hdmi: Fix possible memory leak in hw_params ASoC: hdac_hdmi: Don't fail in dai startup to make userland happy ASoC: hdac_hdmi: Fix to reconfigure registers in runtime resume include/drm/drm_edid.h | 12 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdac_hdmi.c | 1197 +++++++++++++++++++++++++++++++++++++----- sound/soc/codecs/hdac_hdmi.h | 6 + 4 files changed, 1094 insertions(+), 122 deletions(-) create mode 100644 sound/soc/codecs/hdac_hdmi.h -- 1.9.1

4 25

[alsa-devel] [PATCH v1 00/14] ASoC: qcom: Add capture support.
by Srinivas Kandagatla 20 Feb '16

20 Feb '16

LPASS IP on QCOM SOC supports both Playback and capture via I2S, but this feature is missing in existing code. This patchset aims at adding capture support to lpass IP. First few patches in this series does cleanup the driver to make easy to add capture support. Most of these patches are acked by Kenneth. These patches are tested on DB410C with Headset Mic, secondary mic. Thanks, srini Changes since RFC: - made patches bisectable, reported by 0day testing - merged two patches as suggested by Kenneth - used corect device for snd_dma alloc/free apis, spotted by Kenneth - renamed LPAIF_I2SCTL_MICMODE_QUAD02 to LPAIF_I2SCTL_MICMODE_QUAD23, spotted by Kenneth. - Fixed minor issues suggested by Kenneth. Srinivas Kandagatla (14): ASoC: qcom: use snd_dma_alloc/free* apis ASoC: qcom: add wrdma register details to lpass_variant ASoC: qcom: rename rdmactl_audif_start to dmactrl_audif_start ASoC: qcom: pass direction to dma allocation ASoC: qcom: ipq806x: add error in dma allocation. ASoC: qcom: rename rdma_ch_bit_map to dma_ch_bit_map ASoC: qcom: ipq806x: add wrdma related register offsets ASoC: qcom: apq8016: add wrdma support ASoC: qcom: add mic related i2s control register defines ASoC: qcom: add wrdma register definitions ASoC: qcom: add generic bit masks for RDMA and WRDMA ASoC: qcom: apq8016: set the correct max register for regmap ASoC: qcom: add mic support ASoC: qcom: apq8016-sbc: add mic support sound/soc/qcom/apq8016_sbc.c | 10 +- sound/soc/qcom/lpass-apq8016.c | 31 +++-- sound/soc/qcom/lpass-cpu.c | 146 +++++++++++++++++------ sound/soc/qcom/lpass-ipq806x.c | 11 +- sound/soc/qcom/lpass-lpaif-reg.h | 116 +++++++++++++------ sound/soc/qcom/lpass-platform.c | 243 +++++++++++++++++++++++---------------- sound/soc/qcom/lpass.h | 10 +- 7 files changed, 390 insertions(+), 177 deletions(-) -- 1.9.1

3 26

[alsa-devel] [PATCH v3 00/14] ASoC: qcom: Add capture support.
by Srinivas Kandagatla 20 Feb '16

20 Feb '16

LPASS IP on QCOM SOC supports both Playback and capture via I2S, but this feature is missing in existing code. This patchset aims at adding capture support to lpass IP. First few patches in this series does cleanup the driver to make easy to add capture support. All these patches are acked by Kenneth. These patches are tested on DB410C with Headset Mic, secondary mic. Thanks, srini Changes since v1/v2: - Fixed patch version number. - renamed rdma_port to dma_port in patch 3, as suggested by Kenneth. - fixed correct device for snd_dma_alloc/free as suggested by Kenneth in patch 13. Changes since RFC: - made patches bisectable, reported by 0day testing - merged two patches as suggested by Kenneth - used corect device for snd_dma alloc/free apis, spotted by Kenneth - renamed LPAIF_I2SCTL_MICMODE_QUAD02 to LPAIF_I2SCTL_MICMODE_QUAD23, spotted by Kenneth. - Fixed minor issues suggested by Kenneth. Srinivas Kandagatla (14): ASoC: qcom: use snd_dma_alloc/free* apis ASoC: qcom: add wrdma register details to lpass_variant ASoC: qcom: rename rdmactl_audif_start to dmactrl_audif_start ASoC: qcom: pass direction to dma allocation ASoC: qcom: ipq806x: add error in dma allocation. ASoC: qcom: rename rdma_ch_bit_map to dma_ch_bit_map ASoC: qcom: ipq806x: add wrdma related register offsets ASoC: qcom: apq8016: add wrdma support ASoC: qcom: add mic related i2s control register defines ASoC: qcom: add wrdma register definitions ASoC: qcom: add generic bit masks for RDMA and WRDMA ASoC: qcom: apq8016: set the correct max register for regmap ASoC: qcom: add mic support ASoC: qcom: apq8016-sbc: add mic support sound/soc/qcom/apq8016_sbc.c | 10 +- sound/soc/qcom/lpass-apq8016.c | 31 +++-- sound/soc/qcom/lpass-cpu.c | 146 ++++++++++++++++++----- sound/soc/qcom/lpass-ipq806x.c | 11 +- sound/soc/qcom/lpass-lpaif-reg.h | 116 +++++++++++++------ sound/soc/qcom/lpass-platform.c | 244 +++++++++++++++++++++++---------------- sound/soc/qcom/lpass.h | 10 +- 7 files changed, 391 insertions(+), 177 deletions(-) -- 1.9.1

2 17

[alsa-devel] [PATCH RFC 00/15] ASoC: qcom: Add capture support.
by Srinivas Kandagatla 20 Feb '16

20 Feb '16

LPASS IP on QCOM SOC supports both Playback and capture via I2S, but this feature is missing in existing code. This patchset aims at adding capture support to lpass IP. First few patches in this series does cleanup the driver to make easy to add capture support. These patches are tested on DB410C with Headset Mic. Thanks, srini Srinivas Kandagatla (15): ASoC: qcom: use snd_dma_alloc/free* apis ASoC: qcom: add wrdma register details to lpass_variant ASoC: qcom: rename rdmactl_audif_start to dmactrl_audif_start ASoC: qcom: pass direction to dma allocation ASoC: qcom: ipq806x: add error in dma allocation. ASoC: qcom: ipq806x: add wrdma related register offsets ASoC: qcom: add mic related i2s control register defines ASoC: qcom: add wrdma dma channel start ASoC: qcom: rename rdma_ch_bit_map to dma_ch_bit_map ASoC: qcom: apq8016: add wrdma support ASoC: qcom: add wrdma register definations ASoC: qcom: add generic bit masks for RDMA and WRDMA ASoC: qcom: apq8016: set the correct max register for regmap ASoC: qcom: apq8016-sbc: add mic support ASoC: qcom: add mic support sound/soc/qcom/apq8016_sbc.c | 10 +- sound/soc/qcom/lpass-apq8016.c | 31 +++-- sound/soc/qcom/lpass-cpu.c | 146 +++++++++++++++++------ sound/soc/qcom/lpass-ipq806x.c | 11 +- sound/soc/qcom/lpass-lpaif-reg.h | 118 +++++++++++++------ sound/soc/qcom/lpass-platform.c | 243 +++++++++++++++++++++++---------------- sound/soc/qcom/lpass.h | 10 +- 7 files changed, 392 insertions(+), 177 deletions(-) -- 1.9.1

3 45

[alsa-devel] [PATCH] ASoC: cht_bsw_rt5645: Enable jack detection
by Carlo Caione 20 Feb '16

20 Feb '16

From: Carlo Caione <carlo(a)endlessm.com> Add missing DAPM pins and enable jack detection on those pins for Cherrytrail and Braswell. Signed-off-by: Carlo Caione <carlo(a)endlessm.com> --- sound/soc/intel/boards/cht_bsw_rt5645.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index e6cf800..c7af271 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -147,6 +147,17 @@ static const struct snd_kcontrol_new cht_mc_controls[] = { SOC_DAPM_PIN_SWITCH("Ext Spk"), }; +static struct snd_soc_jack_pin cht_bsw_jack_pins[] = { + { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, + }, +}; + static int cht_aif1_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -202,9 +213,9 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) else jack_type = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE; - ret = snd_soc_card_jack_new(runtime->card, "Headset Jack", + ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, &ctx->jack, - NULL, 0); + cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins)); if (ret) { dev_err(runtime->dev, "Headset jack creation failed %d\n", ret); return ret; -- 1.9.1

2 1

[alsa-devel] [PATCH v4 0/2] ASoC: Add SPDIF support for Allwinner SoCs
by codekipper＠gmail.com 20 Feb '16

20 Feb '16

From: Marcus Cooper <codekipper(a)gmail.com> This patch set adds support for the Allwinner SPDIF transceiver. For now just the SPDIF transmitter has been tested on a Mele A2000(A10) and a Itead Ibox(A20). In order for this patch set to be functional we require an audio clock patch which will be delivered separately. For those that are interested I've pushed the patches here with all the required changes to get SPDIF audio out of the device. https://github.com/codekipper/linux-sunxi/commits/spdif_delivery Thanks in advance, CK --- Changes since v3: - removed code required for spdif capture - added disable/enable of apb clk to suspend/resume. - removed unnecessary dt checks in probe - fixed error conditions in probe/resume - modified pm_runtime functionality(confirmed driver worked with PM disabled). - removed .owner from platform driver - renamed bindings file Changes since v2: - removed sunxi-machine-spdif and replaced with simple audio card - removed untested compatibilities from device tree documentation - added pm_runtime and remove shutdown - removed pll2 as it's the parent of the spdif clock - rename clk to spdif_clk - removed enabling of mclk output - removed interrupts status being cleared as it's not being used - use default fifo settings for now - fixed alignments for wrapped lines Changes since v1: - Moved sunxi-machine-spdif.c to separate patch - replaced sunxi in naming scheme with sun4i in the sun4i-spdif driver. - split tx controller into separate enable/disable functions - moved setclk and setfmt functionality into hw params - added support for mono signals. - cleaned up probe clock set up. - removed all writes to transmit status registers. - removed of_id - removed power management code. - Added support for more rates. Marcus Cooper (2): dt-bindings: sunxi :add sun4i SPDIF transceiver ASoC: sunxi: Add support for the SPDIF block .../bindings/sound/sunxi,sun4i-spdif.txt | 39 ++ sound/soc/sunxi/Kconfig | 8 + sound/soc/sunxi/Makefile | 1 + sound/soc/sunxi/sun4i-spdif.c | 561 +++++++++++++++++++++ 4 files changed, 609 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt create mode 100644 sound/soc/sunxi/sun4i-spdif.c -- 2.7.0

4 5

[alsa-devel] [PATCH] SoC: cht_bsw_rt5645: Fix writing to string literal
by Carlo Caione 20 Feb '16

20 Feb '16

From: Carlo Caione <carlo(a)endlessm.com> We cannot use strcpy() to write to a const char * location. This is causing a 'BUG: unable to handle kernel paging request' error at boot when using the cht-bsw-rt5645 driver. With this patch we also fix a wrong indexing in the driver where the codec_name of the wrong dai_link is being overwritten. Signed-off-by: Carlo Caione <carlo(a)endlessm.com> --- sound/soc/intel/atom/sst-atom-controls.h | 1 + sound/soc/intel/boards/cht_bsw_rt5645.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst-atom-controls.h b/sound/soc/intel/atom/sst-atom-controls.h index e011311..6f88d1c 100644 --- a/sound/soc/intel/atom/sst-atom-controls.h +++ b/sound/soc/intel/atom/sst-atom-controls.h @@ -30,6 +30,7 @@ enum { MERR_DPCM_AUDIO = 0, MERR_DPCM_DEEP_BUFFER, MERR_DPCM_COMPR, + MERR_DPCM_BE, }; /* define a bit for each mixer input */ diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index e6cf800..89b4c032 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -282,7 +282,7 @@ static struct snd_soc_dai_link cht_dailink[] = { }, /* CODEC<->CODEC link */ /* back ends */ - { + [MERR_DPCM_BE] = { .name = "SSP2-Codec", .be_id = 1, .cpu_dai_name = "ssp2-port", @@ -357,7 +357,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) card->dev = &pdev->dev; sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id); /* set correct codec name */ - strcpy((char *)card->dai_link[2].codec_name, codec_name); + card->dai_link[MERR_DPCM_BE].codec_name = kstrdup(codec_name, GFP_KERNEL); snd_soc_card_set_drvdata(card, drv); ret_val = devm_snd_soc_register_card(&pdev->dev, card); if (ret_val) { -- 1.9.1

3 3

[alsa-devel] [PATCH] fireworks: serialize transactions to update connections at bus reset
by Takashi Sakamoto 20 Feb '16

20 Feb '16

In IEC 61883-1, at bus-reset, applications can continue isochronous streaming by updating connections. In ALSA fireworks driver, the operation is executed in 'update' handler for bus driver. The connection resources are also changed in process contexts of PCM/MIDI applications. Therefore, bus-reset handling has race condition against connection. Current ALSA fireworks driver has a bug for the condition. This commit fixes the bug, by expand critical section with mutex. As a result, connection updating operation in bus-reset handler and connection changing operation in process context are serialized. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/fireworks/fireworks.c | 3 +++ sound/firewire/fireworks/fireworks_stream.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index d5b19bc..8f27b67 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -301,7 +301,10 @@ static void efw_update(struct fw_unit *unit) struct snd_efw *efw = dev_get_drvdata(&unit->device); snd_efw_transaction_bus_reset(efw->unit); + + mutex_lock(&efw->mutex); snd_efw_stream_update_duplex(efw); + mutex_unlock(&efw->mutex); } static void efw_remove(struct fw_unit *unit) diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c index 968a40a..425db8d 100644 --- a/sound/firewire/fireworks/fireworks_stream.c +++ b/sound/firewire/fireworks/fireworks_stream.c @@ -313,12 +313,10 @@ void snd_efw_stream_stop_duplex(struct snd_efw *efw) void snd_efw_stream_update_duplex(struct snd_efw *efw) { - if ((cmp_connection_update(&efw->out_conn) < 0) || - (cmp_connection_update(&efw->in_conn) < 0)) { - mutex_lock(&efw->mutex); + if (cmp_connection_update(&efw->out_conn) < 0 || + cmp_connection_update(&efw->in_conn) < 0) { stop_stream(efw, &efw->rx_stream); stop_stream(efw, &efw->tx_stream); - mutex_unlock(&efw->mutex); } else { amdtp_stream_update(&efw->rx_stream); amdtp_stream_update(&efw->tx_stream); -- 2.5.0

2 2

[alsa-devel] [PATCH 0/4] ALSA: bebob: give up updating streams at bus reset
by Takashi Sakamoto 20 Feb '16

20 Feb '16

Hi, This patchset is to simplify codes of ALSA bebob driver by giving up updating streams at bus reset. DM1000/DM1100/DM1500 chipsets have a quirk to transfer packets with discontinuous value in 'dbc' field of CIP header. This is against packet streaming protocol (IEC 61883-1/6). In the specification, units should continue packet streaming during 1 seconds after bus reset. During this period, connections are updated. Else, the streaming stops. The discontinuity causes firewire-lib module (packet streaming layer) to stop streaming immediately. This is done far earlier than executing bus-reset handler. Therefore, updating streams at the bus-reset handler has no meaning. This patchset will have little impacts for userspace applications because most users won't update IEEE 1394 bus when playbacking/recording. And PCM substream recovery is still available. Regards Takashi Sakamoto (4): ALSA: bebob: simplify bus-reset handling ALSA: bebob: move mutex from function callee to callers ALSA: bebob: change type of substream counter from atomic_t to unsigned int ALSA: bebob: give up updating streams at bus reset handler sound/firewire/bebob/bebob.c | 21 ++++++++++---- sound/firewire/bebob/bebob.h | 5 +--- sound/firewire/bebob/bebob_midi.c | 16 +++++++--- sound/firewire/bebob/bebob_pcm.c | 28 +++++++++++++----- sound/firewire/bebob/bebob_stream.c | 58 +++---------------------------------- 5 files changed, 53 insertions(+), 75 deletions(-) -- 2.5.0

2 5

Re: [alsa-devel] Issues with ALSA:ice1724 sound cards on powerpc machines
by Julian Margetson 20 Feb '16

20 Feb '16

On 2/17/2016 2:29 PM, Julian Margetson wrote: > Hi > > Having an issue issue with ice1724 sound cards on powerpc motherboards. > Motherboards in question Acube Sam460ex . > The card appears as a valid device but there is no sound output on the > majority of boots of the computer. > Logs attached. > On the first set boot audio playback produced sound ok. > On the second set boot no sound was produce with audio playback > > > Regards > Julian Margetson > > > Issue also with A-Eon Cyrus powerpc motherboard .

1 0

[alsa-devel] [PATCH v6 0/2] ASoC: Add SPDIF support for Allwinner SoCs
by codekipper＠gmail.com 19 Feb '16

19 Feb '16

From: Marcus Cooper <codekipper(a)gmail.com> This patch set adds support for the Allwinner SPDIF transceiver. For now just the SPDIF transmitter has been tested on a Mele A2000(A10) and a Itead Ibox(A20). In order for this patch set to be functional we require an audio clock patch which will be delivered separately. For those that are interested I've pushed the patches here with all the required changes to get SPDIF audio out of the device. https://github.com/codekipper/linux-sunxi/commits/spdif_delivery Thanks in advance, CK --- Changes since v5: - fixed warning that had sneaked in.' Changes since v4: - corrected indentation issues - removed old macros - removed unnecessary enabling of apb clock Changes since v3: - removed code required for spdif capture - added disable/enable of apb clk to suspend/resume. - removed unnecessary dt checks in probe - fixed error conditions in probe/resume - modified pm_runtime functionality and confirmed that driver worked when PM was disabled. - removed .owner from platform driver - renamed bindings file Changes since v2: - removed sunxi-machine-spdif and replaced with simple audio card - removed untested compatibilities from device tree documentation - added pm_runtime and remove shutdown - removed pll2 as it's the parent of the spdif clock - rename clk to spdif_clk - removed enabling of mclk output - removed interrupts status being cleared as it's not being used - use default fifo settings for now - fixed alignments for wrapped lines Changes since v1: - Moved sunxi-machine-spdif.c to separate patch - replaced sunxi in naming scheme with sun4i in the sun4i-spdif driver. - split tx controller into separate enable/disable functions - moved setclk and setfmt functionality into hw params - added support for mono signals. - cleaned up probe clock set up. - removed all writes to transmit status registers. - removed of_id - removed power management code. - Added support for more rates. Marcus Cooper (2): dt-bindings: sunxi :add sun4i SPDIF transceiver ASoC: sunxi: Add support for the SPDIF block .../bindings/sound/sunxi,sun4i-spdif.txt | 39 ++ sound/soc/sunxi/Kconfig | 8 + sound/soc/sunxi/Makefile | 1 + sound/soc/sunxi/sun4i-spdif.c | 550 +++++++++++++++++++++ 4 files changed, 598 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt create mode 100644 sound/soc/sunxi/sun4i-spdif.c -- 2.7.1

3 6

[alsa-devel] [PATCH 0/2] ALSA: oxfw: implement retries for scs1x at transaction failure
by Takashi Sakamoto 19 Feb '16

19 Feb '16

Hi, Current ALSA oxfw driver has a TODO to retry IEEE 1394 asynchronous transactions when transaction failure occurs. This patchset is for it. Additionally, this patchset classifies reason of the failure and stop the retries to prevent from endless loop of scheduling work. Regards Takashi Sakamoto (2): ALSA: oxfw: retry MIDI transferring for scs1x at transaction failure ALSA: oxfw: discontinue MIDI substream for scs1x at transaction failure sound/firewire/oxfw/oxfw-scs1x.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) -- 2.5.0

2 11

[alsa-devel] [PATCH v7 0/9] ASoC: hdac_hdmi: Update to HDMI driver
by Subhransu S. Prusty 19 Feb '16

19 Feb '16

This is remaining patches of v6 and appended platform changes for enumerating HDMI codec Jeeja KP (1): ASoC: hdac_hdmi: Add PM support Ramesh Babu (1): ASoC: hdac_hdmi: Fix to keep codec power active during enumeration. Subhransu S. Prusty (6): ASoC: hdac_hdmi: Fix possible memory leak in hw_params ASoC: hdac_hdmi: Don't fail in dai startup to make userland happy ASoC: hdac_hdmi: Fix to reconfigure registers in runtime resume ASoC: hdac_hdmi: Fix to wait for D3 before powering off codec ASoC: Intel: Skylake: Fix possible memory corruption in codec dai dma params ASoC: Intel: Skylake: Add HDMI FE and BE cpu dais Vinod Koul (1): ASoC: Intel: Skylake: Add i915 enabling in skl probe sound/soc/codecs/hdac_hdmi.c | 178 +++++++++++++++++++++++++++++++------- sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/skl-pcm.c | 84 ++++++++++++++++-- sound/soc/intel/skylake/skl.c | 51 +++++++++++ 4 files changed, 275 insertions(+), 39 deletions(-) -- 1.9.1

2 16

[alsa-devel] [PATCH 0/4] Add I2S/ADV7511 audio support for ARC AXS10x boards.
by Carlos Palminha 19 Feb '16

19 Feb '16

ARC AXS10x platforms consist of a mainboard with several peripherals. One of those peripherals is an HDMI output port controlled by ADV7511 transmitter. This patch set adds audio for the ADV7511 transmitter and I2S audio for the AXS10x platform. Jose Abreu (4): drm/i2c/adv7511: Add audio support ARC: axs10x: Update defconfigs so that audio is enabled ASoC: dwc: Add I2S HDMI audio support using custom platform ARC: axs10x: Update defconfigs so that I2S is enabled arch/arc/boot/dts/axs10x_mb.dtsi | 20 +- arch/arc/configs/axs101_defconfig | 4 + arch/arc/configs/axs103_defconfig | 6 + arch/arc/configs/axs103_smp_defconfig | 6 + drivers/gpu/drm/i2c/Kconfig | 8 + drivers/gpu/drm/i2c/Makefile | 2 + drivers/gpu/drm/i2c/adv7511.c | 1024 --------------------------------- drivers/gpu/drm/i2c/adv7511.h | 41 ++ drivers/gpu/drm/i2c/adv7511_audio.c | 310 ++++++++++ drivers/gpu/drm/i2c/adv7511_core.c | 1005 ++++++++++++++++++++++++++++++++ include/sound/soc-dai.h | 1 + sound/soc/dwc/Kconfig | 1 + sound/soc/dwc/Makefile | 4 +- sound/soc/dwc/designware_i2s.c | 139 ++++- sound/soc/dwc/designware_pcm.c | 264 +++++++++ sound/soc/dwc/designware_pcm.h | 21 + 16 files changed, 1813 insertions(+), 1043 deletions(-) delete mode 100644 drivers/gpu/drm/i2c/adv7511.c create mode 100644 drivers/gpu/drm/i2c/adv7511_audio.c create mode 100644 drivers/gpu/drm/i2c/adv7511_core.c create mode 100644 sound/soc/dwc/designware_pcm.c create mode 100644 sound/soc/dwc/designware_pcm.h -- 2.5.0

1 3

[alsa-devel] [RFC v2 0/6] sti: add audio interface to the hdmi driver
by Arnaud Pouliquen 19 Feb '16

19 Feb '16

V2: - patch: ALSA: pcm: add IEC958 channel status control helper - Return 1 instead of 0 in snd_pcm_iec958_put - Add .access field in control structure - I have kept condition on mutex for flexibility (but could be cleaned to force user to use a mutex) - patch: video: hdmi: add helper function for N and CTS - Duplicate function to have a separte treatment for coherent and non-coherent clcocks - Add ratio fiel for alternate CTS value - Clock frequency in Hz for TMDS and audio clocks - Add information concerning clocks and CTS calculation. V1: This RFC is the implementation of audio HDMI on sti platform based on generic hdmi-codec driver: https://patchwork.kernel.org/patch/7215271/ ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders") Arnaud Pouliquen (6): video: hdmi: add helper function for N and CTS ALSA: pcm: add IEC958 channel status control helper ASoC: core: add code to complete dai init after pcm creation drm: sti: Add ASoC generic hdmi codec support. ASoc: hdmi-codec: add IEC control. ARM: DT: b2120: add audio HDMI dai link in audio card arch/arm/boot/dts/stihxxx-b2120.dtsi | 15 ++- drivers/gpu/drm/sti/Kconfig | 1 + drivers/gpu/drm/sti/sti_hdmi.c | 248 ++++++++++++++++++++++++++++++++--- drivers/gpu/drm/sti/sti_hdmi.h | 10 ++ drivers/video/hdmi.c | 222 +++++++++++++++++++++++++++++++ include/linux/hdmi.h | 22 ++++ include/sound/hdmi-codec.h | 1 + include/sound/pcm_iec958.h | 16 +++ include/sound/soc-dai.h | 7 + sound/core/pcm_iec958.c | 99 ++++++++++++++ sound/soc/codecs/hdmi-codec.c | 59 +++++++-- sound/soc/soc-core.c | 14 ++ 12 files changed, 682 insertions(+), 32 deletions(-) -- 1.9.1

4 17

[alsa-devel] [PATCH] ALSA: hda - hdmi get jack from hda_jack_tbl when not dyn_pcm_assign
by libin.yang＠linux.intel.com 19 Feb '16

19 Feb '16

From: Libin Yang <libin.yang(a)linux.intel.com> On Intel platform, if !dyn_pcm_assign, spec->pcm_rec[].jack is not NULL even after snd_hda_jack_tbl_clear() is called to free snd_jack. This may cause access invalid memory when calling snd_jack_report. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index f4443b5..541986f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1956,6 +1956,29 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, return ret; } +static struct snd_jack *pin_idx_to_jack(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin) +{ + struct hdmi_spec *spec = codec->spec; + struct snd_jack *jack = NULL; + struct hda_jack_tbl *jack_tbl; + + /* if !dyn_pcm_assign, get jack from hda_jack_tbl + * in !dyn_pcm_assign case, spec->pcm_rec[].jack is not + * NULL even after snd_hda_jack_tbl_clear() is called to + * free snd_jack. This may cause access invalid memory + * when calling snd_jack_report + */ + if (per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) + jack = spec->pcm_rec[per_pin->pcm_idx].jack; + else if (!spec->dyn_pcm_assign) { + jack_tbl = snd_hda_jack_tbl_get(codec, per_pin->pin_nid); + if (jack_tbl) + jack = jack_tbl->jack; + } + return jack; +} + /* update ELD and jack state via audio component */ static void sync_eld_via_acomp(struct hda_codec *codec, struct hdmi_spec_per_pin *per_pin) @@ -1989,11 +2012,10 @@ static void sync_eld_via_acomp(struct hda_codec *codec, /* pcm_idx >=0 before update_eld() means it is in monitor * disconnected event. Jack must be fetched before update_eld() */ - if (per_pin->pcm_idx >= 0) - jack = spec->pcm_rec[per_pin->pcm_idx].jack; + jack = pin_idx_to_jack(codec, per_pin); update_eld(codec, per_pin, eld); - if (jack == NULL && per_pin->pcm_idx >= 0) - jack = spec->pcm_rec[per_pin->pcm_idx].jack; + if (jack == NULL) + jack = pin_idx_to_jack(codec, per_pin); if (jack == NULL) goto unlock; snd_jack_report(jack, -- 1.9.1

2 1

Re: [alsa-devel] [pulseaudio-discuss] [PATCH 0/1] alsa: Make profiles' availability dynamic
by Raymond Yau 19 Feb '16

19 Feb '16

2016-2-18 下午5:38於 "Bob Ham" <bob.ham(a)collabora.com>寫道： > > Make ALSA profiles stick around and update their availability if the > HDMI ELD changes. This alters the presence of card profiles quite > dramatically. Specifically, the existing autogeneration of profiles > generates a large set of input/output mapping combinations and all of > these combinations are reported by the API, marked as unavailable. To > give an idea of the consequences, here is what pavucontrol looks like > with this patch: > > https://people.collabora.com/~rah/pavucontrol-unavailable-profiles.png > > Similarly, here is the output of "pactl list cards": > > https://people.collabora.com/~rah/pactl-list-cards-output.txt > AFAIK, 1) mono is not supported by hda-intel 2) those desktop with three jacks at rear panel need retasking input jacks to output jacks by changing control channel mode from 2ch to 6ch, you may need to add hook for alsa devices to change the channel mode in alsa HDA-Intel.conf 3) even HDMI codec support 8 channels, it still require your hdmi monitor support multi channels

1 0

[alsa-devel] [PATCH] ASoC: samsung: Use IRQ safe spin lock calls
by Charles Keepax 19 Feb '16

19 Feb '16

Lockdep warns of a potential lock inversion, i2s->lock is held numerous times whilst we are under the substream lock (snd_pcm_stream_lock). If we use the IRQ unsafe spin lock calls, you can also end up locking snd_pcm_stream_lock whilst under i2s->lock (if an IRQ happens whilst we are holding i2s->lock). This could result in deadlock. [ 18.147001] CPU0 CPU1 [ 18.151509] ---- ---- [ 18.156022] lock(&(&pri_dai->spinlock)->rlock); [ 18.160701] local_irq_disable(); [ 18.166622] lock(&(&substream->self_group.lock)->rlock); [ 18.174595] lock(&(&pri_dai->spinlock)->rlock); [ 18.181806] <Interrupt> [ 18.184408] lock(&(&substream->self_group.lock)->rlock); [ 18.190045] [ 18.190045] *** DEADLOCK *** This patch changes to using the irq safe spinlock calls, to avoid this issue. Fixes: ce8bcdbb61d9 ("ASoC: samsung: i2s: Protect more registers with a spinlock") Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/samsung/i2s.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 84d9e77..70a2559 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -481,10 +481,11 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, unsigned int cdcon_mask = 1 << i2s_regs->cdclkcon_off; unsigned int rsrc_mask = 1 << i2s_regs->rclksrc_off; u32 mod, mask, val = 0; + unsigned long flags; - spin_lock(i2s->lock); + spin_lock_irqsave(i2s->lock, flags); mod = readl(i2s->addr + I2SMOD); - spin_unlock(i2s->lock); + spin_unlock_irqrestore(i2s->lock, flags); switch (clk_id) { case SAMSUNG_I2S_OPCLK: @@ -575,11 +576,11 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, return -EINVAL; } - spin_lock(i2s->lock); + spin_lock_irqsave(i2s->lock, flags); mod = readl(i2s->addr + I2SMOD); mod = (mod & ~mask) | val; writel(mod, i2s->addr + I2SMOD); - spin_unlock(i2s->lock); + spin_unlock_irqrestore(i2s->lock, flags); return 0; } @@ -590,6 +591,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, struct i2s_dai *i2s = to_info(dai); int lrp_shift, sdf_shift, sdf_mask, lrp_rlow, mod_slave; u32 mod, tmp = 0; + unsigned long flags; lrp_shift = i2s->variant_regs->lrp_off; sdf_shift = i2s->variant_regs->sdf_off; @@ -649,7 +651,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, return -EINVAL; } - spin_lock(i2s->lock); + spin_lock_irqsave(i2s->lock, flags); mod = readl(i2s->addr + I2SMOD); /* * Don't change the I2S mode if any controller is active on this @@ -657,7 +659,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, */ if (any_active(i2s) && ((mod & (sdf_mask | lrp_rlow | mod_slave)) != tmp)) { - spin_unlock(i2s->lock); + spin_unlock_irqrestore(i2s->lock, flags); dev_err(&i2s->pdev->dev, "%s:%d Other DAI busy\n", __func__, __LINE__); return -EAGAIN; @@ -666,7 +668,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, mod &= ~(sdf_mask | lrp_rlow | mod_slave); mod |= tmp; writel(mod, i2s->addr + I2SMOD); - spin_unlock(i2s->lock); + spin_unlock_irqrestore(i2s->lock, flags); return 0; } @@ -676,6 +678,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, { struct i2s_dai *i2s = to_info(dai); u32 mod, mask = 0, val = 0; + unsigned long flags; if (!is_secondary(i2s)) mask |= (MOD_DC2_EN | MOD_DC1_EN); @@ -744,11 +747,11 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - spin_lock(i2s->lock); + spin_lock_irqsave(i2s->lock, flags); mod = readl(i2s->addr + I2SMOD); mod = (mod & ~mask) | val; writel(mod, i2s->addr + I2SMOD); - spin_unlock(i2s->lock); + spin_unlock_irqrestore(i2s->lock, flags); samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture); -- 2.1.4

4 3

[alsa-devel] Closing the pcm streams
by Andy Ng 19 Feb '16

19 Feb '16

Hello, I am working on a system that a DSP provides the audio algorithms and in case where the DSP crashes, I would like to shutdown nicely any opened PCM streams. The DSP has an RPC protocol to the external world. I use a small watchdog on ARM to monitor the "health" of the DSP. When the DSP goes down, I reset it. However, I would like to close down smoothly the PCM streams and inform the user that there was an error while playing. Is there any way to inform the ALSA kernel framework in the kernel that a specific PCM stream gone bad? Where is the best point to reset ALSA kernel framework? Thank you Andy

2 1

[alsa-devel] [PATCH] Changed the if-else case to switch case
by anish kumar 18 Feb '16

18 Feb '16

Signed-off-by: anish kumar <yesanishhere(a)gmail.com> --- sound/soc/codecs/max9867.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index b9d989f..5a8481b 100755 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -212,16 +212,22 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, switch (snd_pcm_format_width(params_format(params))) { case 8: case 16: - if (pclk_bclk_ratio == 2) + switch (pclk_bclk_ratio) { + case 2: bclk_value = MAX9867_IFC1B_PCLK_2; - else if (pclk_bclk_ratio == 4) + break; + case 4: bclk_value = MAX9867_IFC1B_PCLK_4; - else if (pclk_bclk_ratio == 8) + break; + case 8: bclk_value = MAX9867_IFC1B_PCLK_8; - else if (pclk_bclk_ratio == 16) + break; + case 16: bclk_value = MAX9867_IFC1B_PCLK_16; - else { - dev_err(codec->dev, "unsupported sampling rate\n"); + break; + default: + dev_err(codec->dev, + "unsupported sampling rate\n"); return -EINVAL; } break; -- 1.9.3

2 1

[alsa-devel] [PATCH] ASoC: Add max9867 codec driver
by anish kumar 18 Feb '16

18 Feb '16

Signed-off-by: anish kumar <yesanishhere(a)gmail.com> --- .../devicetree/bindings/sound/max9867.txt | 17 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 1 + sound/soc/codecs/max9867.c | 537 +++++++++++++++++++++ sound/soc/codecs/max9867.h | 83 ++++ 5 files changed, 642 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/max9867.txt create mode 100755 sound/soc/codecs/max9867.c create mode 100755 sound/soc/codecs/max9867.h diff --git a/Documentation/devicetree/bindings/sound/max9867.txt b/Documentation/devicetree/bindings/sound/max9867.txt new file mode 100644 index 0000000..394cd4e --- /dev/null +++ b/Documentation/devicetree/bindings/sound/max9867.txt @@ -0,0 +1,17 @@ +max9867 codec + +This device supports I2C mode only. + +Required properties: + +- compatible : "maxim,max9867" +- reg : The chip select number on the I2C bus + +Example: + +&i2c { + max9867: max9867@0x18 { + compatible = "maxim,max9867"; + reg = <0x18>; + }; +}; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c3178e3..913c83c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98095 if I2C select SND_SOC_MAX98357A if GPIOLIB + select SND_SOC_MAX9867 if I2C select SND_SOC_MAX98925 if I2C select SND_SOC_MAX98926 if I2C select SND_SOC_MAX9850 if I2C @@ -490,6 +491,9 @@ config SND_SOC_MAX98095 config SND_SOC_MAX98357A tristate +config SND_SOC_MAX9867 + tristate + config SND_SOC_MAX98925 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 84843f3..f39dee7 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -70,6 +70,7 @@ snd-soc-max98088-objs := max98088.o snd-soc-max98090-objs := max98090.o snd-soc-max98095-objs := max98095.o snd-soc-max98357a-objs := max98357a.o +snd-soc-max9867-objs := max9867.o snd-soc-max98925-objs := max98925.o snd-soc-max98926-objs := max98926.o snd-soc-max9850-objs := max9850.o diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c new file mode 100755 index 0000000..b9d989f --- /dev/null +++ b/sound/soc/codecs/max9867.c @@ -0,0 +1,537 @@ +/* + * max9867.c -- max9867 ALSA SoC Audio driver + * + * Copyright 2013-15 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/delay.h> +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> +#include "max9867.h" + +static const char *const max9867_spmode[] = { + "Stereo Diff", "Mono Diff", + "Stereo Cap", "Mono Cap", + "Stereo Single", "Mono Single", + "Stereo Single Fast", "Mono Single Fast" +}; +static const char *const max9867_sidetone_text[] = { + "None", "Left", "Right", "LeftRight", "LeftRightDiv2", +}; +static const char *const max9867_filter_text[] = {"IIR", "FIR"}; + +static SOC_ENUM_SINGLE_DECL(max9867_filter, MAX9867_CODECFLTR, 7, + max9867_filter_text); +static SOC_ENUM_SINGLE_DECL(max9867_spkmode, MAX9867_MODECONFIG, 0, + max9867_spmode); +static SOC_ENUM_SINGLE_DECL(max9867_sidetone, MAX9867_DACGAIN, 6, + max9867_sidetone_text); +static DECLARE_TLV_DB_SCALE(max9860_capture_tlv, -600, 200, 0); +static DECLARE_TLV_DB_SCALE(max9860_mic_tlv, 2000, 100, 1); +static DECLARE_TLV_DB_SCALE(max9860_adc_left_tlv, -1200, 100, 1); +static DECLARE_TLV_DB_SCALE(max9860_adc_right_tlv, -1200, 100, 1); +static const unsigned int max98088_micboost_tlv[] = { + TLV_DB_RANGE_HEAD(2), + 0, 1, TLV_DB_SCALE_ITEM(0, 2000, 0), + 2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0), +}; + +static const struct snd_kcontrol_new max9867_snd_controls[] = { + SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL, + MAX9867_RIGHTVOL, 0, 63, 1), + SOC_DOUBLE_R_TLV("Capture Volume", MAX9867_LEFTMICGAIN, + MAX9867_RIGHTMICGAIN, + 0, 15, 1, max9860_capture_tlv), + SOC_DOUBLE_R_TLV("Mic Volume", MAX9867_LEFTMICGAIN, + MAX9867_RIGHTMICGAIN, 0, 31, 1, max9860_mic_tlv), + SOC_DOUBLE_R_TLV("Mic Boost Volume", MAX9867_LEFTMICGAIN, + MAX9867_RIGHTMICGAIN, 5, 3, 0, max98088_micboost_tlv), + SOC_ENUM("Digital Sidetone Src", max9867_sidetone), + SOC_SINGLE("Sidetone Volume", MAX9867_DACGAIN, 0, 31, 1), + SOC_SINGLE("DAC Volume", MAX9867_DACLEVEL, 4, 3, 0), + SOC_SINGLE("DAC Attenuation", MAX9867_DACLEVEL, 0, 15, 1), + SOC_SINGLE_TLV("ADC Left Volume", MAX9867_ADCLEVEL, + 4, 15, 1, max9860_adc_left_tlv), + SOC_SINGLE_TLV("ADC Right Volume", MAX9867_ADCLEVEL, + 0, 15, 1, max9860_adc_right_tlv), + SOC_ENUM("Speaker Mode", max9867_spkmode), + SOC_SINGLE("Volume Smoothing Switch", MAX9867_MODECONFIG, 6, 1, 0), + SOC_SINGLE("ZCD Switch", MAX9867_MODECONFIG, 5, 1, 0), + SOC_ENUM("DSP Filter", max9867_filter), +}; + +static const char *const max9867_mux[] = {"None", "Mic", "Line", "Mic_Line"}; + +static SOC_ENUM_SINGLE_DECL(max9867_mux_enum, + MAX9867_INPUTCONFIG, MAX9867_INPUT_SHIFT, + max9867_mux); + +static const struct snd_kcontrol_new max9867_dapm_mux_controls = + SOC_DAPM_ENUM("Route", max9867_mux_enum); + +static const struct snd_kcontrol_new max9867_left_dapm_control = + SOC_DAPM_SINGLE("Switch", MAX9867_PWRMAN, 6, 1, 0); +static const struct snd_kcontrol_new max9867_right_dapm_control = + SOC_DAPM_SINGLE("Switch", MAX9867_PWRMAN, 5, 1, 0); +static const struct snd_kcontrol_new max9867_line_dapm_control = + SOC_DAPM_SINGLE("Switch", MAX9867_LEFTLINELVL, 6, 1, 1); + +static const struct snd_soc_dapm_widget max9867_dapm_widgets[] = { + SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC("Left DAC", NULL, MAX9867_PWRMAN, 3, 0), + SND_SOC_DAPM_DAC("Right DAC", NULL, MAX9867_PWRMAN, 2, 0), + SND_SOC_DAPM_MIXER("Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_OUTPUT("HPOUT"), + + SND_SOC_DAPM_AIF_IN("DAI_IN", "HiFi Capture", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_ADC("Left ADC", "HiFi Capture", MAX9867_PWRMAN, 1, 0), + SND_SOC_DAPM_ADC("Right ADC", "HiFi Capture", MAX9867_PWRMAN, 0, 0), + SND_SOC_DAPM_MUX("Input Mux", SND_SOC_NOPM, 0, 0, + &max9867_dapm_mux_controls), + + SND_SOC_DAPM_MIXER("Input Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_SWITCH("Left Line", MAX9867_LEFTLINELVL, 6, 1, + &max9867_left_dapm_control), + SND_SOC_DAPM_SWITCH("Right Line", MAX9867_RIGTHLINELVL, 6, 1, + &max9867_right_dapm_control), + SND_SOC_DAPM_SWITCH("Line Mixer", SND_SOC_NOPM, 0, 0, + &max9867_line_dapm_control), + SND_SOC_DAPM_INPUT("LINE_IN"), +}; + +static const struct snd_soc_dapm_route max9867_audio_map[] = { + {"Left DAC", NULL, "DAI_OUT"}, + {"Right DAC", NULL, "DAI_OUT"}, + {"Output Mixer", NULL, "Left DAC"}, + {"Output Mixer", NULL, "Right DAC"}, + {"HPOUT", NULL, "Output Mixer"}, + + {"Left ADC", NULL, "DAI_IN"}, + {"Right ADC", NULL, "DAI_IN"}, + {"Input Mixer", NULL, "Left ADC"}, + {"Input Mixer", NULL, "Right ADC"}, + {"Input Mux", "Line", "Input Mixer"}, + {"Input Mux", "Mic", "Input Mixer"}, + {"Input Mux", "Mic_Line", "Input Mixer"}, + {"Right Line", "Switch", "Input Mux"}, + {"Left Line", "Switch", "Input Mux"}, + {"LINE_IN", NULL, "Left Line"}, + {"LINE_IN", NULL, "Right Line"}, +}; + +enum rates { + pcm_rate_8, pcm_rate_16, pcm_rate_24, + pcm_rate_32, pcm_rate_44, + pcm_rate_48, max_pcm_rate, +}; + +struct ni_div_rates { + u32 mclk; + u16 ni[max_pcm_rate]; +} ni_div[] = { + {11289600, {0x116A, 0x22D4, 0x343F, 0x45A9, 0x6000, 0x687D} }, + {12000000, {0x1062, 0x20C5, 0x3127, 0x4189, 0x5A51, 0x624E} }, + {12288000, {0x1000, 0x2000, 0x3000, 0x4000, 0x5833, 0x6000} }, + {13000000, {0x0F20, 0x1E3F, 0x2D5F, 0x3C7F, 0x535F, 0x5ABE} }, + {19200000, {0x0A3D, 0x147B, 0x1EB8, 0x28F6, 0x3873, 0x3D71} }, + {24000000, {0x1062, 0x20C5, 0x1893, 0x4189, 0x5A51, 0x624E} }, + {26000000, {0x0F20, 0x1E3F, 0x16AF, 0x3C7F, 0x535F, 0x5ABE} }, + {27000000, {0x0E90, 0x1D21, 0x15D8, 0x3A41, 0x5048, 0x5762} }, +}; + +static inline int get_ni_value(int mclk, int rate) +{ + int i, ret = 0; + + /* find the closest rate index*/ + for (i = 0; i < ARRAY_SIZE(ni_div); i++) { + if (ni_div[i].mclk >= mclk) + break; + } + + switch (rate) { + case 8000: + return ni_div[i].ni[pcm_rate_8]; + case 16000: + return ni_div[i].ni[pcm_rate_16]; + case 32000: + return ni_div[i].ni[pcm_rate_32]; + case 44100: + return ni_div[i].ni[pcm_rate_44]; + case 48000: + return ni_div[i].ni[pcm_rate_48]; + default: + pr_err("%s wrong rate %d\n", __func__, rate); + ret = -EINVAL; + } + return ret; +} + +static int max9867_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + unsigned int ni_h, ni_l, value; + + value = get_ni_value(max9867->sysclk, params_rate(params)); + if (value < 0) + return value; + + ni_h = (0xFF00 & value) >> 8; + ni_l = 0x00FF & value; + /* set up the ni value */ + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKHIGH, + MAX9867_NI_HIGH_MASK, ni_h); + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKLOW, + MAX9867_NI_LOW_MASK, ni_l); + if (!max9867->master) { + /* + * digital pll locks on to any externally supplied LRCLK signal + * and also enable rapid lock mode. + */ + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKLOW, + MAX9867_RAPID_LOCK, MAX9867_RAPID_LOCK); + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKHIGH, + MAX9867_PLL, MAX9867_PLL); + } else { + unsigned long int bclk_rate, pclk_bclk_ratio; + int bclk_value; + + bclk_rate = params_rate(params) * 2 * + snd_pcm_format_width(params_format(params)); + pclk_bclk_ratio = max9867->pclk/bclk_rate; + switch (snd_pcm_format_width(params_format(params))) { + case 8: + case 16: + if (pclk_bclk_ratio == 2) + bclk_value = MAX9867_IFC1B_PCLK_2; + else if (pclk_bclk_ratio == 4) + bclk_value = MAX9867_IFC1B_PCLK_4; + else if (pclk_bclk_ratio == 8) + bclk_value = MAX9867_IFC1B_PCLK_8; + else if (pclk_bclk_ratio == 16) + bclk_value = MAX9867_IFC1B_PCLK_16; + else { + dev_err(codec->dev, "unsupported sampling rate\n"); + return -EINVAL; + } + break; + case 24: + bclk_value = MAX9867_IFC1B_24BIT; + break; + case 32: + bclk_value = MAX9867_IFC1B_32BIT; + break; + default: + dev_err(codec->dev, "unsupported sampling rate\n"); + return -EINVAL; + } + regmap_update_bits(max9867->regmap, MAX9867_IFC1B, + MAX9867_IFC1B_BCLK_MASK, bclk_value); + } + return 0; +} + +static int max9867_prepare(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + regmap_update_bits(max9867->regmap, MAX9867_PWRMAN, + MAX9867_SHTDOWN_MASK, MAX9867_SHTDOWN_MASK); + return 0; +} + +static int max9867_mute(struct snd_soc_dai *dai, int mute) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + if (mute) + regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL, + MAX9867_DAC_MUTE_MASK, MAX9867_DAC_MUTE_MASK); + else + regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL, + MAX9867_DAC_MUTE_MASK, 0); + return 0; +} + +static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + int value = 0; + + /* Set the prescaler based on the master clock frequency*/ + if (freq >= 10000000 && freq <= 20000000) { + value |= MAX9867_PSCLK_10_20; + max9867->pclk = freq; + } else if (freq >= 20000000 && freq <= 40000000) { + value |= MAX9867_PSCLK_20_40; + max9867->pclk = freq/2; + } else if (freq >= 40000000 && freq <= 60000000) { + value |= MAX9867_PSCLK_40_60; + max9867->pclk = freq/4; + } else { + pr_err("bad clock frequency %d", freq); + return -EINVAL; + } + value = value << MAX9867_PSCLK_SHIFT; + max9867->sysclk = freq; + /* exact integer mode is not supported */ + value &= ~MAX9867_FREQ_MASK; + regmap_update_bits(max9867->regmap, MAX9867_SYSCLK, + MAX9867_PSCLK_MASK, value); + return 0; +} + +static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + u8 iface1A = 0, iface1B = 0; + int ret; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + max9867->master = 1; + iface1A |= MAX9867_MASTER; + break; + case SND_SOC_DAIFMT_CBS_CFS: + max9867->master = 0; + iface1A &= ~MAX9867_MASTER; + break; + default: + return -EINVAL; + } + + /* for i2s compatible mode */ + iface1A |= MAX9867_I2S_DLY; + /* SDOUT goes to hiz state after all data is transferred */ + iface1A |= MAX9867_SDOUT_HIZ; + + /* Clock inversion bits, BCI and WCI */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_IB_IF: + iface1A |= MAX9867_WCI_MODE | MAX9867_BCI_MODE; + break; + case SND_SOC_DAIFMT_IB_NF: + iface1A |= MAX9867_BCI_MODE; + break; + case SND_SOC_DAIFMT_NB_IF: + iface1A |= MAX9867_WCI_MODE; + break; + default: + return -EINVAL; + } + + ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A); + ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B); + return 0; +} + +static struct snd_soc_dai_ops max9867_dai_ops = { + .set_fmt = max9867_dai_set_fmt, + .set_sysclk = max9867_set_dai_sysclk, + .prepare = max9867_prepare, + .digital_mute = max9867_mute, + .hw_params = max9867_dai_hw_params, +}; + +#define MAX9867_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) +#define MAX9867_FORMATS (SNDRV_PCM_FMTBIT_S16_LE) + +static struct snd_soc_dai_driver max9867_dai[] = { + { + .name = "max9867-aif1", + .playback = { + .stream_name = "HiFi Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MAX9867_RATES, + .formats = MAX9867_FORMATS, + }, + .capture = { + .stream_name = "HiFi Capture", + .channels_min = 1, + .channels_max = 2, + .rates = MAX9867_RATES, + .formats = MAX9867_FORMATS, + }, + .ops = &max9867_dai_ops, + } +}; + +#ifdef CONFIG_PM_SLEEP +static int max9867_suspend(struct device *dev) +{ + struct max9867_priv *max9867 = dev_get_drvdata(dev); + + /* Drop down to power saving mode when system is suspended */ + regmap_update_bits(max9867->regmap, MAX9867_PWRMAN, + MAX9867_SHTDOWN_MASK, ~MAX9867_SHTDOWN_MASK); + return 0; +} + +static int max9867_resume(struct device *dev) +{ + struct max9867_priv *max9867 = dev_get_drvdata(dev); + + regmap_update_bits(max9867->regmap, MAX9867_PWRMAN, + MAX9867_SHTDOWN_MASK, MAX9867_SHTDOWN_MASK); + return 0; +} +#endif + +static int max9867_probe(struct snd_soc_codec *codec) +{ + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + dev_dbg(codec->dev, "max98090_probe\n"); + max9867->codec = codec; + return 0; +} + +static struct snd_soc_codec_driver max9867_codec = { + .probe = max9867_probe, + .controls = max9867_snd_controls, + .num_controls = ARRAY_SIZE(max9867_snd_controls), + .dapm_routes = max9867_audio_map, + .num_dapm_routes = ARRAY_SIZE(max9867_audio_map), + .dapm_widgets = max9867_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets), +}; + +static bool max9867_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX9867_STATUS: + case MAX9867_JACKSTATUS: + case MAX9867_AUXHIGH: + case MAX9867_AUXLOW: + return true; + default: + return false; + } +} + +static struct reg_default max9867_reg[] = { + { 0x04, 0x00 }, + { 0x05, 0x00 }, + { 0x06, 0x00 }, + { 0x07, 0x00 }, + { 0x08, 0x00 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, + { 0x0B, 0x00 }, + { 0x0C, 0x00 }, + { 0x0D, 0x00 }, + { 0x0E, 0x00 }, + { 0x0F, 0x00 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + { 0x12, 0x00 }, + { 0x13, 0x00 }, + { 0x14, 0x00 }, + { 0x15, 0x00 }, + { 0x16, 0x00 }, + { 0x17, 0x00 }, +}; + +static struct regmap_config max9867_regmap = { + .reg_bits = 8, + .val_bits = 8, + .max_register = MAX9867_REVISION, + .reg_defaults = max9867_reg, + .num_reg_defaults = ARRAY_SIZE(max9867_reg), + .volatile_reg = max9867_volatile_register, + .cache_type = REGCACHE_RBTREE, +}; + +static int max9867_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct max9867_priv *max9867; + int ret = 0, reg; + + max9867 = devm_kzalloc(&i2c->dev, + sizeof(*max9867), GFP_KERNEL); + if (!max9867) + return -ENOMEM; + + i2c_set_clientdata(i2c, max9867); + max9867->regmap = devm_regmap_init_i2c(i2c, &max9867_regmap); + if (IS_ERR(max9867->regmap)) { + ret = PTR_ERR(max9867->regmap); + dev_err(&i2c->dev, + "Failed to allocate regmap: %d\n", ret); + return ret; + } + ret = regmap_read(max9867->regmap, + MAX9867_REVISION, &reg); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to read: %d\n", ret); + return ret; + } + dev_info(&i2c->dev, "device revision: %x\n", reg); + ret = snd_soc_register_codec(&i2c->dev, &max9867_codec, + max9867_dai, ARRAY_SIZE(max9867_dai)); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); + return ret; + } + return ret; +} + +static int max9867_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + return 0; +} + +static const struct i2c_device_id max9867_i2c_id[] = { + { "max9867", 0 }, +}; + +static const struct of_device_id max9867_of_match[] = { + { .compatible = "maxim,max9867", }, + { } +}; + +MODULE_DEVICE_TABLE(i2c, max9867_i2c_id); + +static const struct dev_pm_ops max9867_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(max9867_suspend, max9867_resume) +}; + +static struct i2c_driver max9867_i2c_driver = { + .driver = { + .name = "max9867", + .of_match_table = of_match_ptr(max9867_of_match), + .pm = &max9867_pm_ops, + }, + .probe = max9867_i2c_probe, + .remove = max9867_i2c_remove, + .id_table = max9867_i2c_id, +}; + +module_i2c_driver(max9867_i2c_driver); + +MODULE_AUTHOR("anish kumar <yesanishhere(a)gmail.com>"); +MODULE_DESCRIPTION("ALSA SoC MAX9867 driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/max9867.h b/sound/soc/codecs/max9867.h new file mode 100755 index 0000000..65590b4 --- /dev/null +++ b/sound/soc/codecs/max9867.h @@ -0,0 +1,83 @@ +/* + * max9867.h -- MAX9867 ALSA SoC Audio driver + * + * Copyright 2013-2015 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _MAX9867_H +#define _MAX9867_H + +/* MAX9867 register space */ + +#define MAX9867_STATUS 0x00 +#define MAX9867_JACKSTATUS 0x01 +#define MAX9867_AUXHIGH 0x02 +#define MAX9867_AUXLOW 0x03 +#define MAX9867_INTEN 0x04 +#define MAX9867_SYSCLK 0x05 +#define MAX9867_FREQ_MASK 0xF +#define MAX9867_PSCLK_SHIFT 0x4 +#define MAX9867_PSCLK_WIDTH 0x2 +#define MAX9867_PSCLK_MASK (0x03<<MAX9867_PSCLK_SHIFT) +#define MAX9867_PSCLK_10_20 0x1 +#define MAX9867_PSCLK_20_40 0x2 +#define MAX9867_PSCLK_40_60 0x3 +#define MAX9867_AUDIOCLKHIGH 0x06 +#define MAX9867_NI_HIGH_WIDTH 0x7 +#define MAX9867_NI_HIGH_MASK 0x7F +#define MAX9867_NI_LOW_MASK 0x7F +#define MAX9867_NI_LOW_SHIFT 0x1 +#define MAX9867_PLL (1<<7) +#define MAX9867_AUDIOCLKLOW 0x07 +#define MAX9867_RAPID_LOCK 0x01 +#define MAX9867_IFC1A 0x08 +#define MAX9867_MASTER (1<<7) +#define MAX9867_I2S_DLY (1<<4) +#define MAX9867_SDOUT_HIZ (1<<3) +#define MAX9867_TDM_MODE (1<<2) +#define MAX9867_WCI_MODE (1<<6) +#define MAX9867_BCI_MODE (1<<5) +#define MAX9867_IFC1B 0x09 +#define MAX9867_IFC1B_BCLK_MASK 7 +#define MAX9867_IFC1B_32BIT 0x01 +#define MAX9867_IFC1B_24BIT 0x02 +#define MAX9867_IFC1B_PCLK_2 4 +#define MAX9867_IFC1B_PCLK_4 5 +#define MAX9867_IFC1B_PCLK_8 6 +#define MAX9867_IFC1B_PCLK_16 7 +#define MAX9867_CODECFLTR 0x0a +#define MAX9867_DACGAIN 0x0b +#define MAX9867_DACLEVEL 0x0c +#define MAX9867_DAC_MUTE_SHIFT 0x6 +#define MAX9867_DAC_MUTE_WIDTH 0x1 +#define MAX9867_DAC_MUTE_MASK (0x1<<MAX9867_DAC_MUTE_SHIFT) +#define MAX9867_ADCLEVEL 0x0d +#define MAX9867_LEFTLINELVL 0x0e +#define MAX9867_RIGTHLINELVL 0x0f +#define MAX9867_LEFTVOL 0x10 +#define MAX9867_RIGHTVOL 0x11 +#define MAX9867_LEFTMICGAIN 0x12 +#define MAX9867_RIGHTMICGAIN 0x13 +#define MAX9867_INPUTCONFIG 0x14 +#define MAX9867_INPUT_SHIFT 0x6 +#define MAX9867_MICCONFIG 0x15 +#define MAX9867_MODECONFIG 0x16 +#define MAX9867_PWRMAN 0x17 +#define MAX9867_SHTDOWN_MASK (1<<7) +#define MAX9867_REVISION 0xff + +#define MAX9867_CACHEREGNUM 10 + +/* codec private data */ +struct max9867_priv { + struct regmap *regmap; + struct snd_soc_codec *codec; + unsigned int sysclk; + unsigned int pclk; + unsigned int master; +}; +#endif -- 1.9.3

2 2

[alsa-devel] [RFC v4 0/8] ASoC: Add mediatek HDMI codec support
by Philipp Zabel 18 Feb '16

18 Feb '16

Hi, these patches add an interface for Jyri's generic hdmi-codec driver [1] to the mediatek hdmi bridge driver. The accesses to the hcp->eld field are now locked by a mutex, and I have added a patch to use the hdmi helper function [2] for N/CTS calculation. Changes since v3: - Add mutex to lock hcp->eld - Use helper function for N and CTS calculation The mediatek drm patches apply on top of https://patchwork.kernel.org/patch/8337071/ ("drm/mediatek: Add HDMI support"), and need this patch: [2] https://patchwork.kernel.org/patch/8091531/ ("video: hdmi: add helper function for N and CTS") The asoc patches depend on these two patches: https://patchwork.kernel.org/patch/7215121/ ("ALSA: pcm: add IEC958 channel status helper for hw_params") [1] https://patchwork.kernel.org/patch/7215271/ ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders") regards Philipp Koro Chen (1): ASoC: mediatek: Add HDMI dai-links in the machine driver Philipp Zabel (7): drm/mediatek: hdmi: Add audio interface to the hdmi-codec driver ASoC: mediatek: address dai link array entries by enum video: rmk's HDMI notification prototype drm/mediatek: hdmi: issue notifications ASoC: hdmi-codec: Use HDMI notifications to add jack support ASoC: hdmi-codec: Add ELD control drm/mediatek: hdmi: use helper function for N and CTS calculation .../bindings/sound/mt8173-rt5650-rt5676.txt | 5 +- drivers/gpu/drm/mediatek/Kconfig | 1 + drivers/gpu/drm/mediatek/mtk_cec.c | 11 ++ drivers/gpu/drm/mediatek/mtk_drm_hdmi_drv.c | 148 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_hdmi.c | 89 +++++----- drivers/gpu/drm/mediatek/mtk_hdmi.h | 10 +- drivers/gpu/drm/mediatek/mtk_hdmi_hw.c | 179 ++++----------------- drivers/gpu/drm/mediatek/mtk_hdmi_hw.h | 4 +- drivers/video/Makefile | 2 +- drivers/video/hdmi-not.c | 61 +++++++ include/linux/hdmi-not.h | 39 +++++ include/sound/hdmi-codec.h | 6 + sound/soc/codecs/hdmi-codec.c | 123 +++++++++++++- sound/soc/mediatek/mt8173-rt5650-rt5676.c | 66 +++++++- 14 files changed, 528 insertions(+), 216 deletions(-) create mode 100644 drivers/video/hdmi-not.c create mode 100644 include/linux/hdmi-not.h -- 2.7.0

2 11

[alsa-devel] [PATCH] ALSA: oxfw: use workqueue instead of tasklet for scs1x
by Takashi Sakamoto 18 Feb '16

18 Feb '16

This commit replaces tasklet with workqueue for scs1x functionality of ALSA oxfw driver. This driver transfers MIDI message specific for SCS.1m and SCS.1d. This task is currently done in software IRQ context of tasklet. In a view of system, this context is limited resources and some important drivers (at least, more important than ALSA oxfw driver) use the context as its bottom-harf. If the work to transfer MIDI messages is done within a time, it's better to use the other context for the work. Actually, with recent CPUs, the work will be scheduled within a time. This is a reason of this commit. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/oxfw/oxfw-scs1x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/firewire/oxfw/oxfw-scs1x.c b/sound/firewire/oxfw/oxfw-scs1x.c index bb53eb3..f7ac124 100644 --- a/sound/firewire/oxfw/oxfw-scs1x.c +++ b/sound/firewire/oxfw/oxfw-scs1x.c @@ -26,7 +26,7 @@ struct fw_scs1x { u8 output_bytes; bool output_escaped; bool output_escape_high_nibble; - struct tasklet_struct tasklet; + struct work_struct work; wait_queue_head_t idle_wait; u8 buffer[HSS1394_MAX_PACKET_SIZE]; bool transaction_running; @@ -129,7 +129,7 @@ static void scs_write_callback(struct fw_card *card, int rcode, ; /* TODO: retry this packet */ scs->transaction_running = false; - tasklet_schedule(&scs->tasklet); + schedule_work(&scs->work); } static bool is_valid_running_status(u8 status) @@ -165,9 +165,9 @@ static bool is_invalid_cmd(u8 status) status == 0xfd; } -static void scs_output_tasklet(unsigned long data) +static void scs_output_work(struct work_struct *work) { - struct fw_scs1x *scs = (struct fw_scs1x *)data; + struct fw_scs1x *scs = container_of(work, struct fw_scs1x, work); struct snd_rawmidi_substream *stream; unsigned int i; u8 byte; @@ -311,7 +311,7 @@ static void midi_playback_trigger(struct snd_rawmidi_substream *stream, int up) scs->output_idle = false; ACCESS_ONCE(scs->output) = stream; - tasklet_schedule(&scs->tasklet); + schedule_work(&scs->work); } else { ACCESS_ONCE(scs->output) = NULL; } @@ -395,7 +395,7 @@ int snd_oxfw_scs1x_add(struct snd_oxfw *oxfw) snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &midi_playback_ops); - tasklet_init(&scs->tasklet, scs_output_tasklet, (unsigned long)scs); + INIT_WORK(&scs->work, scs_output_work); init_waitqueue_head(&scs->idle_wait); scs->output_idle = true; -- 2.5.0

2 1

[alsa-devel] [PATCH v5] portman2x4 - use new parport device model
by Sudip Mukherjee 18 Feb '16

18 Feb '16

Modify portman driver to use the new parallel port device model. The advantage of using the device model is that the device gets binded to the hardware, we get the feature of hotplug, we can bind/unbind the driver at runtime. The changes are in the way the driver gets registered with the parallel port subsystem and the temporary device to probe portman card is removed and portman_probe() is used in the probe callback. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- v5: claimed flag and one call to parport_claim() removed. v4: temporary device to probe is removed. v3: changed commit message v2: 1. pardev_cb is initialized while declaring, thus removing the use of memset. 2. used pdev->id. 3. v1 did not have the parport probe callback, but we will need the probe callback for binding as the name of the driver and the name of the device is different. 4. in v1 I missed modifying snd_portman_probe_port(). sound/drivers/portman2x4.c | 93 +++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 51 deletions(-) diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 464385a..362533f 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -83,8 +83,6 @@ struct portman { struct snd_card *card; struct snd_rawmidi *rmidi; struct pardevice *pardev; - int pardev_claimed; - int open_count; int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; @@ -648,30 +646,6 @@ static void snd_portman_interrupt(void *userdata) spin_unlock(&pm->reg_lock); } -static int snd_portman_probe_port(struct parport *p) -{ - struct pardevice *pardev; - int res; - - pardev = parport_register_device(p, DRIVER_NAME, - NULL, NULL, NULL, - 0, NULL); - if (!pardev) - return -EIO; - - if (parport_claim(pardev)) { - parport_unregister_device(pardev); - return -EIO; - } - - res = portman_probe(p); - - parport_release(pardev); - parport_unregister_device(pardev); - - return res ? -EIO : 0; -} - static void snd_portman_attach(struct parport *p) { struct platform_device *device; @@ -705,10 +679,20 @@ static void snd_portman_detach(struct parport *p) /* nothing to do here */ } +static int snd_portman_dev_probe(struct pardevice *pardev) +{ + if (strcmp(pardev->name, DRIVER_NAME)) + return -ENODEV; + + return 0; +} + static struct parport_driver portman_parport_driver = { - .name = "portman2x4", - .attach = snd_portman_attach, - .detach = snd_portman_detach + .name = "portman2x4", + .probe = snd_portman_dev_probe, + .match_port = snd_portman_attach, + .detach = snd_portman_detach, + .devmodel = true, }; /********************************************************************* @@ -720,8 +704,7 @@ static void snd_portman_card_private_free(struct snd_card *card) struct pardevice *pardev = pm->pardev; if (pardev) { - if (pm->pardev_claimed) - parport_release(pardev); + parport_release(pardev); parport_unregister_device(pardev); } @@ -736,6 +719,12 @@ static int snd_portman_probe(struct platform_device *pdev) struct snd_card *card = NULL; struct portman *pm = NULL; int err; + struct pardev_cb portman_cb = { + .preempt = NULL, + .wakeup = NULL, + .irq_func = snd_portman_interrupt, /* ISR */ + .flags = PARPORT_DEV_EXCL, /* flags */ + }; p = platform_get_drvdata(pdev); platform_set_drvdata(pdev, NULL); @@ -745,9 +734,6 @@ static int snd_portman_probe(struct platform_device *pdev) if (!enable[dev]) return -ENOENT; - if ((err = snd_portman_probe_port(p)) < 0) - return err; - err = snd_card_new(&pdev->dev, index[dev], id[dev], THIS_MODULE, 0, &card); if (err < 0) { @@ -759,23 +745,32 @@ static int snd_portman_probe(struct platform_device *pdev) sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, p->base, p->irq); - pardev = parport_register_device(p, /* port */ - DRIVER_NAME, /* name */ - NULL, /* preempt */ - NULL, /* wakeup */ - snd_portman_interrupt, /* ISR */ - PARPORT_DEV_EXCL, /* flags */ - (void *)card); /* private */ + portman_cb.private = card; /* private */ + pardev = parport_register_dev_model(p, /* port */ + DRIVER_NAME, /* name */ + &portman_cb, /* callbacks */ + pdev->id); /* device number */ if (pardev == NULL) { snd_printd("Cannot register pardevice\n"); err = -EIO; goto __err; } + /* claim parport */ + if (parport_claim(pardev)) { + snd_printd("Cannot claim parport 0x%lx\n", pardev->port->base); + err = -EIO; + goto free_pardev; + } + err = portman_probe(p); + if (err) { + err = -EIO; + goto release_pardev; + } + if ((err = portman_create(card, pardev, &pm)) < 0) { snd_printd("Cannot create main component\n"); - parport_unregister_device(pardev); - goto __err; + goto release_pardev; } card->private_data = pm; card->private_free = snd_portman_card_private_free; @@ -785,14 +780,6 @@ static int snd_portman_probe(struct platform_device *pdev) goto __err; } - /* claim parport */ - if (parport_claim(pardev)) { - snd_printd("Cannot claim parport 0x%lx\n", pardev->port->base); - err = -EIO; - goto __err; - } - pm->pardev_claimed = 1; - /* init device */ if ((err = portman_device_init(pm)) < 0) goto __err; @@ -808,6 +795,10 @@ static int snd_portman_probe(struct platform_device *pdev) snd_printk(KERN_INFO "Portman 2x4 on 0x%lx\n", p->base); return 0; +release_pardev: + parport_release(pardev); +free_pardev: + parport_unregister_device(pardev); __err: snd_card_free(card); return err; -- 1.9.1

2 2

[alsa-devel] another locking issue with nonatomic ops?
by Vinod Koul 18 Feb '16

18 Feb '16

Hi Takashi, We found another issue with non atomic ops. This occurs when we have snd_pcm_do_prepare being invoked which acquires the lock snd_pcm_link_rwsem twice, first in snd_pcm_common_ioctl1, and then again in dpcm_dapm_stream_event. Normally this is fine, but if we have another stream get closed in between two read accesses we get stuck. First thread: [ 419.657259] AudioOut_2 D ffff8800704a3a60 0 3691 1 0x20020004 [ 419.665946] ffff8800704a3a60 00000000704a3a60 ffff88006d1fddd0 ffffffff8252ffd8 [ 419.674678] ffff8800704a4000 ffffffff8252ffc0 ffffffffffffffff ffffffff8252ffd8 [ 419.683513] 0000000000000000 ffff8800704a3a80 ffffffff81ca2987 ffffffffffffffff [ 419.683574] Call Trace: [ 419.692290] [<ffffffff81ca2987>] schedule+0x37/0x90 [ 419.692306] [<ffffffff81ca6f6d>] rwsem_down_read_failed+0xdd/0x130 [ 419.701050] [<ffffffff814df454>] call_rwsem_down_read_failed+0x14/0x30 [ 419.709758] [<ffffffff810e793b>] ? down_read_nested+0x5b/0x70 [ 419.709805] [<ffffffff81adfda9>] ? snd_pcm_stream_lock+0xa9/0x120 [ 419.723012] [<ffffffff81adfda9>] snd_pcm_stream_lock+0xa9/0x120 < ============ 2nd Read lock is acquired here, without releasing previous one. [ 419.723026] [<ffffffff81adfe4c>] snd_pcm_stream_lock_irq+0x2c/0x30 [ 419.731801] [<ffffffff81b01f5e>] ? dpcm_dapm_stream_event+0xbe/0xd0 [ 419.740565] [<ffffffff81b0079c>] dpcm_set_fe_update_state+0x3c/0xb0 [ 419.749252] [<ffffffff81b04514>] dpcm_fe_dai_prepare+0xc4/0x150 [ 419.749301] [<ffffffff81adf7eb>] snd_pcm_do_prepare+0x1b/0x30 [ 419.758083] [<ffffffff81adf3bf>] snd_pcm_action_single+0x2f/0x70 [ 419.766897] [<ffffffff81ca6827>] ? down_read+0x47/0x60 [ 419.766962] [<ffffffff81adf577>] ? snd_pcm_action_nonatomic+0x27/0x80 [ 419.775565] [<ffffffff81adf5c6>] snd_pcm_action_nonatomic+0x76/0x80 < ============ 1st Read lock is acquired here [ 419.784419] [<ffffffff81ae2c62>] snd_pcm_common_ioctl1+0x802/0xd30 [ 419.784495] [<ffffffff81ae332b>] snd_pcm_playback_ioctl1+0x19b/0x280 [ 419.793106] [<ffffffff81230915>] ? __fget+0x5/0x210 [ 419.801943] [<ffffffff81ae3dca>] snd_pcm_ioctl_compat+0x41a/0x770 [ 419.801959] [<ffffffff81230915>] ? __fget+0x5/0x210 [ 419.810793] [<ffffffff8126d670>] compat_SyS_ioctl+0xd0/0x13b0 [ 419.819491] [<ffffffff81ca7bc4>] ? do_nanosleep+0x94/0x190 [ 419.819535] [<ffffffff810eb696>] ? trace_hardirqs_on_caller+0x16/0x210 [ 419.828306] [<ffffffff814df4f8>] ? trace_hardirqs_on_thunk+0x17/0x19 [ 419.837104] [<ffffffff81cabf0e>] sysenter_dispatch+0x7/0x1f Second thread: [ 419.543062] mediaserver D ffff880170957cd8 0 3690 1 0x20020004 [ 419.543191] ffff880170957cd8 0000000070957cd8 ffff88006de49ad0 ffffffff8252ffd8 [ 419.551920] ffff880170958000 ffff88006de49ad0 ffffffff8252ffc0 ffffffff00000001 [ 419.560555] ffffffff8252ffd8 ffff880170957cf8 ffffffff81ca2987 ffffffff8252ffc0 [ 419.569368] Call Trace: [ 419.569392] [<ffffffff81ca2987>] schedule+0x37/0x90 [ 419.578026] [<ffffffff81ca71f5>] rwsem_down_write_failed+0x235/0x450 [ 419.586884] [<ffffffff81ca7005>] ? rwsem_down_write_failed+0x45/0x450 [ 419.586941] [<ffffffff814df483>] call_rwsem_down_write_failed+0x13/0x20 [ 419.595620] [<ffffffff81ca689f>] ? down_write+0x5f/0x80 < ============ Write lock acquired here. If this occurs between two read lock's then it's hangs [ 419.604428] [<ffffffff81aded58>] ? snd_pcm_unlink+0x28/0x120 [ 419.604465] [<ffffffff81aded58>] snd_pcm_unlink+0x28/0x120 [ 419.613215] [<ffffffff81adee5e>] pcm_release_private+0xe/0x10 [ 419.622058] [<ffffffff81ae0d57>] snd_pcm_release_substream.part.34+0x67/0x90 [ 419.622143] [<ffffffff81ae0e68>] snd_pcm_release+0xb8/0xc0 [ 419.630889] [<ffffffff8120f1aa>] __fput+0xea/0x200 [ 419.639680] [<ffffffff8120f30e>] ____fput+0xe/0x10 [ 419.639744] [<ffffffff810ba43c>] task_work_run+0xcc/0x100 [ 419.648435] [<ffffffff81002e41>] do_notify_resume+0x51/0x70 [ 419.657205] [<ffffffff81ca986c>] int_signal+0x12/0x17 Thanks -- ~Vinod

4 13

[alsa-devel] [PATCH] ALSA: hda - hdmi get jack from hda_jack_tbl when not dyn_pcm_assign
by libin.yang＠linux.intel.com 18 Feb '16

18 Feb '16

From: Libin Yang <libin.yang(a)linux.intel.com> On Intel platform, if !dyn_pcm_assign, spec->pcm_rec[].jack is not NULL even after snd_hda_jack_tbl_clear() is called to free snd_jack. This may cause access invalid memory when calling snd_jack_report. Please see more detail from: https://bugs.freedesktop.org/show_bug.cgi?id=94079 Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index f4443b5..3b47101 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1962,6 +1962,7 @@ static void sync_eld_via_acomp(struct hda_codec *codec, { struct hdmi_spec *spec = codec->spec; struct hdmi_eld *eld = &spec->temp_eld; + struct hda_jack_tbl *jack_tbl; struct snd_jack *jack = NULL; int size; @@ -1989,10 +1990,21 @@ static void sync_eld_via_acomp(struct hda_codec *codec, /* pcm_idx >=0 before update_eld() means it is in monitor * disconnected event. Jack must be fetched before update_eld() */ - if (per_pin->pcm_idx >= 0) + /* if !dyn_pcm_assign, get jack from hda_jack_tbl + * in !dyn_pcm_assign case, spec->pcm_rec[].jack is not + * NULL even after snd_hda_jack_tbl_clear() is called to + * free snd_jack. This may cause access invalid memory + * when calling snd_jack_report + */ + if (per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) jack = spec->pcm_rec[per_pin->pcm_idx].jack; + else { + jack_tbl = snd_hda_jack_tbl_get(codec, per_pin->pin_nid); + if (jack_tbl) + jack = jack_tbl->jack; + } update_eld(codec, per_pin, eld); - if (jack == NULL && per_pin->pcm_idx >= 0) + if (jack == NULL && per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) jack = spec->pcm_rec[per_pin->pcm_idx].jack; if (jack == NULL) goto unlock; -- 1.9.1

3 10

Re: [alsa-devel] Auto mute mode
by Takashi Iwai 18 Feb '16

18 Feb '16

On Wed, 17 Feb 2016 09:31:55 +0100, Kailang wrote: > > Hi Takashi, > > I add the ALC225 for Dell headset mode supported. > But it has the issue for speaker don't mute when headphone or headset was pluged. Is alc_update_headset_mode() called when you plug/unplug the headphone or the headset? If yes, which value is set to new_headset_mode? > The issue is occur to Mic in pluged. > When Mic in is pluged, auto mute mode will change to disable. > But when plug headphone or headset into jack, auto mute mode still keep on disable. > So, speaker will have output at the same time. The same question applies. This is a Dell machine with ALC255_FIXUP_DELL1_MIC_NO_PRESENCE fix up. The mic pin has no jack detection but the detection is triggered only by the headset (HP) pin. All these imply likely that the detection of the headset mode doesn't work properly. I haven't touched with these Dell quirks, but Canonical guys did it. They should have a better clue. Now Cc'ed. Takashi

4 4

[alsa-devel] [PATCH] Provide sequencer sound card number / PID via alsa-lib
by Martin Koegler 17 Feb '16

17 Feb '16

From: Martin Koegler <martin.koegler(a)chello.at> rawmidi devices expose the card number via IOCTLs, which allows to find the corresponding device in sysfs. The sequencer provides no identifing data. Chromium works around this issue by scanning rawmidi as well as sequencer devices and matching them by using assumtions, how the kernel register sequencer devices. This changes adds support for exposing the card number for kernel clients as well as the PID for user client. It supports kernels with and without the required support. Signed-off-by: Martin Koegler <martin.koegler(a)chello.at> --- include/seq.h | 1 + include/sound/asequencer.h | 5 +++-- src/seq/seq.c | 11 +++++++++++ src/seq/seq_hw.c | 8 +++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/seq.h b/include/seq.h index 9576822..77996e5 100644 --- a/include/seq.h +++ b/include/seq.h @@ -143,6 +143,7 @@ snd_seq_client_type_t snd_seq_client_info_get_type(const snd_seq_client_info_t * const char *snd_seq_client_info_get_name(snd_seq_client_info_t *info); int snd_seq_client_info_get_broadcast_filter(const snd_seq_client_info_t *info); int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info); +int snd_seq_client_info_get_owner(const snd_seq_client_info_t *info); const unsigned char *snd_seq_client_info_get_event_filter(const snd_seq_client_info_t *info); int snd_seq_client_info_get_num_ports(const snd_seq_client_info_t *info); int snd_seq_client_info_get_event_lost(const snd_seq_client_info_t *info); diff --git a/include/sound/asequencer.h b/include/sound/asequencer.h index 09c8a00..7ebf7fd 100644 --- a/include/sound/asequencer.h +++ b/include/sound/asequencer.h @@ -24,7 +24,7 @@ /** version of the sequencer */ -#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) +#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 2) /** * definition of sequencer event types @@ -356,7 +356,8 @@ struct snd_seq_client_info { unsigned char event_filter[32]; /* event filter bitmap */ int num_ports; /* RO: number of ports */ int event_lost; /* number of lost events */ - char reserved[64]; /* for future use */ + int owner; /* RO: card number[kernel] / PID[user] */ + char reserved[64 - sizeof(int)]; /* for future use */ }; diff --git a/src/seq/seq.c b/src/seq/seq.c index 620ca3f..2505293 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -1522,6 +1522,17 @@ int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info) } /** + * \brief Get the sound card number (kernel) or owning PID + * \param info client_info container + * \return card number/PID/-1 if value is not available. + */ +int snd_seq_client_info_get_owner(const snd_seq_client_info_t *info) +{ + assert(info); + return info->owner; +} + +/** * \brief (DEPRECATED) Get the event filter bitmap of a client_info container * \param info client_info container * \return NULL if no event filter, or pointer to event filter bitmap diff --git a/src/seq/seq_hw.c b/src/seq/seq_hw.c index d033367..a4c083a 100644 --- a/src/seq/seq_hw.c +++ b/src/seq/seq_hw.c @@ -32,10 +32,11 @@ const char *_snd_module_seq_hw = ""; #ifndef DOC_HIDDEN #define SNDRV_FILE_SEQ ALSA_DEVICE_DIRECTORY "seq" #define SNDRV_FILE_ALOADSEQ ALOAD_DEVICE_DIRECTORY "aloadSEQ" -#define SNDRV_SEQ_VERSION_MAX SNDRV_PROTOCOL_VERSION(1, 0, 1) +#define SNDRV_SEQ_VERSION_MAX SNDRV_PROTOCOL_VERSION(1, 0, 2) typedef struct { int fd; + int micro_version; } snd_seq_hw_t; #endif /* DOC_HIDDEN */ @@ -100,6 +101,8 @@ static int snd_seq_hw_get_client_info(snd_seq_t *seq, snd_seq_client_info_t * in /*SYSERR("SNDRV_SEQ_IOCTL_GET_CLIENT_INFO failed");*/ return -errno; } + if (hw->micro_version < SNDRV_PROTOCOL_MICRO(SNDRV_SEQ_VERSION_MAX)) + info->owner = -1; return 0; } @@ -368,6 +371,8 @@ static int snd_seq_hw_query_next_client(snd_seq_t *seq, snd_seq_client_info_t *i /*SYSERR("SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT failed");*/ return -errno; } + if (hw->micro_version < SNDRV_PROTOCOL_MICRO(SNDRV_SEQ_VERSION_MAX)) + info->owner = -1; return 0; } @@ -480,6 +485,7 @@ int snd_seq_hw_open(snd_seq_t **handle, const char *name, int streams, int mode) return -ENOMEM; } hw->fd = fd; + hw->micro_version = SNDRV_PROTOCOL_MICRO(ver); if (streams & SND_SEQ_OPEN_OUTPUT) { seq->obuf = (char *) malloc(seq->obufsize = SND_SEQ_OBUF_SIZE); if (!seq->obuf) { -- 2.6.2

3 16

[alsa-devel] [PATCH] ASoC: hdac_hdmi: Dereference 'edev' after checking for NULL
by Fabio Estevam 17 Feb '16

17 Feb '16

From: Fabio Estevam <fabio.estevam(a)nxp.com> Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") leads to the following Smatch complaint: sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense() warn: variable dereferenced before check 'edev' (see line 967) ,so deference 'edev' after checking for NULL. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/hdac_hdmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 36f1200..920af2f 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -964,13 +964,15 @@ static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid) static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll) { struct hdac_ext_device *edev = pin->edev; - struct hdac_hdmi_priv *hdmi = edev->private_data; + struct hdac_hdmi_priv *hdmi; struct hdac_hdmi_pcm *pcm; int val; if (!edev) return; + hdmi = edev->private_data; + pin->repoll_count = repoll; pm_runtime_get_sync(&edev->hdac.dev); -- 1.9.1

3 3

[alsa-devel] [PATCH v2] ASoC: hdac_hdmi: Remove 'edev' NULL check
by Fabio Estevam 17 Feb '16

17 Feb '16

Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") leads to the following Smatch complaint: sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense() warn: variable dereferenced before check 'edev' (see line 967) As explained by Subhransu S. Prusty: "This NULL check is not required, can be removed. edev object is expected to be present when the present_sense is called. This is called from places where this edev object is already available." So remove the evdev NULL check. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Remove NULL check (Subhransu) sound/soc/codecs/hdac_hdmi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 36f1200..2884dbf 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -968,9 +968,6 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll) struct hdac_hdmi_pcm *pcm; int val; - if (!edev) - return; - pin->repoll_count = repoll; pm_runtime_get_sync(&edev->hdac.dev); -- 1.9.1

3 2

[alsa-devel] [PATCH RFT] ASoC: max98926: Fix blr_clk_ratio calculation
by Axel Lin 17 Feb '16

17 Feb '16

Current code calculates blr_clk_ratio before setting max98926->ch_size, fix it. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- Hi Anish, I don't have this h/w, please review and test this patch. thanks, Axel sound/soc/codecs/max98926.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index 66884ebd..5245e10 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -383,8 +383,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, int rate = params_rate(params), i; struct snd_soc_codec *codec = dai->codec; struct max98926_priv *max98926 = snd_soc_codec_get_drvdata(codec); - /* BCLK/LRCLK ratio calculation */ - int blr_clk_ratio = params_channels(params) * max98926->ch_size; + int blr_clk_ratio; switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: @@ -414,6 +413,9 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* BCLK/LRCLK ratio calculation */ + blr_clk_ratio = params_channels(params) * max98926->ch_size; + switch (blr_clk_ratio) { case 32: regmap_update_bits(max98926->regmap, -- 2.1.4

3 2

[alsa-devel] [RFC v1 0/9] ASoC: Add support to Qualcomm msm8x16-wcd codec
by Srinivas Kandagatla 17 Feb '16

17 Feb '16

This patchset aims at adding msm8x16-wcd codec support. msm8x16-wcd codec is found in Qualcomm msm8916 and apq8016 processors. This codec IP is split in to two parts(Digital & Analog), Analog part is integrated in to PMIC PM8916 and the digital part is integrated into Application processor. Register access to the analog part is done via SPMI interface to PMIC, and registers on the Application processor are memory mapped. Data transfer between Analog and Digital Die is done via a internal bus called PDM. I did split the driver into sensible patches to easy the review process. Most of this driver is ported from downstream Andriod v3.10 kernel. Jack support and Headset button detection code is not added in to this series. This codec support: - 3 Microphones: Primary Mic(Handset mic), Headset Mic and Secondary Mic. - 2 Digital Microphones. - 2 Mic Bias Circuits. - Earpiece - Headset - Loud Speaker. - Jack Detect. - Headset Button detection circuit. Tested this code on v4.5-rc4 with lpass driver capture support patches for Headset (Mic and speakers), Secondary Mic and Loudspeaker on DB410C. DMIC should work too. Thanks, srini Srinivas Kandagatla (9): ASoC: msm8x176: Add Device Tree bindings. ASoC: msm8x16: add driver structure ASoC: msm8x16: add codec registers definitions ASoC: msm8x16: add ranges for default, readonly ASoC: msm8x16: add codec intialization setup ASoC: msm8x16: add codec dais ASoC: msm8x16: Add sound mixer controls. ASoC: msm8x16: add dapm widgets ASoC: msm8x16: add dapm routes .../devicetree/bindings/sound/qcom,msm8x16-wcd.txt | 91 + include/dt-bindings/sound/msm8x16-wcd.h | 7 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 3 +- sound/soc/codecs/msm8x16-wcd-registers.h | 518 +++++ sound/soc/codecs/msm8x16-wcd.c | 2132 ++++++++++++++++++++ sound/soc/codecs/msm8x16-wcd.h | 764 +++++++ 7 files changed, 3518 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8x16-wcd.txt create mode 100644 include/dt-bindings/sound/msm8x16-wcd.h create mode 100644 sound/soc/codecs/msm8x16-wcd-registers.h create mode 100644 sound/soc/codecs/msm8x16-wcd.c create mode 100644 sound/soc/codecs/msm8x16-wcd.h -- 1.9.1

3 18

[alsa-devel] [PATCH v4] portman2x4 - use new parport device model
by Sudip Mukherjee 17 Feb '16

17 Feb '16

Modify portman driver to use the new parallel port device model. The advantage of using the device model is that the device gets binded to the hardware, we get the feature of hotplug, we can bind/unbind the driver at runtime. The changes are in the way the driver gets registered with the parallel port subsystem and the temporary device to probe portman card is removed and portman_probe() is used in the probe callback. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- v4: temporary device to probe is removed. v3: changed commit message v2: 1. pardev_cb is initialized while declaring, thus removing the use of memset. 2. used pdev->id. 3. v1 did not have the parport probe callback, but we will need the probe callback for binding as the name of the driver and the name of the device is different. 4. in v1 I missed modifying snd_portman_probe_port(). sound/drivers/portman2x4.c | 79 +++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 464385a..0741a3b 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -648,30 +648,6 @@ static void snd_portman_interrupt(void *userdata) spin_unlock(&pm->reg_lock); } -static int snd_portman_probe_port(struct parport *p) -{ - struct pardevice *pardev; - int res; - - pardev = parport_register_device(p, DRIVER_NAME, - NULL, NULL, NULL, - 0, NULL); - if (!pardev) - return -EIO; - - if (parport_claim(pardev)) { - parport_unregister_device(pardev); - return -EIO; - } - - res = portman_probe(p); - - parport_release(pardev); - parport_unregister_device(pardev); - - return res ? -EIO : 0; -} - static void snd_portman_attach(struct parport *p) { struct platform_device *device; @@ -705,10 +681,20 @@ static void snd_portman_detach(struct parport *p) /* nothing to do here */ } +static int snd_portman_dev_probe(struct pardevice *pardev) +{ + if (strcmp(pardev->name, DRIVER_NAME)) + return -ENODEV; + + return 0; +} + static struct parport_driver portman_parport_driver = { - .name = "portman2x4", - .attach = snd_portman_attach, - .detach = snd_portman_detach + .name = "portman2x4", + .probe = snd_portman_dev_probe, + .match_port = snd_portman_attach, + .detach = snd_portman_detach, + .devmodel = true, }; /********************************************************************* @@ -736,6 +722,12 @@ static int snd_portman_probe(struct platform_device *pdev) struct snd_card *card = NULL; struct portman *pm = NULL; int err; + struct pardev_cb portman_cb = { + .preempt = NULL, + .wakeup = NULL, + .irq_func = snd_portman_interrupt, /* ISR */ + .flags = PARPORT_DEV_EXCL, /* flags */ + }; p = platform_get_drvdata(pdev); platform_set_drvdata(pdev, NULL); @@ -745,9 +737,6 @@ static int snd_portman_probe(struct platform_device *pdev) if (!enable[dev]) return -ENOENT; - if ((err = snd_portman_probe_port(p)) < 0) - return err; - err = snd_card_new(&pdev->dev, index[dev], id[dev], THIS_MODULE, 0, &card); if (err < 0) { @@ -759,23 +748,33 @@ static int snd_portman_probe(struct platform_device *pdev) sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, p->base, p->irq); - pardev = parport_register_device(p, /* port */ - DRIVER_NAME, /* name */ - NULL, /* preempt */ - NULL, /* wakeup */ - snd_portman_interrupt, /* ISR */ - PARPORT_DEV_EXCL, /* flags */ - (void *)card); /* private */ + portman_cb.private = card; /* private */ + pardev = parport_register_dev_model(p, /* port */ + DRIVER_NAME, /* name */ + &portman_cb, /* callbacks */ + pdev->id); /* device number */ if (pardev == NULL) { snd_printd("Cannot register pardevice\n"); err = -EIO; goto __err; } + if (parport_claim(pardev)) { + err = -EIO; + goto free_pardev; + } + + err = portman_probe(p); + parport_release(pardev); + + if (err) { + err = -EIO; + goto free_pardev; + } + if ((err = portman_create(card, pardev, &pm)) < 0) { snd_printd("Cannot create main component\n"); - parport_unregister_device(pardev); - goto __err; + goto free_pardev; } card->private_data = pm; card->private_free = snd_portman_card_private_free; @@ -808,6 +807,8 @@ static int snd_portman_probe(struct platform_device *pdev) snd_printk(KERN_INFO "Portman 2x4 on 0x%lx\n", p->base); return 0; +free_pardev: + parport_unregister_device(pardev); __err: snd_card_free(card); return err; -- 1.9.1

2 1

Re: [alsa-devel] ASoC: hdac_hdmi: Add jack reporting
by Dan Carpenter 17 Feb '16

17 Feb '16

Hello Jeeja KP, This is a semi-automatic email about new static checker warnings. The patch 4a3478debf36: "ASoC: hdac_hdmi: Add jack reporting" from Feb 12, 2016, leads to the following Smatch complaint: sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense() warn: variable dereferenced before check 'edev' (see line 967) sound/soc/codecs/hdac_hdmi.c 966 struct hdac_ext_device *edev = pin->edev; 967 struct hdac_hdmi_priv *hdmi = edev->private_data; ^^^^^^^^^^^^^^^^^^ Patch introduces a new dereference. 968 struct hdac_hdmi_pcm *pcm; 969 int val; 970 971 if (!edev) ^^^^^ Existing code assumed that edev could be NULL. 972 return; 973 regards, dan carpenter

1 0

[alsa-devel] [PATCH v2] sound: hdmi: avoid dereferencing uninitialized 'jack' pointer
by Arnd Bergmann 16 Feb '16

16 Feb '16

When CONFIG_SND_JACK is disabled, the hdmi driver tries to create a new output jack structure and dereferences it even though the pointer is never assigned: sound/pci/hda/patch_hdmi.c: In function 'generic_hdmi_build_jack': sound/pci/hda/patch_hdmi.c:2534:30: error: 'jack' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/pci/hda/patch_hdmi.c:2526:19: note: 'jack' was declared here This makes snd_jack_new() return an error when SND_JACK is disabled, forcing all users to handle errors gracefully and avoiding the problem in all callers that correctly check the return code. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 788d441a164c ("ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling") --- include/sound/jack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 23bede121c78..1e84a2e413f8 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -99,7 +99,7 @@ void snd_jack_report(struct snd_jack *jack, int status); static inline int snd_jack_new(struct snd_card *card, const char *id, int type, struct snd_jack **jack, bool initial_kctl, bool phantom_jack) { - return 0; + return -ENXIO; } static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask) -- 2.7.0

1 0

[alsa-devel] [RFD] Add hw_params support for hostless stream BE DAIs
by Jeeja KP 16 Feb '16

16 Feb '16

We have no mechanism to configure hw_params for DAIs which are hostless. Like a loop or DAIs connected to internal sinks/sources. Problem Statement: During a BE-BE loop of DSP or a SRC->SINK path, we cannot program hw_params. There are no hw_params from user as these are hostless. This scenario can happens in below 2 cases: Case 1: BE-BE loop aka hostless stream through SoC DSP Hostless stream can be defined by BE to BE connection and in this case the path is enabled or disabled by the state of the DAPM graph. This usually means there is a mixer control that can be used to connect or disconnect the path between both DAIs. Example: |--------------/----------------| | | | | codec out modem_in | | | | ssp0_TX ssp1_RX | | | | AIFI_Playback dummy_capture In the above case (SSP0,codec playback,SSp1 dai needs to be configured and turned on with the selected hw_params). Case 2: SoC Internal Sink or Source Example: WOV SINK (DAPM Sink) | | | Switch | | w1 | dmic rx (BE dai widget) | Capture(codec dai widget) | DMIC AIF | DMic | Soc DMic (MIC Widget) (SRC) In the above case BE (dmic RX) dai hw_params needs to applied. Approach: 1. Allow params to be defined for other BE dai link also. this currently applicable only for codec_codec link. 2. when params is defined for BE dai link, create params kcontrols and associate it with the dai widgets. this will allow params to be selected via Kcontrol for each dai defined in the dai link. 3. Before powering on the dai widget and if the dai is not powered with the stream event, then dai_ops(hw_params) for the dai widget will be called.This will apply the selected hw_params. 4. with the above, fix_up can be removed and can use .params to select the parameter. Core Changes: 1. params definition needs to changed, currently this is defined to used only for codec codec link. define new flag to identifying codec codec link. 2. if params is defined for any BE dai link, then create kcontrol for each dai defined in the dai_link and associated the kcontrol to dai widget. 3. In the powering sequence check if the dai widget and if the event is not a stream event, SND_SOC_DAPM_STREAM_NOP , then call dai ops with the selected params. This will apply the hw_params for dai. 1. params definition: - Add new flag in struct snd_soc_dai_link. - Based on this flag create, the codec codec link instead of params struct snd_soc_dai_link { const struct snd_soc_pcm_stream *params; unsigned int num_params; + /* flag to create codec codec based on the flag*/ + unsigned int codec_link:1; + unsigned int dai_fmt; /* format to set on init */ enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ - creation of dai link based on the codec_link flag static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) } } else { - if (!dai_link->params) { + if (!dai_link->codec_link) { /* create the pcm */ ret = soc_new_pcm(rtd, num); if (ret < 0) { 2. when params is defined for BE dai link, create params kcontrols and associate it with the dai widgets. this will allow params to be selected via Kcontrol for each dai defined in the dai link. a. Move the param control creation from snd_soc_dapm_new_pcm and add new API to created kcontrols with the params. +snd_soc_dapm_create_param_control(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params) { /* create kcontrol based on the params */ } - modify the snd_soc_dapm_new_pcm to create the param control int snd_soc_dapm_new_pcm(struct snd_soc_card *card, const struct snd_soc_pcm_stream *params, unsigned int num_params, struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink) { template.kcontrol_news = snd_soc_dapm_create_param_control(card, params, num_params); if (!template.kcontrol_news) { dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", link_name); ret = -ENOMEM; - goto outfree_private_value; + goto outfree_link_name; } b. add new API snd_soc_dapm_new_dai_params() to create kcontrol for dai and associated it to dai. +int snd_soc_dapm_new_dai_params(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params, + struct snd_soc_dapm_widget *dai_w) +{ + struct snd_kcontrol_new *kcontrol_news; + + kcontrol_news = snd_soc_dapm_create_param_control(card, params, + num_params); + if (!kcontrol_news) { + dev_err(card->dev, "ASoC: Failed to create control for %s widget\n", + dai_w->name); + return -EINVAL; + } + + dai_w->num_kcontrols = 1; + dai_w->kcontrol_news = kcontrol_news; + + dai_w->params = params; + dai_w->num_params = num_params; + + return 0; + +} + +++ b/include/sound/soc-dapm.h +int snd_soc_dapm_new_dai_params(struct snd_soc_card *card, + const struct snd_soc_pcm_stream *params, + unsigned int num_params, + struct snd_soc_dapm_widget *dai_w); c. if the be dai link has .params defined, call new API snd_soc_dapm_new_dai_params +static int soc_link_be_params_widget(struct snd_soc_card *card, + struct snd_soc_dai *dai, + const struct snd_soc_pcm_stream *params, + unsigned int num_params) +{ + int ret; + struct snd_soc_dapm_widget *w; + + if (!strcmp(dai->name, "snd-soc-dummy")) + return 0; + + if (dai->playback_widget) { + w = dai->playback_widget; + ret = snd_soc_dapm_new_dai_params(card, params, + num_params, w); + + if (ret != 0) { + dev_err(card->dev, + "ASoC: Can't create params widget=%s %d\n", + w->name, ret); + return ret; + } + } + + if (dai->capture_widget) { + w = dai->capture_widget; + ret = snd_soc_dapm_new_dai_params(card, params, + num_params, w); + + if (ret != 0) { + dev_err(card->dev, + "ASoC: Can't create params widget=%s %d\n", + w->name, ret); + return ret; + } + } + + return 0; +} + +static int soc_link_be_params_dai_widgets(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link, + struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + int ret, i; + + for (i = 0; i < rtd->num_codecs; i++) { + struct snd_soc_dai *codec = rtd->codec_dais[i]; + + ret = soc_link_be_params_widget(card, codec, + dai_link->params, + dai_link->num_params); + + if (!ret) + return ret; + } + + return soc_link_be_params_widget(card, cpu_dai, dai_link->params, + dai_link->num_params); +} + @@ -1651,6 +1714,13 @@ static int soc_probe_link_dais(struct snd_soc_card *card, dai_link->stream_name, ret); return ret; } + if (dai_link->params && dai_link->no_pcm) { + /* create dai link controls */ + ret = soc_link_be_params_dai_widgets(card, + dai_link, rtd); + if (ret) + return ret; + } } else { INIT_DELAYED_WORK(&rtd->delayed_work, codec2codec_close_delayed_work); 3. Applying the hw_params for dai widget --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1398,9 +1398,64 @@ static void dapm_seq_check_event(struct snd_soc_card * card, } } +static int snd_soc_dai_params(struct snd_soc_dapm_widget *w, int event) +{ + struct snd_soc_dai *dai; + const struct snd_soc_pcm_stream *config = w->params + w->params_select; + struct snd_pcm_substream substream; + struct snd_pcm_hw_params *params = NULL; + u64 fmt; + int ret = 0; + + if (WARN_ON(!config)) + return -EINVAL; + + dai = w->priv; + + if (config->formats) { + fmt = ffs(config->formats) - 1; + } else { + dev_warn(w->dapm->dev, "ASoC: Invalid format %llx specified\n", + config->formats); + fmt = 0; + } + + /* Currently very limited parameter selection */ + params = kzalloc(sizeof(*params), GFP_KERNEL); + if (!params) { + ret = -ENOMEM; + goto out; + } + snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt); + + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = + config->rate_min; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = + config->rate_max; + + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min + = config->channels_min; + hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max + = config->channels_max; + + memset(&substream, 0, sizeof(substream)); + if (w->id == snd_soc_dapm_dai_in) + substream.stream = SNDRV_PCM_STREAM_CAPTURE; + else + substream.stream = SNDRV_PCM_STREAM_PLAYBACK; + + ret = soc_dai_hw_params(&substream, params, dai); + if (ret < 0) + goto out; +out: + kfree(params); + return ret; +} + /* Apply the coalesced changes from a DAPM sequence */ static void dapm_seq_run_coalesced(struct snd_soc_card *card, - struct list_head *pending) + struct list_head *pending, + int event) { struct snd_soc_dapm_context *dapm; struct snd_soc_dapm_widget *w; @@ -1413,6 +1468,14 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card, dapm = w->dapm; list_for_each_entry(w, pending, power_list) { + if ((event == SND_SOC_DAPM_STREAM_NOP) && + ((w->id == snd_soc_dapm_dai_out) || + (w->id == snd_soc_dapm_dai_in))) { + snd_soc_dai_params(w, SND_SOC_DAPM_PRE_PMU); + } + } + + list_for_each_entry(w, pending, power_list) { WARN_ON(reg != w->reg || dapm != w->dapm); w->power = w->new_power; @@ -1447,6 +1510,13 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card, dapm_seq_check_event(card, w, SND_SOC_DAPM_POST_PMU); dapm_seq_check_event(card, w, SND_SOC_DAPM_POST_PMD); } + list_for_each_entry(w, pending, power_list) { + if ((event == SND_SOC_DAPM_STREAM_NOP) && + ((w->id == snd_soc_dapm_dai_out) || + (w->id == snd_soc_dapm_dai_in))) { + snd_soc_dai_params(w, SND_SOC_DAPM_POST_PMD); + } + } } /* Apply a DAPM power sequence. @@ -1482,7 +1552,7 @@ static void dapm_seq_run(struct snd_soc_card *card, if (sort[w->id] != cur_sort || w->reg != cur_reg || w->dapm != cur_dapm || w->subseq != cur_subseq) { if (!list_empty(&pending)) - dapm_seq_run_coalesced(card, &pending); + dapm_seq_run_coalesced(card, &pending, event); if (cur_dapm && cur_dapm->seq_notifier) { for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) @@ -1545,7 +1615,7 @@ static void dapm_seq_run(struct snd_soc_card *card, } if (!list_empty(&pending)) - dapm_seq_run_coalesced(card, &pending); + dapm_seq_run_coalesced(card, &pending, event); if (cur_dapm && cur_dapm->seq_notifier) { for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) -- 1.7.9.5 Comments welcome, based on discussion we will send patches. --Jeeja --

1 0

[alsa-devel] sound: list corruption in delete_and_unsubscribe_port
by Dmitry Vyukov 16 Feb '16

16 Feb '16

Hello, Here is a new one on 18558cae0272f8fd9647e69d3fec1565a7949865 (4.5-rc4). But need to note that sound become much more stable, I've seen only 2 of these over night. The following program causes list corruption: ------------[ cut here ]------------ WARNING: CPU: 2 PID: 12546 at lib/list_debug.c:62 __list_del_entry+0x10b/0x1e0() list_del corruption, ffff880063512388->next is LIST_POISON1 (dead000000000100) Modules linked in: CPU: 2 PID: 12546 Comm: a.out Not tainted 4.5.0-rc4+ #328 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 ffffffff87b05080 ffff8800608b7a48 ffffffff82be46cf ffffffff81477fb8 fffffbfff0f60a10 ffff8800608b7ab8 ffff8800637d97c0 ffffffff86ad3780 0000000000000009 000000000000003e ffff8800608b7a88 ffffffff81355139 Call Trace: [<ffffffff81355249>] warn_slowpath_fmt+0xa9/0xd0 kernel/panic.c:494 [<ffffffff82c4c36b>] __list_del_entry+0x10b/0x1e0 lib/list_debug.c:60 [<ffffffff82c4c44d>] list_del+0xd/0x70 lib/list_debug.c:86 [<ffffffff852c38e3>] delete_and_unsubscribe_port+0x1e3/0x2f0 sound/core/seq/seq_ports.c:545 [<ffffffff852c43fa>] clear_subscriber_list+0x15a/0x260 sound/core/seq/seq_ports.c:250 [<ffffffff852c456a>] port_delete+0x6a/0x1c0 sound/core/seq/seq_ports.c:266 [<ffffffff852c5242>] snd_seq_delete_all_ports+0x242/0x350 sound/core/seq/seq_ports.c:330 [<ffffffff852ae1cf>] seq_free_client1+0x2f/0x290 sound/core/seq/seq_clientmgr.c:272 [<ffffffff852ae495>] seq_free_client+0x65/0x160 sound/core/seq/seq_clientmgr.c:299 [<ffffffff852b118d>] snd_seq_release+0x4d/0xb0 sound/core/seq/seq_clientmgr.c:380 [<ffffffff817c3256>] __fput+0x236/0x780 fs/file_table.c:208 [<ffffffff817c3825>] ____fput+0x15/0x20 fs/file_table.c:244 [<ffffffff813b3100>] task_work_run+0x170/0x210 kernel/task_work.c:115 [< inline >] tracehook_notify_resume include/linux/tracehook.h:191 [<ffffffff810066b1>] exit_to_usermode_loop+0x1d1/0x210 arch/x86/entry/common.c:251 [< inline >] prepare_exit_to_usermode arch/x86/entry/common.c:282 [<ffffffff810084ea>] syscall_return_slowpath+0x2ba/0x340 arch/x86/entry/common.c:344 [<ffffffff866626e2>] int_ret_from_sys_call+0x25/0x9f arch/x86/entry/entry_64.S:281 ---[ end trace 4cad985f706f8ace ]--- ------------[ cut here ]------------ // autogenerated by syzkaller (http://github.com/google/syzkaller) #include <pthread.h> #include <stdint.h> #include <string.h> #include <sys/syscall.h> #include <unistd.h> long r[143]; void* thr(void* arg) { switch ((long)arg) { case 0: syscall(SYS_mmap, 0x20000000ul, 0x40000ul, 0x3ul, 0x32ul, 0xfffffffffffffffful, 0x0ul); break; case 1: r[2] = syscall(SYS_open, "/dev/snd/seq", 0x400ul, 0, 0, 0); break; case 2: *(uint8_t*)0x2000df50 = (uint8_t)0xffffffffffffff80; *(uint8_t*)0x2000df51 = (uint8_t)0x1; *(uint8_t*)0x2000df52 = (uint8_t)0xfff; *(uint8_t*)0x2000df53 = (uint8_t)0xb0; *(uint8_t*)0x2000df54 = (uint8_t)0x401; *(uint8_t*)0x2000df55 = (uint8_t)0x7; *(uint8_t*)0x2000df56 = (uint8_t)0x7; *(uint8_t*)0x2000df57 = (uint8_t)0x0; *(uint8_t*)0x2000df58 = (uint8_t)0x1; *(uint8_t*)0x2000df59 = (uint8_t)0x401; *(uint8_t*)0x2000df5a = (uint8_t)0xffffffffffff0001; *(uint8_t*)0x2000df5b = (uint8_t)0x5; *(uint8_t*)0x2000df5c = (uint8_t)0x6; *(uint8_t*)0x2000df5d = (uint8_t)0x0; *(uint8_t*)0x2000df5e = (uint8_t)0xffff; *(uint8_t*)0x2000df5f = (uint8_t)0x3; *(uint8_t*)0x2000df60 = (uint8_t)0x0; *(uint8_t*)0x2000df61 = (uint8_t)0xffffffffffffffc0; *(uint8_t*)0x2000df62 = (uint8_t)0x6; *(uint8_t*)0x2000df63 = (uint8_t)0xfff; *(uint8_t*)0x2000df64 = (uint8_t)0x624c; *(uint8_t*)0x2000df65 = (uint8_t)0x53; *(uint8_t*)0x2000df66 = (uint8_t)0x0; *(uint8_t*)0x2000df67 = (uint8_t)0xfffffffffffffffc; *(uint8_t*)0x2000df68 = (uint8_t)0x3f; *(uint8_t*)0x2000df69 = (uint8_t)0x2; *(uint8_t*)0x2000df6a = (uint8_t)0x4; *(uint8_t*)0x2000df6b = (uint8_t)0x401; *(uint8_t*)0x2000df6c = (uint8_t)0x100000000; *(uint8_t*)0x2000df6d = (uint8_t)0x5; *(uint8_t*)0x2000df6e = (uint8_t)0x1; *(uint8_t*)0x2000df6f = (uint8_t)0x9; *(uint8_t*)0x2000df70 = (uint8_t)0x40; *(uint8_t*)0x2000df71 = (uint8_t)0xfff; *(uint8_t*)0x2000df72 = (uint8_t)0x6; *(uint8_t*)0x2000df73 = (uint8_t)0xffffffffffffff2b; *(uint8_t*)0x2000df74 = (uint8_t)0x1f; *(uint8_t*)0x2000df75 = (uint8_t)0x2; *(uint8_t*)0x2000df76 = (uint8_t)0x4; *(uint8_t*)0x2000df77 = (uint8_t)0x68; *(uint8_t*)0x2000df78 = (uint8_t)0x9c33; *(uint8_t*)0x2000df79 = (uint8_t)0x80; *(uint8_t*)0x2000df7a = (uint8_t)0x3; *(uint8_t*)0x2000df7b = (uint8_t)0x100; *(uint8_t*)0x2000df7c = (uint8_t)0xc1b1; *(uint8_t*)0x2000df7d = (uint8_t)0x3; *(uint8_t*)0x2000df7e = (uint8_t)0x0; *(uint8_t*)0x2000df7f = (uint8_t)0x8; *(uint8_t*)0x2000df80 = (uint8_t)0x3; *(uint8_t*)0x2000df81 = (uint8_t)0x8; *(uint8_t*)0x2000df82 = (uint8_t)0x8; *(uint8_t*)0x2000df83 = (uint8_t)0x5d; *(uint8_t*)0x2000df84 = (uint8_t)0x1; *(uint8_t*)0x2000df85 = (uint8_t)0x9; *(uint8_t*)0x2000df86 = (uint8_t)0x1; *(uint8_t*)0x2000df87 = (uint8_t)0x41; *(uint8_t*)0x2000df88 = (uint8_t)0x3; *(uint8_t*)0x2000df89 = (uint8_t)0x6; *(uint8_t*)0x2000df8a = (uint8_t)0x3f; *(uint8_t*)0x2000df8b = (uint8_t)0x3; *(uint8_t*)0x2000df8c = (uint8_t)0x9; *(uint8_t*)0x2000df8d = (uint8_t)0xffffffffffffff01; *(uint8_t*)0x2000df8e = (uint8_t)0x0; *(uint8_t*)0x2000df8f = (uint8_t)0x6; *(uint8_t*)0x2000df90 = (uint8_t)0xe9c; *(uint8_t*)0x2000df91 = (uint8_t)0x0; *(uint32_t*)0x2000df94 = (uint32_t)0x7b; *(uint32_t*)0x2000df98 = (uint32_t)0x1002; *(uint32_t*)0x2000df9c = (uint32_t)0x9; *(uint32_t*)0x2000dfa0 = (uint32_t)0x1000; *(uint32_t*)0x2000dfa4 = (uint32_t)0x80; *(uint32_t*)0x2000dfa8 = (uint32_t)0x10000; *(uint32_t*)0x2000dfac = (uint32_t)0x8; *(uint64_t*)0x2000dfb0 = (uint64_t)0x0; *(uint32_t*)0x2000dfb8 = (uint32_t)0x3; *(uint32_t*)0x2000dfbc = (uint32_t)0x39; *(uint8_t*)0x2000dfc0 = (uint8_t)0x0; *(uint8_t*)0x2000dfc1 = (uint8_t)0x0; *(uint8_t*)0x2000dfc2 = (uint8_t)0x0; *(uint8_t*)0x2000dfc3 = (uint8_t)0x0; *(uint8_t*)0x2000dfc4 = (uint8_t)0x0; *(uint8_t*)0x2000dfc5 = (uint8_t)0x0; *(uint8_t*)0x2000dfc6 = (uint8_t)0x0; *(uint8_t*)0x2000dfc7 = (uint8_t)0x0; *(uint8_t*)0x2000dfc8 = (uint8_t)0x0; *(uint8_t*)0x2000dfc9 = (uint8_t)0x0; *(uint8_t*)0x2000dfca = (uint8_t)0x0; *(uint8_t*)0x2000dfcb = (uint8_t)0x0; *(uint8_t*)0x2000dfcc = (uint8_t)0x0; *(uint8_t*)0x2000dfcd = (uint8_t)0x0; *(uint8_t*)0x2000dfce = (uint8_t)0x0; *(uint8_t*)0x2000dfcf = (uint8_t)0x0; *(uint8_t*)0x2000dfd0 = (uint8_t)0x0; *(uint8_t*)0x2000dfd1 = (uint8_t)0x0; *(uint8_t*)0x2000dfd2 = (uint8_t)0x0; *(uint8_t*)0x2000dfd3 = (uint8_t)0x0; *(uint8_t*)0x2000dfd4 = (uint8_t)0x0; *(uint8_t*)0x2000dfd5 = (uint8_t)0x0; *(uint8_t*)0x2000dfd6 = (uint8_t)0x0; *(uint8_t*)0x2000dfd7 = (uint8_t)0x0; *(uint8_t*)0x2000dfd8 = (uint8_t)0x0; *(uint8_t*)0x2000dfd9 = (uint8_t)0x0; *(uint8_t*)0x2000dfda = (uint8_t)0x0; *(uint8_t*)0x2000dfdb = (uint8_t)0x0; *(uint8_t*)0x2000dfdc = (uint8_t)0x0; *(uint8_t*)0x2000dfdd = (uint8_t)0x0; *(uint8_t*)0x2000dfde = (uint8_t)0x0; *(uint8_t*)0x2000dfdf = (uint8_t)0x0; *(uint8_t*)0x2000dfe0 = (uint8_t)0x0; *(uint8_t*)0x2000dfe1 = (uint8_t)0x0; *(uint8_t*)0x2000dfe2 = (uint8_t)0x0; *(uint8_t*)0x2000dfe3 = (uint8_t)0x0; *(uint8_t*)0x2000dfe4 = (uint8_t)0x0; *(uint8_t*)0x2000dfe5 = (uint8_t)0x0; *(uint8_t*)0x2000dfe6 = (uint8_t)0x0; *(uint8_t*)0x2000dfe7 = (uint8_t)0x0; *(uint8_t*)0x2000dfe8 = (uint8_t)0x0; *(uint8_t*)0x2000dfe9 = (uint8_t)0x0; *(uint8_t*)0x2000dfea = (uint8_t)0x0; *(uint8_t*)0x2000dfeb = (uint8_t)0x0; *(uint8_t*)0x2000dfec = (uint8_t)0x0; *(uint8_t*)0x2000dfed = (uint8_t)0x0; *(uint8_t*)0x2000dfee = (uint8_t)0x0; *(uint8_t*)0x2000dfef = (uint8_t)0x0; *(uint8_t*)0x2000dff0 = (uint8_t)0x0; *(uint8_t*)0x2000dff1 = (uint8_t)0x0; *(uint8_t*)0x2000dff2 = (uint8_t)0x0; *(uint8_t*)0x2000dff3 = (uint8_t)0x0; *(uint8_t*)0x2000dff4 = (uint8_t)0x0; *(uint8_t*)0x2000dff5 = (uint8_t)0x0; *(uint8_t*)0x2000dff6 = (uint8_t)0x0; *(uint8_t*)0x2000dff7 = (uint8_t)0x0; *(uint8_t*)0x2000dff8 = (uint8_t)0x0; *(uint8_t*)0x2000dff9 = (uint8_t)0x0; *(uint8_t*)0x2000dffa = (uint8_t)0x0; r[138] = syscall(SYS_ioctl, r[2], 0xc0a85320ul, 0x2000df50ul, 0, 0, 0); break; case 3: r[139] = syscall(SYS_read, r[2], 0x20025000ul, 0x75ul, 0, 0, 0); break; case 4: r[140] = syscall(SYS_close, r[2], 0, 0, 0, 0, 0); break; case 5: memcpy((void*)0x20022000, "\x2f\x64\x65\x76\x2f\x73\x65\x71\x75\x65\x6e\x63\x65\x72", 14); syscall(SYS_open, "/dev/sequencer", 0x4000ul, 0, 0, 0); break; } return 0; } int main() { long i; pthread_t th[6]; srand(getpid()); memset(r, -1, sizeof(r)); for (i = 0; i < 6; i++) { pthread_create(&th[i], 0, thr, (void*)i); usleep(10000); } for (i = 0; i < 6; i++) { pthread_create(&th[i], 0, thr, (void*)i); if (rand() % 2 == 0) usleep(rand() % 10000); } usleep(100000); return 0; }

2 3

[alsa-devel] [PATCH v6 00/15] ASoC: hdac_hdmi: Add DP & notification support
by Subhransu S. Prusty 16 Feb '16

16 Feb '16

This patch series adds DP audio and hotplug notification support. In skylake platform the DP is on a different port which is not enabled by default. A vendor widget is programmed to enable playback on all ports. This also enables all the converters. Codec Dais, widgets, graph are now created dynamically based on the nodes enumerated, thus removing the hardcoding. Mux controls are used to establish routing stream to a specific port. For DP audio support, infoframe needs to be different. Based on ELD queried we either pack HDMI or DP infoframe. Also with this series, Jack notification support is added and Jack event is reported to userspace as is done in case of legacy driver. Few fixes are added to check for possible memory leak, reconfiguring register during resume from D3 etc. The 8th patch is adding a small macro for getting connection type in drm header. It is reviewed by drm folks, CCed them. Please merge it through sound trees. changes in v6: - Fixed some review comments - Fix afg node D3 state Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter(a)intel.com> Jeeja KP (2): ASoC: hdac_hdmi: Add jack reporting ASoC: hdac_hdmi: Add PM support Ramesh Babu (1): ASoC: hdac_hdmi: Fix to keep codec power active during enumeration. Subhransu S. Prusty (12): ASoC: hdac_hdmi: Add hotplug notification and read ELD ASoC: hdac_hdmi: Apply constraints based on ELD ASoC: hdac_hdmi: Enable DP1.2 and all converters/pins ASoC: hdac_hdmi: create dais based on number of cvts ASoC: hdac_hdmi: Create widget/route based on nodes enumerated ASoC: hdac_hdmi: Enable playback on all enumerated ports drm/edid: Add API to help find connection type ASoC: hdac_hdmi: Add infoframe support for dp audio ASoC: hdac_hdmi: Fix possible memory leak in hw_params ASoC: hdac_hdmi: Don't fail in dai startup to make userland happy ASoC: hdac_hdmi: Fix to reconfigure registers in runtime resume ASoC: hdac_hdmi: Fix to wait for D3 before powering off codec include/drm/drm_edid.h | 12 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdac_hdmi.c | 1208 +++++++++++++++++++++++++++++++++++++----- sound/soc/codecs/hdac_hdmi.h | 6 + 4 files changed, 1104 insertions(+), 123 deletions(-) create mode 100644 sound/soc/codecs/hdac_hdmi.h -- 1.9.1

4 28

[alsa-devel] [PATCH v2 0/3] ASoC: topology: Add support for FE DAI & DAI links
by mengdong.lin＠linux.intel.com 16 Feb '16

16 Feb '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series allows topology to create FE DAI and DAI links from the PCM topology objects defined by the user space. History: v2: Remove first 2 patches in v1 that were accepted. Add Ack by Takashi to patch 'ALSA: pcm: Add snd_pcm_rate_range_to_bits()' and add his comments on the function's assumption to c file. Mengdong Lin (3): ALSA: pcm: Add snd_pcm_rate_range_to_bits() ASoC: topology: Add FE DAIs dynamically ASoC: topology: Add FE DAI links dynamically include/sound/pcm.h | 2 + include/sound/soc-topology.h | 21 +++-- include/sound/soc.h | 2 +- sound/core/pcm_misc.c | 30 +++++++ sound/soc/soc-topology.c | 195 ++++++++++++++++++++++++++++++++++--------- 5 files changed, 197 insertions(+), 53 deletions(-) -- 2.5.0

6 14

[alsa-devel] [PATCH v3 0/2] ASoC: topology: Add support for FE DAI & DAI links
by mengdong.lin＠linux.intel.com 16 Feb '16

16 Feb '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series allows topology to create FE DAI and DAI links from the PCM topology objects defined by the user space. History: v2: Remove first 2 patches in v1 that were accepted. Add Ack by Takashi to patch 'ALSA: pcm: Add snd_pcm_rate_range_to_bits()' and add his comments on the function's assumption to c file. v3: remove 1st patch in v2 that was accepted. Revise setting of a stream's rates/rate_min/rate_max as Lars suggested. Mengdong Lin (2): ASoC: topology: Add FE DAIs dynamically ASoC: topology: Add FE DAI links dynamically include/sound/soc-topology.h | 21 +++-- include/sound/soc.h | 2 +- sound/soc/soc-topology.c | 195 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 165 insertions(+), 53 deletions(-) -- 2.5.0

2 3

[alsa-devel] [PATCH] ASoC: topology: Fix setting of stream rates, rate_min and rate_max
by mengdong.lin＠linux.intel.com 16 Feb '16

16 Feb '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Directly set a stream's rates, rate_min and rate_max from the topology info. Also define set_stream_info to wrap setting of the stream info. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 0eb01e8..2f7da32 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1575,6 +1575,18 @@ static int soc_tplg_dapm_complete(struct soc_tplg *tplg) return 0; } +static int set_stream_info(struct snd_soc_pcm_stream *stream, + struct snd_soc_tplg_stream_caps *caps) +{ + stream->stream_name = kstrdup(caps->name, GFP_KERNEL); + stream->channels_min = caps->channels_min; + stream->channels_max = caps->channels_max; + stream->rates = caps->rates; + stream->rate_min = caps->rate_min; + stream->rate_max = caps->rate_max; + stream->formats = caps->formats; +} + static int soc_tplg_dai_create(struct soc_tplg *tplg, struct snd_soc_tplg_pcm *pcm) { @@ -1593,25 +1605,13 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, if (pcm->playback) { stream = &dai_drv->playback; caps = &pcm->caps[SND_SOC_TPLG_STREAM_PLAYBACK]; - - stream->stream_name = kstrdup(caps->name, GFP_KERNEL); - stream->channels_min = caps->channels_min; - stream->channels_max = caps->channels_max; - stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min, - caps->rate_max); - stream->formats = caps->formats; + set_stream_info(stream, caps); } if (pcm->capture) { stream = &dai_drv->capture; caps = &pcm->caps[SND_SOC_TPLG_STREAM_CAPTURE]; - - stream->stream_name = kstrdup(caps->name, GFP_KERNEL); - stream->channels_min = caps->channels_min; - stream->channels_max = caps->channels_max; - stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min, - caps->rate_max); - stream->formats = caps->formats; + set_stream_info(stream, caps); } /* pass control to component driver for optional further init */ -- 2.5.0

1 0

[alsa-devel] [asoc:topic/topology 1/2] sound/soc/soc-topology.c:1572:19: error: implicit declaration of function 'snd_pcm_rate_range_to_bits'
by kbuild test robot 16 Feb '16

16 Feb '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/topology head: acfc7d46cddcf71cf18772bbe8717b84eac5f672 commit: 64527e8a352968bda529f01df1c9dd5fe581ff04 [1/2] ASoC: topology: Add FE DAIs dynamically config: i386-allmodconfig (attached as .config) reproduce: git checkout 64527e8a352968bda529f01df1c9dd5fe581ff04 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/soc-topology.c: In function 'soc_tplg_dai_create': >> sound/soc/soc-topology.c:1572:19: error: implicit declaration of function 'snd_pcm_rate_range_to_bits' [-Werror=implicit-function-declaration] stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min, ^ sound/soc/soc-topology.c: At top level: sound/soc/soc-topology.c:249:31: warning: 'get_dobj_type' defined but not used [-Wunused-function] static enum snd_soc_dobj_type get_dobj_type(struct snd_soc_tplg_hdr *hdr, ^ cc1: some warnings being treated as errors vim +/snd_pcm_rate_range_to_bits +1572 sound/soc/soc-topology.c 1566 stream = &dai_drv->playback; 1567 caps = &pcm->caps[SND_SOC_TPLG_STREAM_PLAYBACK]; 1568 1569 stream->stream_name = kstrdup(caps->name, GFP_KERNEL); 1570 stream->channels_min = caps->channels_min; 1571 stream->channels_max = caps->channels_max; > 1572 stream->rates = snd_pcm_rate_range_to_bits(caps->rate_min, 1573 caps->rate_max); 1574 stream->formats = caps->formats; 1575 } --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v2 00/14] ASoC: hdac_hdmi: Add DP & notification support
by Subhransu S. Prusty 15 Feb '16

15 Feb '16

This patch series adds DP audio and hotplug notification support. On Skylake two DP ports are available and to enable DP on both ports all pins need to be enabled. There is a special vendor widget which need to be programmed to enable all pins and converters. This series adds hotplug notification, read/set constraint based on ELD, enable all pin/cvts, DP1.2, programs the audio infoframe for DP. There is a one to one mapping between converter and stream, so the dais are created based on the no of streams supported on hdmi codec. Even though cvts can be mapped dynamically to the streams, currently it is statically mapped as simultaneous playback on both DP and HDMI is not supported as of now. Pin muxes and controls are created dynamically to map converter to pin widget. So at run time specific pin is mapped to the dai based on the control selected (based on the display type DP/HDMI connected). Finally the DP audio infoframe programming is added to support the DP feature. Also with hotplug notification support, ELD is read and capabilities are set for rate, formats and channels. drm_eld sound/core framework is updated to limit the formats based on ELD. There are few fixes one fixing the static checker warning and other one not to fail if no connection list is found for a pin widget. Pls note, the 11th patch is adding a small macro for getting connection type in drm header, we have CCed drm folks on that and this one. Pls ack so that we can have this series merged thru sound trees changes in v2: - Address review comments - Dropped devm_xxx for cvt and pin memory allocation. - Dropped the ELD helper APIs from core and copied to driver. - Updated notification patch to add PM fixes from legacy hda. - commit message and change log updated for display power fix. - Updated DRM helper APIs and the caller Jeeja KP (1): ASoC: hdac_hdmi: Add codec suspend/resume handler Ramesh Babu (1): ASoC: hdac_hdmi: Fix to keep display active while enumerating codec Subhransu S. Prusty (12): ASoC: hdac_hdmi: Fix to check num nodes correctly ASoC: hdac_hdmi: Fix to warn instead of err for no connected nids ASoC: hdac_hdmi - Use list to add pins and converters ASoC: hdac_hdmi: Add hotplug notification and read eld ALSA: pcm: Add DRM helper to set constraint for format ASoC: hdac_hdmi: Apply constraints based on ELD ASoC: hdac_hdmi: Enable DP1.2 and all converters/pins ASoC: hdac_hdmi - create dais based on number of streams ASoC: hdac_hdmi: Create widget/route based on nodes enumerated ASoC: hdac_hdmi: Assign pin for stream based on dapm connection drm/edid: Add API to help find connection type ASoC: hdac_hdmi: Add infoframe support for dp audio include/drm/drm_edid.h | 12 + sound/core/pcm_drm_eld.c | 42 +- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdac_hdmi.c | 1019 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 925 insertions(+), 149 deletions(-) -- 1.9.1

4 32

[alsa-devel] [PATCH 0/5] ASoC: topology: Add support for FE DAI & DAI links
by mengdong.lin＠linux.intel.com 15 Feb '16

15 Feb '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series allows topology to create FE DAI and DAI links from the PCM topology objects defined by the user space. Mengdong Lin (5): ASoC: Define soc_add_dai() to add a DAI to a component ASoC: Support registering a DAI dynamically ALSA: pcm: Add snd_pcm_rate_range_to_bits() ASoC: topology: Add FE DAIs dynamically ASoC: topology: Add FE DAI links dynamically include/sound/pcm.h | 2 + include/sound/soc-dai.h | 1 + include/sound/soc-topology.h | 21 +++-- include/sound/soc.h | 5 +- sound/core/pcm_misc.c | 27 ++++++ sound/soc/soc-core.c | 128 ++++++++++++++++++++-------- sound/soc/soc-topology.c | 195 ++++++++++++++++++++++++++++++++++--------- 7 files changed, 291 insertions(+), 88 deletions(-) -- 2.5.0

3 12

[alsa-devel] [PATCH] ASoC: Add max9867 codec driver
by anish kumar 15 Feb '16

15 Feb '16

Signed-off-by: anish kumar <yesanishhere(a)gmail.com> --- .../devicetree/bindings/sound/max9867.txt | 17 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 1 + sound/soc/codecs/max9867.c | 528 +++++++++++++++++++++ sound/soc/codecs/max9867.h | 83 ++++ 5 files changed, 633 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/max9867.txt create mode 100755 sound/soc/codecs/max9867.c create mode 100755 sound/soc/codecs/max9867.h diff --git a/Documentation/devicetree/bindings/sound/max9867.txt b/Documentation/devicetree/bindings/sound/max9867.txt new file mode 100644 index 0000000..394cd4e --- /dev/null +++ b/Documentation/devicetree/bindings/sound/max9867.txt @@ -0,0 +1,17 @@ +max9867 codec + +This device supports I2C mode only. + +Required properties: + +- compatible : "maxim,max9867" +- reg : The chip select number on the I2C bus + +Example: + +&i2c { + max9867: max9867@0x18 { + compatible = "maxim,max9867"; + reg = <0x18>; + }; +}; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c3178e3..913c83c 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98095 if I2C select SND_SOC_MAX98357A if GPIOLIB + select SND_SOC_MAX9867 if I2C select SND_SOC_MAX98925 if I2C select SND_SOC_MAX98926 if I2C select SND_SOC_MAX9850 if I2C @@ -490,6 +491,9 @@ config SND_SOC_MAX98095 config SND_SOC_MAX98357A tristate +config SND_SOC_MAX9867 + tristate + config SND_SOC_MAX98925 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 84843f3..f39dee7 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -70,6 +70,7 @@ snd-soc-max98088-objs := max98088.o snd-soc-max98090-objs := max98090.o snd-soc-max98095-objs := max98095.o snd-soc-max98357a-objs := max98357a.o +snd-soc-max9867-objs := max9867.o snd-soc-max98925-objs := max98925.o snd-soc-max98926-objs := max98926.o snd-soc-max9850-objs := max9850.o diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c new file mode 100755 index 0000000..57e4c93 --- /dev/null +++ b/sound/soc/codecs/max9867.c @@ -0,0 +1,528 @@ +/* + * max9867.c -- max9867 ALSA SoC Audio driver + * + * Copyright 2013-15 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/delay.h> +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> +#include "max9867.h" + +static const char *const max9867_spmode[] = { + "Stereo Diff", "Mono Diff", + "Stereo Cap", "Mono Cap", + "Stereo Single", "Mono Single", + "Stereo Single Fast", "Mono Single Fast" +}; +static const char *const max9867_sidetone_text[] = { + "None", "Left", "Right", "LeftRight", "LeftRightDiv2", +}; +static const char *const max9867_filter_text[] = {"IIR", "FIR"}; + +static SOC_ENUM_SINGLE_DECL(max9867_filter, MAX9867_CODECFLTR, 7, + max9867_filter_text); +static SOC_ENUM_SINGLE_DECL(max9867_spkmode, MAX9867_MODECONFIG, 0, + max9867_spmode); +static SOC_ENUM_SINGLE_DECL(max9867_sidetone, MAX9867_DACGAIN, 6, + max9867_sidetone_text); + +static const struct snd_kcontrol_new max9867_snd_controls[] = { + SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL, + MAX9867_RIGHTVOL, 0, 63, 1), + SOC_DOUBLE_R("Capture Volume", MAX9867_LEFTLINELVL, + MAX9867_RIGTHLINELVL, 0, 15, 1), + SOC_DOUBLE_R("Mic Gain", MAX9867_LEFTMICGAIN, + MAX9867_RIGHTMICGAIN, 0, 31, 1), + SOC_DOUBLE_R("Mic Preamp Gain", MAX9867_LEFTMICGAIN, + MAX9867_RIGHTMICGAIN, 5, 3, 0), + SOC_ENUM("Digital Sidetone Src", max9867_sidetone), + SOC_SINGLE("Sidetone Gain", MAX9867_DACGAIN, 0, 31, 1), + SOC_SINGLE("DAC Gain", MAX9867_DACLEVEL, 4, 3, 0), + SOC_SINGLE("DAC Attenuation", MAX9867_DACLEVEL, 0, 15, 1), + SOC_DOUBLE("ADC Left Gain", MAX9867_ADCLEVEL, 4, 0, 15, 1), + SOC_DOUBLE("ADC Right Gain", MAX9867_ADCLEVEL, 0, 0, 15, 1), + SOC_ENUM("Speaker Mode", max9867_spkmode), + SOC_SINGLE("Volume Smoothing", MAX9867_MODECONFIG, 6, 1, 0), + SOC_SINGLE("ZCD Switch", MAX9867_MODECONFIG, 5, 1, 0), + SOC_ENUM("DSP Filter", max9867_filter), +}; + +static const char *const max9867_mux[] = {"None", "Mic", "Line", "Mic_Line"}; + +static SOC_ENUM_SINGLE_DECL(max9867_mux_enum, + MAX9867_INPUTCONFIG, MAX9867_INPUT_SHIFT, + max9867_mux); + +static const struct snd_kcontrol_new max9867_dapm_mux_controls = + SOC_DAPM_ENUM("Route", max9867_mux_enum); + +static const struct snd_kcontrol_new max9867_left_dapm_control = + SOC_DAPM_SINGLE("Switch", MAX9867_PWRMAN, 6, 1, 0); +static const struct snd_kcontrol_new max9867_right_dapm_control = + SOC_DAPM_SINGLE("Switch", MAX9867_PWRMAN, 5, 1, 0); +static const struct snd_kcontrol_new max9867_line_dapm_control = + SOC_DAPM_SINGLE("Switch", MAX9867_LEFTLINELVL, 6, 1, 1); + +static const struct snd_soc_dapm_widget max9867_dapm_widgets[] = { + SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC("Left DAC", NULL, MAX9867_PWRMAN, 3, 0), + SND_SOC_DAPM_DAC("Right DAC", NULL, MAX9867_PWRMAN, 2, 0), + SND_SOC_DAPM_MIXER("Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_OUTPUT("HPOUT"), + + SND_SOC_DAPM_AIF_IN("DAI_IN", "HiFi Capture", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_ADC("Left ADC", "HiFi Capture", MAX9867_PWRMAN, 1, 0), + SND_SOC_DAPM_ADC("Right ADC", "HiFi Capture", MAX9867_PWRMAN, 0, 0), + SND_SOC_DAPM_MUX("Input Mux", SND_SOC_NOPM, 0, 0, + &max9867_dapm_mux_controls), + + SND_SOC_DAPM_MIXER("Input Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_SWITCH("Left Line", MAX9867_LEFTLINELVL, 6, 1, + &max9867_left_dapm_control), + SND_SOC_DAPM_SWITCH("Right Line", MAX9867_RIGTHLINELVL, 6, 1, + &max9867_right_dapm_control), + SND_SOC_DAPM_SWITCH("Line Mixer", SND_SOC_NOPM, 0, 0, + &max9867_line_dapm_control), + SND_SOC_DAPM_INPUT("LINE_IN"), +}; + +static const struct snd_soc_dapm_route max9867_audio_map[] = { + {"Left DAC", NULL, "DAI_OUT"}, + {"Right DAC", NULL, "DAI_OUT"}, + {"Output Mixer", NULL, "Left DAC"}, + {"Output Mixer", NULL, "Right DAC"}, + {"HPOUT", NULL, "Output Mixer"}, + + {"Left ADC", NULL, "DAI_IN"}, + {"Right ADC", NULL, "DAI_IN"}, + {"Input Mixer", NULL, "Left ADC"}, + {"Input Mixer", NULL, "Right ADC"}, + {"Input Mux", "Line", "Input Mixer"}, + {"Input Mux", "Mic", "Input Mixer"}, + {"Input Mux", "Mic_Line", "Input Mixer"}, + {"Right Line", "Switch", "Input Mux"}, + {"Left Line", "Switch", "Input Mux"}, + {"LINE_IN", NULL, "Left Line"}, + {"LINE_IN", NULL, "Right Line"}, +}; + +enum rates { + pcm_rate_8, pcm_rate_16, pcm_rate_24, + pcm_rate_32, pcm_rate_44, + pcm_rate_48, max_pcm_rate, +}; + +struct ni_div_rates { + u32 mclk; + u16 ni[max_pcm_rate]; +} ni_div[] = { + {11289600, {0x116A, 0x22D4, 0x343F, 0x45A9, 0x6000, 0x687D} }, + {12000000, {0x1062, 0x20C5, 0x3127, 0x4189, 0x5A51, 0x624E} }, + {12288000, {0x1000, 0x2000, 0x3000, 0x4000, 0x5833, 0x6000} }, + {13000000, {0x0F20, 0x1E3F, 0x2D5F, 0x3C7F, 0x535F, 0x5ABE} }, + {19200000, {0x0A3D, 0x147B, 0x1EB8, 0x28F6, 0x3873, 0x3D71} }, + {24000000, {0x1062, 0x20C5, 0x1893, 0x4189, 0x5A51, 0x624E} }, + {26000000, {0x0F20, 0x1E3F, 0x16AF, 0x3C7F, 0x535F, 0x5ABE} }, + {27000000, {0x0E90, 0x1D21, 0x15D8, 0x3A41, 0x5048, 0x5762} }, +}; + +static inline int get_ni_value(int mclk, int rate) +{ + int i, ret = 0; + + /* find the closest rate index*/ + for (i = 0; i < ARRAY_SIZE(ni_div); i++) { + if (ni_div[i].mclk >= mclk) + break; + } + + switch (rate) { + case 8000: + return ni_div[i].ni[pcm_rate_8]; + case 16000: + return ni_div[i].ni[pcm_rate_16]; + case 32000: + return ni_div[i].ni[pcm_rate_32]; + case 44100: + return ni_div[i].ni[pcm_rate_44]; + case 48000: + return ni_div[i].ni[pcm_rate_48]; + default: + pr_err("%s wrong rate %d\n", __func__, rate); + ret = -EINVAL; + } + return ret; +} + +static int max9867_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + if (!max9867->master) { + unsigned int ni_h, ni_l, value; + + value = get_ni_value(max9867->sysclk, params_rate(params)); + if (value < 0) + return value; + + ni_h = (0xFF00 & value) >> 8; + ni_l = 0x00FF & value; + /* + * digital pll locks on to any externally supplied LRCLK signal + * and also enable rapid lock mode. + */ + /* set up the ni value */ + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKHIGH, + MAX9867_NI_HIGH_MASK, ni_h); + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKLOW, + MAX9867_NI_LOW_MASK, ni_l); + /*rapid lock mode*/ + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKLOW, + MAX9867_RAPID_LOCK, MAX9867_RAPID_LOCK); + regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKHIGH, + MAX9867_PLL, MAX9867_PLL); + } else { + unsigned long int bclk_rate, pclk_bclk_ratio; + int bclk_value; + + bclk_rate = params_rate(params) * 2 * + snd_pcm_format_width(params_format(params)); + pclk_bclk_ratio = max9867->pclk/bclk_rate; + switch (snd_pcm_format_width(params_format(params))) { + case 8: + case 16: + if (pclk_bclk_ratio == 2) + bclk_value = MAX9867_IFC1B_PCLK_2; + else if (pclk_bclk_ratio == 4) + bclk_value = MAX9867_IFC1B_PCLK_4; + else if (pclk_bclk_ratio == 8) + bclk_value = MAX9867_IFC1B_PCLK_8; + else if (pclk_bclk_ratio == 16) + bclk_value = MAX9867_IFC1B_PCLK_16; + else { + dev_err(codec->dev, "unsupported sampling rate\n"); + return -EINVAL; + } + break; + case 24: + bclk_value = MAX9867_IFC1B_24BIT; + break; + case 32: + bclk_value = MAX9867_IFC1B_32BIT; + break; + default: + dev_err(codec->dev, "unsupported sampling rate\n"); + return -EINVAL; + } + regmap_update_bits(max9867->regmap, MAX9867_IFC1B, + MAX9867_IFC1B_BCLK_MASK, bclk_value); + } + return 0; +} + +static int max9867_prepare(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + regmap_update_bits(max9867->regmap, MAX9867_PWRMAN, + MAX9867_SHTDOWN_MASK, MAX9867_SHTDOWN_MASK); + return 0; +} + +static int max9867_mute(struct snd_soc_dai *dai, int mute) +{ + struct snd_soc_codec *codec = dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + if (mute) + regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL, + MAX9867_DAC_MUTE_MASK, MAX9867_DAC_MUTE_MASK); + else + regmap_update_bits(max9867->regmap, MAX9867_DACLEVEL, + MAX9867_DAC_MUTE_MASK, 0); + return 0; +} + +static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai, + int clk_id, unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + int value = 0; + + /* Set the prescaler based on the master clock frequency*/ + if (freq >= 10000000 && freq <= 20000000) { + value |= MAX9867_PSCLK_10_20; + max9867->pclk = freq; + } else if (freq >= 20000000 && freq <= 40000000) { + value |= MAX9867_PSCLK_20_40; + max9867->pclk = freq/2; + } else if (freq >= 40000000 && freq <= 60000000) { + value |= MAX9867_PSCLK_40_60; + max9867->pclk = freq/4; + } else { + pr_err("bad clock frequency %d", freq); + return -EINVAL; + } + value = value << MAX9867_PSCLK_SHIFT; + max9867->sysclk = freq; + /* exact integer mode is not supported */ + value &= ~MAX9867_FREQ_MASK; + regmap_update_bits(max9867->regmap, MAX9867_SYSCLK, + MAX9867_PSCLK_MASK, value); + return 0; +} + +static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + u8 iface1A = 0, iface1B = 0; + int ret; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + max9867->master = 1; + iface1A |= MAX9867_MASTER; + break; + case SND_SOC_DAIFMT_CBS_CFS: + max9867->master = 0; + iface1A &= ~MAX9867_MASTER; + break; + default: + return -EINVAL; + } + + /* for i2s compatible mode */ + iface1A |= MAX9867_I2S_DLY; + /* SDOUT goes to hiz state after all data is transferred */ + iface1A |= MAX9867_SDOUT_HIZ; + + /* Clock inversion bits, BCI and WCI */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_IB_IF: + iface1A |= MAX9867_WCI_MODE | MAX9867_BCI_MODE; + break; + case SND_SOC_DAIFMT_IB_NF: + iface1A |= MAX9867_BCI_MODE; + break; + case SND_SOC_DAIFMT_NB_IF: + iface1A |= MAX9867_WCI_MODE; + break; + default: + return -EINVAL; + } + + ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A); + ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B); + return 0; +} + +static struct snd_soc_dai_ops max9867_dai_ops = { + .set_fmt = max9867_dai_set_fmt, + .set_sysclk = max9867_set_dai_sysclk, + .prepare = max9867_prepare, + .digital_mute = max9867_mute, + .hw_params = max9867_dai_hw_params, +}; + +#define MAX9867_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) +#define MAX9867_FORMATS (SNDRV_PCM_FMTBIT_S16_LE) + +static struct snd_soc_dai_driver max9867_dai[] = { + { + .name = "max9867-aif1", + .playback = { + .stream_name = "HiFi Playback", + .channels_min = 1, + .channels_max = 2, + .rates = MAX9867_RATES, + .formats = MAX9867_FORMATS, + }, + .capture = { + .stream_name = "HiFi Capture", + .channels_min = 1, + .channels_max = 2, + .rates = MAX9867_RATES, + .formats = MAX9867_FORMATS, + }, + .ops = &max9867_dai_ops, + } +}; + +#ifdef CONFIG_PM_SLEEP +static int max9867_suspend(struct device *dev) +{ + struct max9867_priv *max9867 = dev_get_drvdata(dev); + + /* Drop down to power saving mode when system is suspended */ + regmap_update_bits(max9867->regmap, MAX9867_PWRMAN, + MAX9867_SHTDOWN_MASK, ~MAX9867_SHTDOWN_MASK); + return 0; +} + +static int max9867_resume(struct device *dev) +{ + struct max9867_priv *max9867 = dev_get_drvdata(dev); + + msleep(20); + regmap_update_bits(max9867->regmap, MAX9867_PWRMAN, + MAX9867_SHTDOWN_MASK, MAX9867_SHTDOWN_MASK); + return 0; +} +#endif + +static int max9867_probe(struct snd_soc_codec *codec) +{ + struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec); + + max9867->codec = codec; + codec->control_data = max9867->regmap; + return 0; +} + +static struct snd_soc_codec_driver max9867_codec = { + .probe = max9867_probe, + .controls = max9867_snd_controls, + .num_controls = ARRAY_SIZE(max9867_snd_controls), + .dapm_routes = max9867_audio_map, + .num_dapm_routes = ARRAY_SIZE(max9867_audio_map), + .dapm_widgets = max9867_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets), +}; + +static bool max9867_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX9867_STATUS: + case MAX9867_JACKSTATUS: + case MAX9867_AUXHIGH: + case MAX9867_AUXLOW: + return true; + default: + return false; + } +} + +static struct reg_default max9867_reg[] = { + { 0x04, 0x00 }, + { 0x05, 0x00 }, + { 0x06, 0x00 }, + { 0x07, 0x00 }, + { 0x08, 0x00 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, + { 0x0B, 0x00 }, + { 0x0C, 0x00 }, + { 0x0D, 0x00 }, + { 0x0E, 0x00 }, + { 0x0F, 0x00 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + { 0x12, 0x00 }, + { 0x13, 0x00 }, + { 0x14, 0x00 }, + { 0x15, 0x00 }, + { 0x16, 0x00 }, + { 0x17, 0x00 }, +}; + +static struct regmap_config max9867_regmap = { + .reg_bits = 8, + .val_bits = 8, + .max_register = MAX9867_REVISION, + .reg_defaults = max9867_reg, + .num_reg_defaults = ARRAY_SIZE(max9867_reg), + .volatile_reg = max9867_volatile_register, + .cache_type = REGCACHE_RBTREE, +}; + +static int max9867_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct max9867_priv *max9867; + int ret = 0, reg; + + max9867 = devm_kzalloc(&i2c->dev, + sizeof(*max9867), GFP_KERNEL); + if (!max9867) + return -ENOMEM; + + i2c_set_clientdata(i2c, max9867); + max9867->regmap = devm_regmap_init_i2c(i2c, &max9867_regmap); + if (IS_ERR(max9867->regmap)) { + ret = PTR_ERR(max9867->regmap); + dev_err(&i2c->dev, + "Failed to allocate regmap: %d\n", ret); + return ret; + } + ret = regmap_read(max9867->regmap, + MAX9867_REVISION, &reg); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to read: %d\n", ret); + return ret; + } + dev_info(&i2c->dev, "device revision: %x\n", reg); + ret = snd_soc_register_codec(&i2c->dev, &max9867_codec, + max9867_dai, ARRAY_SIZE(max9867_dai)); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); + return ret; + } + return ret; +} + +static int max9867_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + return 0; +} + +static const struct i2c_device_id max9867_i2c_id[] = { + { "max9867", 0 }, +}; + +static const struct of_device_id max9867_of_match[] = { + { .compatible = "maxim,max9867", }, + { } +}; + +MODULE_DEVICE_TABLE(i2c, max9867_i2c_id); + +static const struct dev_pm_ops max9867_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(max9867_suspend, max9867_resume) +}; + +static struct i2c_driver max9867_i2c_driver = { + .driver = { + .name = "max9867", + .of_match_table = of_match_ptr(max9867_of_match), + .pm = &max9867_pm_ops, + }, + .probe = max9867_i2c_probe, + .remove = max9867_i2c_remove, + .id_table = max9867_i2c_id, +}; + +module_i2c_driver(max9867_i2c_driver); + +MODULE_AUTHOR("anish kumar <yesanishhere(a)gmail.com>"); +MODULE_DESCRIPTION("ALSA SoC MAX9867 driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/max9867.h b/sound/soc/codecs/max9867.h new file mode 100755 index 0000000..65590b4 --- /dev/null +++ b/sound/soc/codecs/max9867.h @@ -0,0 +1,83 @@ +/* + * max9867.h -- MAX9867 ALSA SoC Audio driver + * + * Copyright 2013-2015 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _MAX9867_H +#define _MAX9867_H + +/* MAX9867 register space */ + +#define MAX9867_STATUS 0x00 +#define MAX9867_JACKSTATUS 0x01 +#define MAX9867_AUXHIGH 0x02 +#define MAX9867_AUXLOW 0x03 +#define MAX9867_INTEN 0x04 +#define MAX9867_SYSCLK 0x05 +#define MAX9867_FREQ_MASK 0xF +#define MAX9867_PSCLK_SHIFT 0x4 +#define MAX9867_PSCLK_WIDTH 0x2 +#define MAX9867_PSCLK_MASK (0x03<<MAX9867_PSCLK_SHIFT) +#define MAX9867_PSCLK_10_20 0x1 +#define MAX9867_PSCLK_20_40 0x2 +#define MAX9867_PSCLK_40_60 0x3 +#define MAX9867_AUDIOCLKHIGH 0x06 +#define MAX9867_NI_HIGH_WIDTH 0x7 +#define MAX9867_NI_HIGH_MASK 0x7F +#define MAX9867_NI_LOW_MASK 0x7F +#define MAX9867_NI_LOW_SHIFT 0x1 +#define MAX9867_PLL (1<<7) +#define MAX9867_AUDIOCLKLOW 0x07 +#define MAX9867_RAPID_LOCK 0x01 +#define MAX9867_IFC1A 0x08 +#define MAX9867_MASTER (1<<7) +#define MAX9867_I2S_DLY (1<<4) +#define MAX9867_SDOUT_HIZ (1<<3) +#define MAX9867_TDM_MODE (1<<2) +#define MAX9867_WCI_MODE (1<<6) +#define MAX9867_BCI_MODE (1<<5) +#define MAX9867_IFC1B 0x09 +#define MAX9867_IFC1B_BCLK_MASK 7 +#define MAX9867_IFC1B_32BIT 0x01 +#define MAX9867_IFC1B_24BIT 0x02 +#define MAX9867_IFC1B_PCLK_2 4 +#define MAX9867_IFC1B_PCLK_4 5 +#define MAX9867_IFC1B_PCLK_8 6 +#define MAX9867_IFC1B_PCLK_16 7 +#define MAX9867_CODECFLTR 0x0a +#define MAX9867_DACGAIN 0x0b +#define MAX9867_DACLEVEL 0x0c +#define MAX9867_DAC_MUTE_SHIFT 0x6 +#define MAX9867_DAC_MUTE_WIDTH 0x1 +#define MAX9867_DAC_MUTE_MASK (0x1<<MAX9867_DAC_MUTE_SHIFT) +#define MAX9867_ADCLEVEL 0x0d +#define MAX9867_LEFTLINELVL 0x0e +#define MAX9867_RIGTHLINELVL 0x0f +#define MAX9867_LEFTVOL 0x10 +#define MAX9867_RIGHTVOL 0x11 +#define MAX9867_LEFTMICGAIN 0x12 +#define MAX9867_RIGHTMICGAIN 0x13 +#define MAX9867_INPUTCONFIG 0x14 +#define MAX9867_INPUT_SHIFT 0x6 +#define MAX9867_MICCONFIG 0x15 +#define MAX9867_MODECONFIG 0x16 +#define MAX9867_PWRMAN 0x17 +#define MAX9867_SHTDOWN_MASK (1<<7) +#define MAX9867_REVISION 0xff + +#define MAX9867_CACHEREGNUM 10 + +/* codec private data */ +struct max9867_priv { + struct regmap *regmap; + struct snd_soc_codec *codec; + unsigned int sysclk; + unsigned int pclk; + unsigned int master; +}; +#endif -- 1.9.3

2 1

[alsa-devel] Error while doing ./alsa-utils-alsa-compile.sh --driver --kmodules'
by Dieter Sauerwein 15 Feb '16

15 Feb '16

File environment.base is cached. > cd /tmp/alsa-compile-script File environment.compile is cached. alsa-driver tree alsa-driver-1.0.25.3584.gb044d is present. Reusing it. Use './alsa-utils-alsa-compile.sh --clean=alsa-driver' command to refetch and rebuild. Sources unpacked to alsa-driver-1.0.25.3584.gb044d > cd alsa-driver-1.0.25.3584.gb044d Running make: make dep make[1]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/include' make -C sound prepare make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/include/sound' make prepare2 make[4]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/include/sound' make[4]: Nothing to be done for 'prepare2'. make[4]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/include/sound' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/include/sound' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/include' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/ioctl32' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/ioctl32' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/oss' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/oss' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/seq' make[4]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/seq/oss' make[4]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/seq/oss' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/seq' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/i2c' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/i2c/l3' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/i2c/l3' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/i2c/other' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/i2c/other' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/i2c' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/mpu401' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/mpu401' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/opl3' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/opl3' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/opl4' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/opl4' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/pcsp' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/pcsp' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/vx' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers/vx' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/drivers' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/ad1816a' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/ad1816a' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/ad1848' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/ad1848' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/cs423x' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/cs423x' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/es1688' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/es1688' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/galaxy' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/galaxy' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/gus' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/gus' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/msnd' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/msnd' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/opti9xx' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/opti9xx' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/sb' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/sb' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/wavefront' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/wavefront' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/wss' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa/wss' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/isa' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/synth' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/synth/emux' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/synth/emux' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/synth' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ac97' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ac97' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ali5451' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ali5451' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/asihpi' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/asihpi' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/au88x0' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/au88x0' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/aw2' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/aw2' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ca0106' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ca0106' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/cs46xx' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/cs46xx' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/cs5535audio' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/cs5535audio' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ctxfi' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ctxfi' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/echoaudio' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/echoaudio' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/emu10k1' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/emu10k1' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/hda' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/hda' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ice1712' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ice1712' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/korg1212' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/korg1212' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/lola' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/lola' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/lx6464es' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/lx6464es' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/mixart' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/mixart' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/nm256' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/nm256' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/oxygen' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/oxygen' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/pcxhr' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/pcxhr' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/pdplus' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/pdplus' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/riptide' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/riptide' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/rme9652' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/rme9652' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/trident' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/trident' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/vx222' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/vx222' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ymfpci' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci/ymfpci' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pci' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/codecs' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/codecs' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/core' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/core' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/fabrics' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/fabrics' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/soundbus' make[4]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/soundbus/i2sbus' make[4]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/soundbus/i2sbus' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa/soundbus' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/aoa' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/atmel' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/atmel' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/au1x' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/au1x' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/blackfin' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/blackfin' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/cirrus' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/cirrus' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/codecs' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/codecs' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/davinci' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/davinci' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/dwc' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/dwc' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/fsl' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/fsl' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/generic' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/generic' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/jz4740' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/jz4740' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/kirkwood' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/kirkwood' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/mid-x86' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/mid-x86' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/mxs' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/mxs' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/nuc900' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/nuc900' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/omap' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/omap' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/pxa' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/pxa' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/s6000' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/s6000' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/samsung' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/samsung' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/sh' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/sh' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/spear' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/spear' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/tegra' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/tegra' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/txx9' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/txx9' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/ux500' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc/ux500' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/soc' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/6fire' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/6fire' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/caiaq' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/caiaq' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/hiface' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/hiface' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/misc' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/misc' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/usx2y' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb/usx2y' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/usb' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pcmcia' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pcmcia/pdaudiocf' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pcmcia/pdaudiocf' make[3]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pcmcia/vx' make[3]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pcmcia/vx' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/pcmcia' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/misc' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/misc' make[2]: Entering directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/firewire' make[2]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/firewire' make[1]: Leaving directory '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d' make -C /lib/modules/3.16.0-4-amd64/build SUBDIRS=/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d CPP="gcc -E" CC="gcc" modules make[1]: Entering directory '/usr/src/linux-headers-3.16.0-4-amd64' Makefile:10: *** mixed implicit and normal rules: deprecated syntax make[1]: Entering directory `/usr/src/linux-headers-3.16.0-4-amd64' CC [M] /tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/info.o /tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/info.c: In function ‘snd_info_version_read’: /tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/info.c:1065:22: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time] "Compiled on " __DATE__ " for kernel %s" ^ cc1: some warnings being treated as errors /usr/src/linux-headers-3.16.0-4-common/scripts/Makefile.build:262: recipe for target '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/info.o' failed make[5]: *** [/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore/info.o] Error 1 /usr/src/linux-headers-3.16.0-4-common/scripts/Makefile.build:409: recipe for target '/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore' failed make[4]: *** [/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d/acore] Error 2 /usr/src/linux-headers-3.16.0-4-common/Makefile:1352: recipe for target '_module_/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d' failed make[3]: *** [_module_/tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d] Error 2 Makefile:181: recipe for target 'sub-make' failed make[2]: *** [sub-make] Error 2 Makefile:8: recipe for target 'all' failed make[1]: *** [all] Error 2 make[1]: Leaving directory '/usr/src/linux-headers-3.16.0-4-amd64' Makefile:167: recipe for target 'compile' failed make: *** [compile] Error 2 Working directory /tmp/alsa-compile-script/alsa-driver-1.0.25.3584.gb044d. Compilation of alsa-driver failed. Report this problem to the <alsa-devel(a)alsa-project.org> mailing list.

1 0

[alsa-devel] [PATCH] ALSA: hda - Cancel probe work instead of flush at remove
by Takashi Iwai 15 Feb '16

15 Feb '16

The commit [991f86d7ae4e: ALSA: hda - Flush the pending probe work at remove] introduced the sync of async probe work at remove for fixing the race. However, this may lead to another hangup when the module removal is performed quickly before starting the probe work, because it issues flush_work() and it's blocked forever. The workaround is to use cancel_work_sync() instead of flush_work() there. Fixes: 991f86d7ae4e ('ALSA: hda - Flush the pending probe work at remove') Cc: <stable(a)vger.kernel.org> # v3.17+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 4045dca3d699..ce6b97f31390 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2168,10 +2168,10 @@ static void azx_remove(struct pci_dev *pci) struct hda_intel *hda; if (card) { - /* flush the pending probing work */ + /* cancel the pending probing work */ chip = card->private_data; hda = container_of(chip, struct hda_intel, chip); - flush_work(&hda->probe_work); + cancel_work_sync(&hda->probe_work); snd_card_free(card); } -- 2.7.1

1 0

[alsa-devel] sound: memory leak in snd_seq_pool_init
by Dmitry Vyukov 15 Feb '16

15 Feb '16

Hello, The following program causes memory leak of a 24K object allocated in snd_seq_pool_init: // autogenerated by syzkaller (http://github.com/google/syzkaller) #include <pthread.h> #include <stdint.h> #include <string.h> #include <sys/syscall.h> #include <unistd.h> long r[148]; void* thr(void* arg) { switch ((long)arg) { case 0: r[0] = syscall(SYS_mmap, 0x20000000ul, 0xe000ul, 0x3ul, 0x32ul, 0xfffffffffffffffful, 0x0ul); break; case 1: r[2] = syscall(SYS_open, "/dev/snd/seq", 0x1ul, 0, 0, 0); break; case 2: *(uint32_t*)0x20008a90 = (uint32_t)0x6; *(uint32_t*)0x20008a94 = (uint32_t)0x4; *(uint32_t*)0x20008a98 = (uint32_t)0x200; *(uint8_t*)0x20008a9c = (uint8_t)0xfa5; *(uint8_t*)0x20008a9d = (uint8_t)0x100000000; *(uint8_t*)0x20008a9e = (uint8_t)0x0; *(uint8_t*)0x20008a9f = (uint8_t)0x3; *(uint8_t*)0x20008aa0 = (uint8_t)0x1; *(uint8_t*)0x20008aa1 = (uint8_t)0x1; *(uint8_t*)0x20008aa2 = (uint8_t)0x0; *(uint8_t*)0x20008aa3 = (uint8_t)0x40; *(uint8_t*)0x20008aa4 = (uint8_t)0x9; *(uint8_t*)0x20008aa5 = (uint8_t)0x9; *(uint8_t*)0x20008aa6 = (uint8_t)0x6; *(uint8_t*)0x20008aa7 = (uint8_t)0x80; *(uint8_t*)0x20008aa8 = (uint8_t)0x0; *(uint8_t*)0x20008aa9 = (uint8_t)0x5d34b2c3; *(uint8_t*)0x20008aaa = (uint8_t)0x3a7; *(uint8_t*)0x20008aab = (uint8_t)0x9; *(uint8_t*)0x20008aac = (uint8_t)0x8d62; *(uint8_t*)0x20008aad = (uint8_t)0x5; *(uint8_t*)0x20008aae = (uint8_t)0x7; *(uint8_t*)0x20008aaf = (uint8_t)0x20; *(uint8_t*)0x20008ab0 = (uint8_t)0x8; *(uint8_t*)0x20008ab1 = (uint8_t)0x7; *(uint8_t*)0x20008ab2 = (uint8_t)0xfffffffffffffffc; *(uint8_t*)0x20008ab3 = (uint8_t)0x7; *(uint8_t*)0x20008ab4 = (uint8_t)0x7ff; *(uint8_t*)0x20008ab5 = (uint8_t)0x1; *(uint8_t*)0x20008ab6 = (uint8_t)0x0; *(uint8_t*)0x20008ab7 = (uint8_t)0x9; *(uint8_t*)0x20008ab8 = (uint8_t)0x6; *(uint8_t*)0x20008ab9 = (uint8_t)0xfffffffffffffe00; *(uint8_t*)0x20008aba = (uint8_t)0x1000; *(uint8_t*)0x20008abb = (uint8_t)0xfffffffffffffffb; *(uint8_t*)0x20008abc = (uint8_t)0xcfd3; *(uint8_t*)0x20008abd = (uint8_t)0x101; *(uint8_t*)0x20008abe = (uint8_t)0x9; *(uint8_t*)0x20008abf = (uint8_t)0xfffffffffffffffc; *(uint8_t*)0x20008ac0 = (uint8_t)0xf2; *(uint8_t*)0x20008ac1 = (uint8_t)0x6; *(uint8_t*)0x20008ac2 = (uint8_t)0x0; *(uint8_t*)0x20008ac3 = (uint8_t)0x7fffffff; *(uint8_t*)0x20008ac4 = (uint8_t)0x4; *(uint8_t*)0x20008ac5 = (uint8_t)0x5; *(uint8_t*)0x20008ac6 = (uint8_t)0x4; *(uint8_t*)0x20008ac7 = (uint8_t)0x4; *(uint8_t*)0x20008ac8 = (uint8_t)0x20; *(uint8_t*)0x20008ac9 = (uint8_t)0x401; *(uint8_t*)0x20008aca = (uint8_t)0x6; *(uint8_t*)0x20008acb = (uint8_t)0x6; *(uint8_t*)0x20008acc = (uint8_t)0x5; *(uint8_t*)0x20008acd = (uint8_t)0x3; *(uint8_t*)0x20008ace = (uint8_t)0xfffffffffffffffc; *(uint8_t*)0x20008acf = (uint8_t)0xb0c; *(uint8_t*)0x20008ad0 = (uint8_t)0x2; *(uint8_t*)0x20008ad1 = (uint8_t)0xfffffffffffffff9; *(uint8_t*)0x20008ad2 = (uint8_t)0x8000; *(uint8_t*)0x20008ad3 = (uint8_t)0x5; *(uint8_t*)0x20008ad4 = (uint8_t)0xb0c; *(uint8_t*)0x20008ad5 = (uint8_t)0xfffffffffffffeff; *(uint8_t*)0x20008ad6 = (uint8_t)0x5; *(uint8_t*)0x20008ad7 = (uint8_t)0x101; *(uint8_t*)0x20008ad8 = (uint8_t)0xbfd; *(uint8_t*)0x20008ad9 = (uint8_t)0x7ff; *(uint8_t*)0x20008ada = (uint8_t)0x7f; *(uint8_t*)0x20008adb = (uint8_t)0x5; *(uint32_t*)0x20008adc = (uint32_t)0x6; *(uint8_t*)0x20008ae0 = (uint8_t)0x0; *(uint8_t*)0x20008ae1 = (uint8_t)0x0; *(uint8_t*)0x20008ae2 = (uint8_t)0x0; *(uint8_t*)0x20008ae3 = (uint8_t)0x0; *(uint8_t*)0x20008ae4 = (uint8_t)0x0; *(uint8_t*)0x20008ae5 = (uint8_t)0x0; *(uint8_t*)0x20008ae6 = (uint8_t)0x0; *(uint8_t*)0x20008ae7 = (uint8_t)0x0; *(uint8_t*)0x20008ae8 = (uint8_t)0x0; *(uint8_t*)0x20008ae9 = (uint8_t)0x0; *(uint8_t*)0x20008aea = (uint8_t)0x0; *(uint8_t*)0x20008aeb = (uint8_t)0x0; *(uint8_t*)0x20008aec = (uint8_t)0x0; *(uint8_t*)0x20008aed = (uint8_t)0x0; *(uint8_t*)0x20008aee = (uint8_t)0x0; *(uint8_t*)0x20008aef = (uint8_t)0x0; *(uint8_t*)0x20008af0 = (uint8_t)0x0; *(uint8_t*)0x20008af1 = (uint8_t)0x0; *(uint8_t*)0x20008af2 = (uint8_t)0x0; *(uint8_t*)0x20008af3 = (uint8_t)0x0; *(uint8_t*)0x20008af4 = (uint8_t)0x0; *(uint8_t*)0x20008af5 = (uint8_t)0x0; *(uint8_t*)0x20008af6 = (uint8_t)0x0; *(uint8_t*)0x20008af7 = (uint8_t)0x0; *(uint8_t*)0x20008af8 = (uint8_t)0x0; *(uint8_t*)0x20008af9 = (uint8_t)0x0; *(uint8_t*)0x20008afa = (uint8_t)0x0; *(uint8_t*)0x20008afb = (uint8_t)0x0; *(uint8_t*)0x20008afc = (uint8_t)0x0; *(uint8_t*)0x20008afd = (uint8_t)0x0; *(uint8_t*)0x20008afe = (uint8_t)0x0; *(uint8_t*)0x20008aff = (uint8_t)0x0; *(uint8_t*)0x20008b00 = (uint8_t)0x0; *(uint8_t*)0x20008b01 = (uint8_t)0x0; *(uint8_t*)0x20008b02 = (uint8_t)0x0; *(uint8_t*)0x20008b03 = (uint8_t)0x0; *(uint8_t*)0x20008b04 = (uint8_t)0x0; *(uint8_t*)0x20008b05 = (uint8_t)0x0; *(uint8_t*)0x20008b06 = (uint8_t)0x0; *(uint8_t*)0x20008b07 = (uint8_t)0x0; *(uint8_t*)0x20008b08 = (uint8_t)0x0; *(uint8_t*)0x20008b09 = (uint8_t)0x0; *(uint8_t*)0x20008b0a = (uint8_t)0x0; *(uint8_t*)0x20008b0b = (uint8_t)0x0; *(uint8_t*)0x20008b0c = (uint8_t)0x0; *(uint8_t*)0x20008b0d = (uint8_t)0x0; *(uint8_t*)0x20008b0e = (uint8_t)0x0; *(uint8_t*)0x20008b0f = (uint8_t)0x0; *(uint8_t*)0x20008b10 = (uint8_t)0x0; *(uint8_t*)0x20008b11 = (uint8_t)0x0; *(uint8_t*)0x20008b12 = (uint8_t)0x0; *(uint8_t*)0x20008b13 = (uint8_t)0x0; *(uint8_t*)0x20008b14 = (uint8_t)0x0; *(uint8_t*)0x20008b15 = (uint8_t)0x0; *(uint8_t*)0x20008b16 = (uint8_t)0x0; *(uint8_t*)0x20008b17 = (uint8_t)0x0; *(uint8_t*)0x20008b18 = (uint8_t)0x0; *(uint8_t*)0x20008b19 = (uint8_t)0x0; *(uint8_t*)0x20008b1a = (uint8_t)0x0; *(uint8_t*)0x20008b1b = (uint8_t)0x0; r[131] = syscall(SYS_ioctl, r[2], 0xc08c5332ul, 0x20008a90ul, 0, 0, 0); break; case 3: *(uint32_t*)0x20009fd0 = (uint32_t)0x30; *(uint32_t*)0x20009fd4 = (uint32_t)0xfff; *(uint64_t*)0x20009fd8 = (uint64_t)0x0; *(uint64_t*)0x20009fe0 = (uint64_t)0x1ce; *(uint64_t*)0x20009fe8 = (uint64_t)0x2; *(uint64_t*)0x20009ff0 = (uint64_t)0xff; *(uint32_t*)0x20009ff8 = (uint32_t)0x10001; r[139] = syscall(SYS_write, r[2], 0x20009fd0ul, 0x30ul, 0, 0, 0); break; case 4: *(uint32_t*)0x2000bb13 = (uint32_t)0x30; *(uint32_t*)0x2000bb17 = (uint32_t)0x2; *(uint64_t*)0x2000bb1b = (uint64_t)0x0; *(uint64_t*)0x2000bb23 = (uint64_t)0x53; *(uint64_t*)0x2000bb2b = (uint64_t)0xfffffffffffffbff; *(uint64_t*)0x2000bb33 = (uint64_t)0x5; *(uint32_t*)0x2000bb3b = (uint32_t)0x5; r[147] = syscall(SYS_write, r[2], 0x2000bb13ul, 0x30ul, 0, 0, 0); break; } return 0; } int main() { long i; pthread_t th[5]; memset(r, -1, sizeof(r)); for (i = 0; i < 5; i++) { pthread_create(&th[i], 0, thr, (void*)i); usleep(10000); } for (i = 0; i < 5; i++) { pthread_create(&th[i], 0, thr, (void*)i); if (i % 2 == 0) usleep(10000); } usleep(100000); return 0; } unreferenced object 0xffffc90003663000 (size 24000): comm "a.out", pid 1770, jiffies 4295717383 (age 7.217s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff86644303>] kmemleak_alloc+0x63/0xa0 mm/kmemleak.c:916 [<ffffffff81720da9>] __vmalloc_node_range+0x469/0x640 mm/vmalloc.c:1682 [< inline >] __vmalloc_node mm/vmalloc.c:1710 [< inline >] __vmalloc_node_flags mm/vmalloc.c:1724 [<ffffffff8172104b>] vmalloc+0x5b/0x70 mm/vmalloc.c:1739 [<ffffffff852b92cb>] snd_seq_pool_init+0xbb/0x300 sound/core/seq/seq_memory.c:389 [<ffffffff852b5ff4>] snd_seq_write+0x4d4/0x570 sound/core/seq/seq_clientmgr.c:1029 [<ffffffff817bbfc3>] __vfs_write+0x113/0x4b0 fs/read_write.c:528 [<ffffffff817bda87>] vfs_write+0x167/0x4a0 fs/read_write.c:577 [< inline >] SYSC_write fs/read_write.c:624 [<ffffffff817c0d71>] SyS_write+0x111/0x220 fs/read_write.c:616 [<ffffffff866613f6>] entry_SYSCALL_64_fastpath+0x16/0x7a arch/x86/entry/entry_64.S:185 [<ffffffffffffffff>] 0xffffffffffffffff On commit 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (4.5-rc3)

2 3

[alsa-devel] sound: spinlock lockup in snd_seq_oss_write
by Dmitry Vyukov 15 Feb '16

15 Feb '16

Hello, The following program hangs machine: https://gist.githubusercontent.com/dvyukov/1c9eeb67414a9e7c5e52/raw/127b660… BUG: spinlock lockup suspected on CPU#2, a.out/7470 lock: 0xffff880036a9ef50, .magic: dead4ead, .owner: a.out/7466, .owner_cpu: 3 CPU: 2 PID: 7470 Comm: a.out Not tainted 4.5.0-rc2+ #319 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 00000000ffffffff ffff88005f5ff660 ffffffff82be30ad ffff880036a9ef50 ffff88005d3d5f00 ffff88005d0b4740 ffff88005f5ff698 ffffffff8146768d ffffffff85241dce ffff880000000000 ffff880036a9ef50 ffff880036a9ef60 Call Trace: [< inline >] __dump_stack lib/dump_stack.c:15 [<ffffffff82be30ad>] dump_stack+0x6f/0xa2 lib/dump_stack.c:50 [<ffffffff8146768d>] spin_dump+0x14d/0x280 kernel/locking/spinlock_debug.c:67 [< inline >] __spin_lock_debug kernel/locking/spinlock_debug.c:117 [<ffffffff814679ad>] do_raw_spin_lock+0x15d/0x2b0 kernel/locking/spinlock_debug.c:137 [< inline >] __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:119 [<ffffffff8665ea57>] _raw_spin_lock_irqsave+0xa7/0xd0 kernel/locking/spinlock.c:159 [<ffffffff85241dce>] snd_timer_start+0x10e/0x2b0 sound/core/timer.c:491 [< inline >] seq_timer_start sound/core/seq/seq_timer.c:393 [<ffffffff852bf860>] snd_seq_timer_start+0x1a0/0x2b0 sound/core/seq/seq_timer.c:405 [< inline >] snd_seq_queue_process_event sound/core/seq/seq_queue.c:687 [<ffffffff852ba514>] snd_seq_control_queue+0x304/0x8b0 sound/core/seq/seq_queue.c:748 [<ffffffff852c01b5>] event_input_timer+0x25/0x30 sound/core/seq/seq_system.c:118 [<ffffffff852b2de4>] snd_seq_deliver_single_event.constprop.11+0x3f4/0x740 sound/core/seq/seq_clientmgr.c:634 [<ffffffff852b3248>] snd_seq_deliver_event+0x118/0x800 sound/core/seq/seq_clientmgr.c:831 [<ffffffff852b4636>] snd_seq_kernel_client_dispatch+0x126/0x170 sound/core/seq/seq_clientmgr.c:2404 [<ffffffff852c92eb>] send_timer_event.isra.0+0x10b/0x150 sound/core/seq/oss/seq_oss_timer.c:153 [<ffffffff852c981a>] snd_seq_oss_timer_start+0x1ca/0x310 sound/core/seq/oss/seq_oss_timer.c:174 [<ffffffff852c9c04>] snd_seq_oss_process_timer_event+0x2a4/0x340 sound/core/seq/oss/seq_oss_timer.c:106 [< inline >] insert_queue sound/core/seq/oss/seq_oss_rw.c:170 [<ffffffff852cf7ab>] snd_seq_oss_write+0x20b/0x810 sound/core/seq/oss/seq_oss_rw.c:148 [<ffffffff852c74f9>] odev_write+0x59/0xa0 sound/core/seq/oss/seq_oss.c:179 [<ffffffff817bacd3>] __vfs_write+0x113/0x4b0 fs/read_write.c:528 [<ffffffff817bc797>] vfs_write+0x167/0x4a0 fs/read_write.c:577 [< inline >] SYSC_write fs/read_write.c:624 [<ffffffff817bfa81>] SyS_write+0x111/0x220 fs/read_write.c:616 [<ffffffff8665f0b6>] entry_SYSCALL_64_fastpath+0x16/0x7a arch/x86/entry/entry_64.S:185 Sending NMI to all CPUs: NMI backtrace for cpu 0 CPU: 0 PID: 7473 Comm: a.out Not tainted 4.5.0-rc2+ #319 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff88003376df00 ti: ffff880032440000 task.ti: ffff880032440000 RIP: 0010:[<ffffffff82c103a7>] [<ffffffff82c103a7>] delay_tsc+0x27/0x70 RSP: 0018:ffff8800324479f8 EFLAGS: 00000006 RAX: 00000000a0066ab3 RBX: ffff880036a9ef50 RCX: 000000000000001e RDX: 0000000000000100 RSI: 00000100a0066a95 RDI: 0000000000000001 RBP: ffff8800324479f8 R08: 0000000000000000 R09: 0000000000000001 R10: ffff88003376df00 R11: ffff880036a9ef68 R12: ffff880036a9ef60 R13: 000000009a9d2d40 R14: ffff880036a9ef58 R15: 0000000099db9d6d FS: 00007f94a370e700(0000) GS:ffff88003ec00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 000000c82010e120 CR3: 000000003334f000 CR4: 00000000000006f0 Stack: ffff880032447a08 ffffffff82c102ea ffff880032447a40 ffffffff81467999 ffff880036a9ef50 ffff880036a9ee20 0000000000000282 ffff880035d8ab70 0000000000000000 ffff880032447a60 ffffffff8665dfbb ffffffff8523dd64 Call Trace: [<ffffffff82c102ea>] __delay+0xa/0x10 arch/x86/lib/delay.c:153 [< inline >] __spin_lock_debug kernel/locking/spinlock_debug.c:114 [<ffffffff81467999>] do_raw_spin_lock+0x149/0x2b0 kernel/locking/spinlock_debug.c:137 [< inline >] __raw_spin_lock include/linux/spinlock_api_smp.h:145 [<ffffffff8665dfbb>] _raw_spin_lock+0x3b/0x50 kernel/locking/spinlock.c:151 [< inline >] spin_lock include/linux/spinlock.h:302 [<ffffffff8523dd64>] snd_timer_start_slave+0xd4/0x200 sound/core/timer.c:460 [<ffffffff85241880>] snd_timer_continue+0x200/0x290 sound/core/timer.c:598 [< inline >] snd_timer_user_continue sound/core/timer.c:1822 [< inline >] __snd_timer_user_ioctl sound/core/timer.c:1889 [<ffffffff85246a9d>] snd_timer_user_ioctl+0xe1d/0x25f0 sound/core/timer.c:1904 [< inline >] vfs_ioctl fs/ioctl.c:43 [<ffffffff817faf7c>] do_vfs_ioctl+0x18c/0xfb0 fs/ioctl.c:674 [< inline >] SYSC_ioctl fs/ioctl.c:689 [<ffffffff817fbe2f>] SyS_ioctl+0x8f/0xc0 fs/ioctl.c:680 [<ffffffff8665f0b6>] entry_SYSCALL_64_fastpath+0x16/0x7a arch/x86/entry/entry_64.S:185 Code: 00 00 00 00 55 65 ff 05 c8 4a 40 7d 48 89 e5 65 44 8b 05 8d 2d 40 7d 0f ae e8 0f 31 48 c1 e2 20 48 89 d6 48 09 c6 0f ae e8 0f 31 <48> c1 e2 20 48 09 d0 48 89 c1 48 29 f1 48 39 f9 73 27 65 ff 0d NMI backtrace for cpu 1 CPU: 1 PID: 7421 Comm: stress Not tainted 4.5.0-rc2+ #319 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff88003330df00 ti: ffff880032230000 task.ti: ffff880032230000 RIP: 0010:[<ffffffff82c103a7>] [<ffffffff82c103a7>] delay_tsc+0x27/0x70 RSP: 0018:ffff88003ed07c80 EFLAGS: 00000006 RAX: 00000000a0066d38 RBX: ffff880036a9ef50 RCX: 000000000000001e RDX: 0000000000000100 RSI: 00000100a0066d0f RDI: 0000000000000001 RBP: ffff88003ed07c80 R08: 0000000000000001 R09: 0000000000000001 R10: ffff88003330df00 R11: ffff880036a9ef68 R12: ffff880036a9ef60 R13: 000000009a9d2d40 R14: ffff880036a9ef58 R15: 000000009a82fe90 FS: 000000c820127700(0000) GS:ffff88003ed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000c8201004e0 CR3: 0000000032076000 CR4: 00000000000006e0 Stack: ffff88003ed07c90 ffffffff82c102ea ffff88003ed07cc8 ffffffff81467999 ffff880036a9ef50 0000000000000082 ffff880036a9ee20 00000000000f4240 ffff880032795068 ffff88003ed07cf0 ffffffff8665ea57 ffffffff85242019 Call Trace: d [<ffffffff82c102ea>] __delay+0xa/0x10 arch/x86/lib/delay.c:153 [< inline >] __spin_lock_debug kernel/locking/spinlock_debug.c:114 [<ffffffff81467999>] do_raw_spin_lock+0x149/0x2b0 kernel/locking/spinlock_debug.c:137 [< inline >] __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:119 [<ffffffff8665ea57>] _raw_spin_lock_irqsave+0xa7/0xd0 kernel/locking/spinlock.c:159 [<ffffffff85242019>] snd_timer_interrupt+0xa9/0xc80 sound/core/timer.c:718 [<ffffffff85248cb9>] snd_hrtimer_callback+0x169/0x230 sound/core/hrtimer.c:54 [< inline >] __run_hrtimer kernel/time/hrtimer.c:1248 [<ffffffff814b7dc3>] __hrtimer_run_queues+0x363/0xc20 kernel/time/hrtimer.c:1312 [<ffffffff814b9de2>] hrtimer_interrupt+0x182/0x430 kernel/time/hrtimer.c:1346 [<ffffffff8124e1d2>] local_apic_timer_interrupt+0x72/0xe0 arch/x86/kernel/apic/apic.c:907 [<ffffffff812516f9>] smp_apic_timer_interrupt+0x79/0xa0 arch/x86/kernel/apic/apic.c:931 [<ffffffff8665feac>] apic_timer_interrupt+0x8c/0xa0 arch/x86/entry/entry_64.S:520 [<ffffffff817ab804>] create_object+0x34/0x2d0 mm/kmemleak.c:546 [<ffffffff86641fb3>] kmemleak_alloc+0x63/0xa0 mm/kmemleak.c:916 [< inline >] kmemleak_alloc_recursive include/linux/kmemleak.h:47 [< inline >] slab_post_alloc_hook mm/slub.c:1337 [< inline >] slab_alloc_node mm/slub.c:2596 [< inline >] slab_alloc mm/slub.c:2604 [<ffffffff81760843>] kmem_cache_alloc+0x153/0x2e0 mm/slub.c:2609 [<ffffffff8181b1b5>] dup_fd+0x85/0xa90 fs/file.c:298 [< inline >] copy_files kernel/fork.c:1033 [<ffffffff8134efed>] copy_process.part.35+0x188d/0x57a0 kernel/fork.c:1436 [< inline >] copy_process kernel/fork.c:1274 [<ffffffff8135322c>] _do_fork+0x1bc/0xcb0 kernel/fork.c:1723 [< inline >] SYSC_clone kernel/fork.c:1832 [<ffffffff81353df7>] SyS_clone+0x37/0x50 kernel/fork.c:1826 [<ffffffff8665f0b6>] entry_SYSCALL_64_fastpath+0x16/0x7a arch/x86/entry/entry_64.S:185 Code: 00 00 00 00 55 65 ff 05 c8 4a 40 7d 48 89 e5 65 44 8b 05 8d 2d 40 7d 0f ae e8 0f 31 48 c1 e2 20 48 89 d6 48 09 c6 0f ae e8 0f 31 <48> c1 e2 20 48 09 d0 48 89 c1 48 29 f1 48 39 f9 73 27 65 ff 0d NMI backtrace for cpu 2 CPU: 2 PID: 7470 Comm: a.out Not tainted 4.5.0-rc2+ #319 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff88005d0b4740 ti: ffff88005f5f8000 task.ti: ffff88005f5f8000 RIP: 0010:[<ffffffff81262066>] [<ffffffff81262066>] flat_send_IPI_mask+0x156/0x290 RSP: 0018:ffff88005f5ff5d0 EFLAGS: 00000046 RAX: 0000000000000000 RBX: 0000000000000c00 RCX: 0000000000000000 RDX: 0000000000000c00 RSI: 0000000000000002 RDI: ffffffffff5fc300 RBP: ffff88005f5ff5f8 R08: 0000000000000001 R09: 0000000000000000 R10: fffffbfff11c14aa R11: 1ffffffff13552ed R12: 0000000000000082 BUG: spinlock lockup suspected on CPU#1, stress/7421 lock: 0xffff880036a9ef50, .magic: dead4ead, .owner: a.out/7466, .owner_cpu: 3 CPU: 1 PID: 7421 Comm: stress Not tainted 4.5.0-rc2+ #319 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 00000000ffffffff ffff88003ed07c58 ffffffff82be30ad ffff880036a9ef50 ffff88005d3d5f00 ffff88003330df00 ffff88003ed07c90 ffffffff8146768d ffffffff85242019 0000000000000000 ffff880036a9ef50 ffff880036a9ef60 Call Trace: <IRQ> [< inline >] __dump_stack lib/dump_stack.c:15 <IRQ> [<ffffffff82be30ad>] dump_stack+0x6f/0xa2 lib/dump_stack.c:50 [<ffffffff8146768d>] spin_dump+0x14d/0x280 kernel/locking/spinlock_debug.c:67 [< inline >] __spin_lock_debug kernel/locking/spinlock_debug.c:117 [<ffffffff814679ad>] do_raw_spin_lock+0x15d/0x2b0 kernel/locking/spinlock_debug.c:137 [< inline >] __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:119 [<ffffffff8665ea57>] _raw_spin_lock_irqsave+0xa7/0xd0 kernel/locking/spinlock.c:159 [<ffffffff85242019>] snd_timer_interrupt+0xa9/0xc80 sound/core/timer.c:718 [<ffffffff85248cb9>] snd_hrtimer_callback+0x169/0x230 sound/core/hrtimer.c:54 [< inline >] __run_hrtimer kernel/time/hrtimer.c:1248 [<ffffffff814b7dc3>] __hrtimer_run_queues+0x363/0xc20 kernel/time/hrtimer.c:1312 [<ffffffff814b9de2>] hrtimer_interrupt+0x182/0x430 kernel/time/hrtimer.c:1346 [<ffffffff8124e1d2>] local_apic_timer_interrupt+0x72/0xe0 arch/x86/kernel/apic/apic.c:907 [<ffffffff812516f9>] smp_apic_timer_interrupt+0x79/0xa0 arch/x86/kernel/apic/apic.c:931 [<ffffffff8665feac>] apic_timer_interrupt+0x8c/0xa0 arch/x86/entry/entry_64.S:520 [<ffffffff817ab804>] create_object+0x34/0x2d0 mm/kmemleak.c:546 [<ffffffff86641fb3>] kmemleak_alloc+0x63/0xa0 mm/kmemleak.c:916 [< inline >] kmemleak_alloc_recursive include/linux/kmemleak.h:47 [< inline >] slab_post_alloc_hook mm/slub.c:1337 [< inline >] slab_alloc_node mm/slub.c:2596 [< inline >] slab_alloc mm/slub.c:2604 [<ffffffff81760843>] kmem_cache_alloc+0x153/0x2e0 mm/slub.c:2609 [<ffffffff8181b1b5>] dup_fd+0x85/0xa90 fs/file.c:298 [< inline >] copy_files kernel/fork.c:1033 [<ffffffff8134efed>] copy_process.part.35+0x188d/0x57a0 kernel/fork.c:1436 [< inline >] copy_process kernel/fork.c:1274 [<ffffffff8135322c>] _do_fork+0x1bc/0xcb0 kernel/fork.c:1723 [< inline >] SYSC_clone kernel/fork.c:1832 [<ffffffff81353df7>] SyS_clone+0x37/0x50 kernel/fork.c:1826 [<ffffffff8665f0b6>] entry_SYSCALL_64_fastpath+0x16/0x7a arch/x86/entry/entry_64.S:185 R13: 000000000f000000 R14: ffffffff87b00c80 R15: 0000000000000002 FS: 00007fcabc427700(0000) GS:ffff88006d600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000020028073 CR3: 000000005c829000 CR4: 00000000000006e0 Stack: ffffffff87b00c80 ffffffff888be0a0 0000000000000007 fffffbfff111761c ffff88006d71a540 ffff88005f5ff618 ffffffff81257bfe ffffffff86ac7020 dffffc0000000000 ffff88005f5ff688 ffffffff82bee6ac ffffffff811aa610 Call Trace: [<ffffffff81257bfe>] nmi_raise_cpu_backtrace+0x5e/0x80 arch/x86/kernel/apic/hw_nmi.c:33 [<ffffffff82bee6ac>] nmi_trigger_all_cpu_backtrace+0x54c/0x5f0 lib/nmi_backtrace.c:85 [<ffffffff81257c54>] arch_trigger_all_cpu_backtrace+0x14/0x20 arch/x86/kernel/apic/hw_nmi.c:38 [< inline >] trigger_all_cpu_backtrace include/linux/nmi.h:41 [< inline >] __spin_lock_debug kernel/locking/spinlock_debug.c:119 [<ffffffff814679b7>] do_raw_spin_lock+0x167/0x2b0 kernel/locking/spinlock_debug.c:137 [< inline >] __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:119 [<ffffffff8665ea57>] _raw_spin_lock_irqsave+0xa7/0xd0 kernel/locking/spinlock.c:159 [<ffffffff85241dce>] snd_timer_start+0x10e/0x2b0 sound/core/timer.c:491 [< inline >] seq_timer_start sound/core/seq/seq_timer.c:393 [<ffffffff852bf860>] snd_seq_timer_start+0x1a0/0x2b0 sound/core/seq/seq_timer.c:405 [< inline >] snd_seq_queue_process_event sound/core/seq/seq_queue.c:687 [<ffffffff852ba514>] snd_seq_control_queue+0x304/0x8b0 sound/core/seq/seq_queue.c:748 [<ffffffff852c01b5>] event_input_timer+0x25/0x30 sound/core/seq/seq_system.c:118 [<ffffffff852b2de4>] snd_seq_deliver_single_event.constprop.11+0x3f4/0x740 sound/core/seq/seq_clientmgr.c:634 [<ffffffff852b3248>] snd_seq_deliver_event+0x118/0x800 sound/core/seq/seq_clientmgr.c:831 On commit b37a05c083c85c2657dca9bbe1f5d79dccf756d5 + latest Takashi fixes.

2 2

[alsa-devel] SGTL5000 startup error on reboot
by Erik Friesen 15 Feb '16

15 Feb '16

I find that the codec is getting a write failure at sgtl5000_fill_defaults at { SGTL5000_CHIP_ANA_POWER, 0x7060 }, about half the time following a software reboot, and with external vddd powered with 1.8v. Reading this register shows that it is already at 0x7060, so I am not sure what is up with that, but I would suspect a hardware bug in the codec. Using this code has fixed this so far. static int sgtl5000_fill_defaults(struct sgtl5000_priv *sgtl5000) { int i, ret, val, index; int reg; for (i = 0; i < ARRAY_SIZE(sgtl5000_reg_defaults); i++) { val = sgtl5000_reg_defaults[i].def; index = sgtl5000_reg_defaults[i].reg; ret = regmap_read(sgtl5000->regmap, index, &reg); if (ret) { printk(KERN_WARNING "SGTL5000 probe read failed at %i\n", i); return ret; } if (reg != val) { ret = regmap_write(sgtl5000->regmap, index, val); } if (ret) { printk(KERN_WARNING "SGTL5000 probe write failed %x at %i index %i @ %x\n", val, i, index, reg); return ret; } } return 0; }

1 1

[alsa-devel] kernel crash in snd_hda_intel
by Gabriel Feceoru 15 Feb '16

15 Feb '16

!!! This caused a regression in the i-g-t drv_module_reload_basic test. Reproducible easily on HSW (i5-4460) with: #rmmod snd_hda_intel The bisect shows this as the offending commit: commit 25e4abb33df3aafa7d1efba8f82f9178268efab1 Author: Libin Yang <libin.yang(a)linux.intel.com> Date: Tue Jan 12 11:13:27 2016 +0800 ALSA: hda - hdmi jack created based on pcm Jack is created based on pcm. Apply the acomp jack rule to dyn_pcm_assign. For dyn_pcm_assign: Driver does not use hda_jack. It operates snd_jack directly. snd_jack pointer will be stored in spec->pcm.jack instead of the current spec->acomp_jack. When pcm is assigned to pin, jack will be assigned to pin automatically. For !dyn_pcm_assign: Driver continues using hda_jack for less impact on the old cases. Pcm is statically assigned to pin. So is jack. spec->pcm.jack saves the snd_jack pointer created in hda_jack. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> [ 79.020523] BUG: unable to handle kernel paging request at 0000000000015d80 [ 79.021314] IP: [<ffffffff810a486b>] queued_spin_lock_slowpath+0xeb/0x180 [ 79.022125] PGD 0 [ 79.022881] Oops: 0002 [#1] SMP [ 79.023644] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel(-) snd_hda_codec x86_pkg_temp_thermal snd_hwdep snd_hda_core i915 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt ehci_pci fb_sys_fops r8169 ehci_hcd mii drm xhci_pci xhci_hcd video [ 79.026790] CPU: 0 PID: 1294 Comm: rmmod Tainted: G U 4.5.0-rc1+ #73 [ 79.028322] Hardware name: Dell Inc. Inspiron 3847/088DT1 , BIOS A06 01/15/2015 [ 79.029854] task: ffff8800dac90000 ti: ffff880212700000 task.ti: ffff880212700000 [ 79.031384] RIP: 0010:[<ffffffff810a486b>] [<ffffffff810a486b>] queued_spin_lock_slowpath+0xeb/0x180 [ 79.032924] RSP: 0018:ffff8802127039b0 EFLAGS: 00010002 [ 79.033698] RAX: 000000000000350c RBX: ffff8800d434ef90 RCX: ffff88021fa15d80 [ 79.035224] RDX: 0000000000015d80 RSI: 00000000d434ef88 RDI: ffff8800d434ef90 [ 79.036751] RBP: ffff8802127039b0 R08: 0000000000040000 R09: 0000000000000000 [ 79.038277] R10: ffff8800daef8998 R11: 0000000000000004 R12: 0000000000000282 [ 79.039802] R13: 0000000000000000 R14: 0000000000000006 R15: ffff8800d434ef90 [ 79.041331] FS: 00007f75be1ad700(0000) GS:ffff88021fa00000(0000) knlGS:0000000000000000 [ 79.042863] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 79.043638] CR2: 0000000000015d80 CR3: 00000002101b1000 CR4: 00000000001406f0 [ 79.045166] Stack: [ 79.045926] ffff8802127039d0 ffffffff81748e59 ffff8800d434ed80 0000000000000005 [ 79.047462] ffff880212703a10 ffffffff81597e73 ffffffff817472d2 0000000000000003 [ 79.048995] ffff8800d434ecc0 0000000000000000 0000000000000001 ffff8800daef8800 [ 79.050528] Call Trace: [ 79.051293] [<ffffffff81748e59>] _raw_spin_lock_irqsave+0x39/0x50 [ 79.052071] [<ffffffff81597e73>] input_event+0x43/0x80 [ 79.052844] [<ffffffff817472d2>] ? mutex_lock+0x12/0x30 [ 79.053619] [<ffffffff8160d9fe>] snd_jack_report+0xee/0x110 [ 79.054396] [<ffffffffc02da4ea>] hdmi_present_sense+0x13a/0x390 [snd_hda_codec_hdmi] [ 79.055921] [<ffffffff8150ffee>] ? regmap_unlock_mutex+0xe/0x10 [ 79.056699] [<ffffffffc02da78d>] generic_hdmi_resume+0x4d/0x60 [snd_hda_codec_hdmi] [ 79.058235] [<ffffffffc02a8bb0>] ? snd_hda_add_imux_item+0x120/0x120 [snd_hda_codec] [ 79.059771] [<ffffffffc02a85ae>] hda_call_codec_resume+0xce/0x120 [snd_hda_codec] [ 79.061303] [<ffffffffc02a8bb0>] ? snd_hda_add_imux_item+0x120/0x120 [snd_hda_codec] [ 79.062835] [<ffffffffc02a8be5>] hda_codec_runtime_resume+0x35/0x50 [snd_hda_codec] [ 79.064368] [<ffffffff81503d68>] __rpm_callback+0x28/0x70 [ 79.065143] [<ffffffffc02a8bb0>] ? snd_hda_add_imux_item+0x120/0x120 [snd_hda_codec] [ 79.066676] [<ffffffff81503dd4>] rpm_callback+0x24/0x80 [ 79.067449] [<ffffffffc02a8bb0>] ? snd_hda_add_imux_item+0x120/0x120 [snd_hda_codec] [ 79.068983] [<ffffffff81504646>] rpm_resume+0x426/0x620 [ 79.069758] [<ffffffff815055ae>] __pm_runtime_resume+0x4e/0x70 [ 79.070536] [<ffffffff814f9453>] __device_release_driver+0x43/0x160 [ 79.071314] [<ffffffff814f9593>] device_release_driver+0x23/0x30 [ 79.072085] [<ffffffff814f8b71>] bus_remove_device+0x101/0x170 [ 79.072862] [<ffffffff814f50f9>] device_del+0x139/0x270 [ 79.073638] [<ffffffffc00a51cb>] ? widget_tree_free.isra.1+0x8b/0xa0 [snd_hda_core] [ 79.075170] [<ffffffffc00a3831>] snd_hdac_device_unregister+0x21/0x30 [snd_hda_core] [ 79.076703] [<ffffffffc02a708d>] snd_hda_codec_dev_free+0x1d/0x40 [snd_hda_codec] [ 79.078235] [<ffffffff8160ac5c>] __snd_device_free+0x4c/0x80 [ 79.079010] [<ffffffff8160afb0>] snd_device_free_all+0x30/0x60 [ 79.079787] [<ffffffff816058a4>] release_card_device+0x34/0x90 [ 79.080563] [<ffffffff814f4892>] device_release+0x32/0x90 [ 79.081338] [<ffffffff813f74da>] kobject_release+0x7a/0x190 [ 79.082113] [<ffffffff813f7397>] kobject_put+0x27/0x50 [ 79.082886] [<ffffffff814f4b67>] put_device+0x17/0x20 [ 79.083659] [<ffffffff816068e8>] snd_card_free+0x58/0x70 [ 79.084434] [<ffffffffc00b3fd1>] azx_remove+0x31/0x40 [snd_hda_intel] [ 79.085214] [<ffffffff81433da9>] pci_device_remove+0x39/0xc0 [ 79.085990] [<ffffffff814f94b1>] __device_release_driver+0xa1/0x160 [ 79.086767] [<ffffffff814f9fe6>] driver_detach+0xa6/0xb0 [ 79.087540] [<ffffffff814f8eb5>] bus_remove_driver+0x55/0xd0 [ 79.088314] [<ffffffff814fa5dc>] driver_unregister+0x2c/0x50 [ 79.089084] [<ffffffff814324d1>] pci_unregister_driver+0x21/0x90 [ 79.089863] [<ffffffffc00b5d88>] azx_driver_exit+0x10/0x288 [snd_hda_intel] [ 79.090644] [<ffffffff810dde01>] SyS_delete_module+0x1b1/0x250 [ 79.091422] [<ffffffff81002017>] ? trace_hardirqs_on_thunk+0x17/0x19 [ 79.092200] [<ffffffff8174925b>] entry_SYSCALL_64_fastpath+0x16/0x6e [ 79.092977] Code: c1 e0 10 45 31 c9 85 c0 74 44 48 89 c2 c1 e8 12 48 c1 ea 0c 83 e8 01 83 e2 30 48 98 48 81 c2 80 5d 01 00 48 03 14 c5 e0 b4 d4 81 <48> 89 0a 8b 41 08 85 c0 75 09 f3 90 8b 41 08 85 c0 74 f7 4c 8b [ 79.095373] RIP [<ffffffff810a486b>] queued_spin_lock_slowpath+0xeb/0x180 [ 79.096155] RSP <ffff8802127039b0> [ 79.096920] CR2: 0000000000015d80 [ 79.097687] ---[ end trace 5594cbffe0158d7f ]--- $lspci -nn 00:00.0 Host bridge [0600]: Intel Corporation 4th Gen Core Processor DRAM Controller [8086:0c00] (rev 06) 00:01.0 PCI bridge [0604]: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller [8086:0c01] (rev 06) 00:02.0 VGA compatible controller [0300]: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller [8086:0412] (rev 06) 00:03.0 Audio device [0403]: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller [8086:0c0c] (rev 06) 00:14.0 USB controller [0c03]: Intel Corporation 8 Series/C220 Series Chipset Family USB xHCI [8086:8c31] (rev 05) 00:16.0 Communication controller [0780]: Intel Corporation 8 Series/C220 Series Chipset Family MEI Controller #1 [8086:8c3a] (rev 04) 00:1a.0 USB controller [0c03]: Intel Corporation 8 Series/C220 Series Chipset Family USB EHCI #2 [8086:8c2d] (rev 05) 00:1b.0 Audio device [0403]: Intel Corporation 8 Series/C220 Series Chipset High Definition Audio Controller [8086:8c20] (rev 05) 00:1c.0 PCI bridge [0604]: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #1 [8086:8c10] (rev d5) 00:1c.3 PCI bridge [0604]: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #4 [8086:8c16] (rev d5) 00:1c.4 PCI bridge [0604]: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express Root Port #5 [8086:8c18] (rev d5) 00:1d.0 USB controller [0c03]: Intel Corporation 8 Series/C220 Series Chipset Family USB EHCI #1 [8086:8c26] (rev 05) 00:1f.0 ISA bridge [0601]: Intel Corporation C220 Series Chipset Family H81 Express LPC Controller [8086:8c5c] (rev 05) 00:1f.2 SATA controller [0106]: Intel Corporation 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] [8086:8c02] (rev 05) 00:1f.3 SMBus [0c05]: Intel Corporation 8 Series/C220 Series Chipset Family SMBus Controller [8086:8c22] (rev 05) 03:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller [10ec:8168] (rev 0c) 04:00.0 Network controller [0280]: Qualcomm Atheros QCA9565 / AR9565 Wireless Network Adapter [168c:0036] (rev 01) Regards, Gabriel

2 5

[alsa-devel] [RFC][PATCH 0/5] alsa-lib: add APIs for control element set
by Takashi Sakamoto 15 Feb '16

15 Feb '16

Hi, This patchset adds some APIs for control element set, according to design of ALSA Ctl core. In ALSA Ctl core, each sound card can have control elements. The elements are managed according to below design. * element set * A set of elements with the same attribute (i.e. name, get/put operations). * element * An element can be identified by userspace applications. * channel * An element has channels which can be changed by userspace applications or hardware device itself. * value * Each channel has its own value. The place to kept the value depends on design of each device driver (i.e. in hardware register or kernel space). There're two ways to identify the element; by identification number (numid), or by a combination of name of the element set and index from the first element in the element set. Both of device driver in kernel land and ALSA Ctl application in user land can add the element set. When userspace applications add them, ALSA Ctl core works as Inter Process Communication mechanism between event-listening applications and usual control applications. Such element is refered as 'user-defined control elements' in alsa-lib. Typically, device driver in kernel land adds one element set for a single element. So users and userspace developers are hard to realize that an existence of the element set. There're more items to describe the design. But here I focus on what relates to this patchset. Well, current alsa-lib implementation includes small bugs, some misleadings, a lack of feature related to user-defined control elements. This patchset is my attempt to improves such issues. Regards Takashi Sakamoto (5): control: initialize element channel values according to identification number control: rename variables so that it represents the number of channels which an element has control: improve API documentation control: add a function to add an element of bytes type control: add functions to add element set include/control.h | 35 +++- src/control/control.c | 484 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 413 insertions(+), 106 deletions(-) -- 2.5.0

1 5

[alsa-devel] Plantronics DA45 cannot get freq at ep 0x4
by denk 15 Feb '16

15 Feb '16

Hi, using the Plantronics DA45 Headset Adapter leads to many lines of cannot get freq at ep 0x4 and cannot get freq at ep 0x84. I found a similar error in the following discussion: http://www.spinics.net/lists/linux-usb/msg125029.html I added the USB ID of the DA45, recompiled the kernel and the messages are gone. I would be happy if you could accept this simple addition made by the following patch: --- a/sound/usb/quirks.c 2015-12-15 06:41:43.000000000 +0100 +++ b/sound/usb/quirks.c 2016-01-28 08:15:35.207785555 +0100 @@ -1122,6 +1122,7 @@ case USB_ID(0x045E, 0x0779): /* MS Lifecam HD-3000 */ case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ + case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */ return true; } return false; If there are any questions or something missing, please ask. Thanks in advance. Best denk

2 1

[alsa-devel] sound compress_driver.h: missing kernel-doc notation for a few fields
by Randy Dunlap 15 Feb '16

15 Feb '16

Hi Richard, Please add kernel-doc notation for these fields: ..//include/sound/compress_driver.h:160: warning: No description found for parameter 'id[64]' ..//include/sound/compress_driver.h:160: warning: No description found for parameter 'proc_root' ..//include/sound/compress_driver.h:160: warning: No description found for parameter 'proc_info_entry' thanks, -- ~Randy

1 0

[alsa-devel] [PATCH] Provide sequencer sound card number / PID via alsa-lib
by Martin Koegler 13 Feb '16

13 Feb '16

From: Martin Koegler <martin.koegler(a)chello.at> Signed-off-by: Martin Koegler <martin.koegler(a)chello.at> --- include/seq.h | 1 + include/sound/asequencer.h | 5 +++-- src/seq/seq.c | 11 +++++++++++ src/seq/seq_hw.c | 8 +++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/include/seq.h b/include/seq.h index 9576822..77996e5 100644 --- a/include/seq.h +++ b/include/seq.h @@ -143,6 +143,7 @@ snd_seq_client_type_t snd_seq_client_info_get_type(const snd_seq_client_info_t * const char *snd_seq_client_info_get_name(snd_seq_client_info_t *info); int snd_seq_client_info_get_broadcast_filter(const snd_seq_client_info_t *info); int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info); +int snd_seq_client_info_get_owner(const snd_seq_client_info_t *info); const unsigned char *snd_seq_client_info_get_event_filter(const snd_seq_client_info_t *info); int snd_seq_client_info_get_num_ports(const snd_seq_client_info_t *info); int snd_seq_client_info_get_event_lost(const snd_seq_client_info_t *info); diff --git a/include/sound/asequencer.h b/include/sound/asequencer.h index 09c8a00..7ebf7fd 100644 --- a/include/sound/asequencer.h +++ b/include/sound/asequencer.h @@ -24,7 +24,7 @@ /** version of the sequencer */ -#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 1) +#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION (1, 0, 2) /** * definition of sequencer event types @@ -356,7 +356,8 @@ struct snd_seq_client_info { unsigned char event_filter[32]; /* event filter bitmap */ int num_ports; /* RO: number of ports */ int event_lost; /* number of lost events */ - char reserved[64]; /* for future use */ + int owner; /* RO: card number[kernel] / PID[user] */ + char reserved[64 - sizeof(int)]; /* for future use */ }; diff --git a/src/seq/seq.c b/src/seq/seq.c index 620ca3f..2505293 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -1522,6 +1522,17 @@ int snd_seq_client_info_get_error_bounce(const snd_seq_client_info_t *info) } /** + * \brief Get the sound card number (kernel) or owning PID + * \param info client_info container + * \return card number/PID/-1 if value is not available. + */ +int snd_seq_client_info_get_owner(const snd_seq_client_info_t *info) +{ + assert(info); + return info->owner; +} + +/** * \brief (DEPRECATED) Get the event filter bitmap of a client_info container * \param info client_info container * \return NULL if no event filter, or pointer to event filter bitmap diff --git a/src/seq/seq_hw.c b/src/seq/seq_hw.c index d033367..a4c083a 100644 --- a/src/seq/seq_hw.c +++ b/src/seq/seq_hw.c @@ -32,10 +32,11 @@ const char *_snd_module_seq_hw = ""; #ifndef DOC_HIDDEN #define SNDRV_FILE_SEQ ALSA_DEVICE_DIRECTORY "seq" #define SNDRV_FILE_ALOADSEQ ALOAD_DEVICE_DIRECTORY "aloadSEQ" -#define SNDRV_SEQ_VERSION_MAX SNDRV_PROTOCOL_VERSION(1, 0, 1) +#define SNDRV_SEQ_VERSION_MAX SNDRV_PROTOCOL_VERSION(1, 0, 2) typedef struct { int fd; + int micro_version; } snd_seq_hw_t; #endif /* DOC_HIDDEN */ @@ -100,6 +101,8 @@ static int snd_seq_hw_get_client_info(snd_seq_t *seq, snd_seq_client_info_t * in /*SYSERR("SNDRV_SEQ_IOCTL_GET_CLIENT_INFO failed");*/ return -errno; } + if (hw->micro_version < SNDRV_PROTOCOL_MICRO(SNDRV_SEQ_VERSION_MAX)) + info->owner = -1; return 0; } @@ -368,6 +371,8 @@ static int snd_seq_hw_query_next_client(snd_seq_t *seq, snd_seq_client_info_t *i /*SYSERR("SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT failed");*/ return -errno; } + if (hw->micro_version < SNDRV_PROTOCOL_MICRO(SNDRV_SEQ_VERSION_MAX)) + info->owner = -1; return 0; } @@ -480,6 +485,7 @@ int snd_seq_hw_open(snd_seq_t **handle, const char *name, int streams, int mode) return -ENOMEM; } hw->fd = fd; + hw->micro_version = SNDRV_PROTOCOL_MICRO(ver); if (streams & SND_SEQ_OPEN_OUTPUT) { seq->obuf = (char *) malloc(seq->obufsize = SND_SEQ_OBUF_SIZE); if (!seq->obuf) { -- 2.1.4

2 2

[alsa-devel] [PATCH] Show sequencer sound card numer/PID via aconnect
by Martin Koegler 13 Feb '16

13 Feb '16

From: Martin Koegler <martin.koegler(a)chello.at> Signed-off-by: Martin Koegler <martin.koegler(a)chello.at> --- seq/aconnect/aconnect.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c index 8d6cebb..3508e1b 100644 --- a/seq/aconnect/aconnect.c +++ b/seq/aconnect/aconnect.c @@ -166,11 +166,19 @@ static void print_port(snd_seq_t *seq, snd_seq_client_info_t *cinfo, snd_seq_port_info_t *pinfo, int count) { if (! count) { - printf(_("client %d: '%s' [type=%s]\n"), + printf(_("client %d: '%s' [type=%s"), snd_seq_client_info_get_client(cinfo), snd_seq_client_info_get_name(cinfo), (snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? _("user") : _("kernel"))); + int owner = snd_seq_client_info_get_owner(cinfo); + if (owner != -1) { + if (snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT) + printf(",pid=%d", owner); + else + printf(",card=%d", owner); + } + printf("]\n"); } printf(" %3d '%-16s'\n", snd_seq_port_info_get_port(pinfo), -- 2.1.4

2 1

[alsa-devel] [PATCH V2 0/3] ASOC: bcm2835: move bcm2835-i2s to use clock framework
by kernel＠martin.sperl.org 13 Feb '16

13 Feb '16

From: Martin Sperl <kernel(a)martin.sperl.org> This patchset enables the bcm2835-i2s driver to use the clock framework which was introduced with commit 94cb7f76caa0 ("ARM: bcm2835: Switch to using the new clock driver support."). This commit resulted in the fact that the bcm2835-i2s driver was no longer working due to some register addresses used by 2 drivers (clk-bcm2835 and bcm2835-i2s). This patchset requires that the patchset for PCM-clock support as well as fractional/mash support is applied to the clk-bcm2835 driver and the corresponding device tree, but as the current version of the driver is not working, that should not be a problem. Note that there is one change: right now the current driver tries to calculate an optimal bclk_ratio based on its knowledge that it is using the 19.2Mhz oscillator. This computation would recommend the use of 40 or 80 bits instead of 32/64 bits that are required. Some of the DACs can not handle this, so most downstream drivers would set snd_soc_dai_set_bclk_ratio explicitly to disable this "non-power-of-2" automatic selection. So it seems wise to leave it out of the current patchset. If it is deemed necessary, then I can provide a separate patch that implements this again. Changelog: V1->V2: * moving clock patches into a separate patchset, which fixes also other issues in the clock framework * remove unnecessary bclk_size assignments Martin Sperl (3): ASoC: bcm2835: move to use the clock framework ARM: bcm2835: I2S: use new register-range and clock framework dt-bindings: bsm2835: fix bindings documentation to use new clock framework .../devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 7 +- arch/arm/boot/dts/bcm2835.dtsi | 5 +- sound/soc/bcm/bcm2835-i2s.c | 284 +++++--------------- 3 files changed, 69 insertions(+), 227 deletions(-) -- 1.7.10.4

6 14

[alsa-devel] [PATCH] midi: avoid freeing umidi object twice
by Andrey Konovalov 13 Feb '16

13 Feb '16

The 'umidi' object will be free'd on the error path by snd_usbmidi_free() when tearing down the rawmidi interface. So we shouldn't try to free it in snd_usbmidi_create() after having registered the rawmidi interface. Found by KASAN. Acked-by: Clemens Ladisch <clemens(a)ladisch.de> Signed-off-by: Andrey Konovalov <andreyknvl(a)gmail.com> --- sound/usb/midi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/usb/midi.c b/sound/usb/midi.c index cc39f63..007cf58 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2455,7 +2455,6 @@ int snd_usbmidi_create(struct snd_card *card, else err = snd_usbmidi_create_endpoints(umidi, endpoints); if (err < 0) { - snd_usbmidi_free(umidi); return err; } -- 1.9.1

2 1

[alsa-devel] Applied "ASoC: qcom: Don't specify LE device endianness" to the asoc tree
by Mark Brown 13 Feb '16

13 Feb '16

The patch ASoC: qcom: Don't specify LE device endianness has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 8faa268ab780a7379cfe54b882c6f6e0083233f2 Mon Sep 17 00:00:00 2001 From: Stephen Boyd <sboyd(a)codeaurora.org> Date: Fri, 12 Feb 2016 09:30:17 -0800 Subject: [PATCH] ASoC: qcom: Don't specify LE device endianness This reverts commit 18560a4e3 (ASoC: qcom: Specify LE device endianness). The commit that caused us to specify LE device endianness here, 29bb45f25ff3 (regmap-mmio: Use native endianness for read/write, 2015-10-29), has been reverted in mainline so now when we specify LE it actively breaks big endian kernels because the byte swapping in regmap-mmio is incorrect. Let's revert this change because it will 1) fix the big endian kernels and 2) be redundant to specify LE because that will become the default soon. Signed-off-by: Stephen Boyd <sboyd(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/qcom/lpass-cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 00b6c9d039cf..e5101e0d2d37 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -355,7 +355,6 @@ static struct regmap_config lpass_cpu_regmap_config = { .readable_reg = lpass_cpu_regmap_readable, .volatile_reg = lpass_cpu_regmap_volatile, .cache_type = REGCACHE_FLAT, - .val_format_endian = REGMAP_ENDIAN_LITTLE, }; int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) -- 2.7.0

1 1

[alsa-devel] [PATCH] ALSA: at73c213: add error handling of clk_enable()
by Alexey Khoroshilov 12 Feb '16

12 Feb '16

Recent addition of SSC clock management does not check if clk_enable() succeed. The patch adds such checks where it is appropriate. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov(a)ispras.ru> --- sound/spi/at73c213.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c index fac7e6eb9529..36cfaa316eab 100644 --- a/sound/spi/at73c213.c +++ b/sound/spi/at73c213.c @@ -221,7 +221,11 @@ static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_at73c213_playback_hw; chip->substream = substream; - clk_enable(chip->ssc->clk); + err = clk_enable(chip->ssc->clk); + if (err < 0) { + chip->substream = NULL; + return err; + } return 0; } @@ -787,7 +791,9 @@ static int snd_at73c213_chip_init(struct snd_at73c213 *chip) goto out; /* Enable DAC master clock. */ - clk_enable(chip->board->dac_clk); + retval = clk_enable(chip->board->dac_clk); + if (retval) + goto out; /* Initialize at73c213 on SPI bus. */ retval = snd_at73c213_write_reg(chip, DAC_RST, 0x04); @@ -900,7 +906,9 @@ static int snd_at73c213_dev_init(struct snd_card *card, chip->card = card; chip->irq = -1; - clk_enable(chip->ssc->clk); + retval = clk_enable(chip->ssc->clk); + if (retval) + return retval; retval = request_irq(irq, snd_at73c213_interrupt, 0, "at73c213", chip); if (retval) { @@ -1099,9 +1107,16 @@ static int snd_at73c213_resume(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct snd_at73c213 *chip = card->private_data; + int retval; - clk_enable(chip->board->dac_clk); - clk_enable(chip->ssc->clk); + retval = clk_enable(chip->board->dac_clk); + if (retval) + return retval; + retval = clk_enable(chip->ssc->clk); + if (retval) { + clk_disable(chip->board->dac_clk); + return retval; + } ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXEN)); return 0; -- 1.9.1

1 0

[alsa-devel] [PATCH 1/2] ALSA: timer: Protect the whole snd_timer_close() with open race
by Takashi Iwai 12 Feb '16

12 Feb '16

In order to make the open/close more robust, widen the register_mutex protection over the whole snd_timer_close() function. Also, the close procedure is slightly shuffled to be in the safer order, as well as a few code refactoring. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- This is no urgent fix, so queued for 4.6. sound/core/timer.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index dca817fc7894..b572a9bc31ad 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -318,25 +318,14 @@ int snd_timer_close(struct snd_timer_instance *timeri) if (snd_BUG_ON(!timeri)) return -ENXIO; + mutex_lock(&register_mutex); + list_del(&timeri->open_list); + /* force to stop the timer */ snd_timer_stop(timeri); - if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) { - /* wait, until the active callback is finished */ - spin_lock_irq(&slave_active_lock); - while (timeri->flags & SNDRV_TIMER_IFLG_CALLBACK) { - spin_unlock_irq(&slave_active_lock); - udelay(10); - spin_lock_irq(&slave_active_lock); - } - spin_unlock_irq(&slave_active_lock); - mutex_lock(&register_mutex); - list_del(&timeri->open_list); - mutex_unlock(&register_mutex); - } else { - timer = timeri->timer; - if (snd_BUG_ON(!timer)) - goto out; + timer = timeri->timer; + if (timer) { /* wait, until the active callback is finished */ spin_lock_irq(&timer->lock); while (timeri->flags & SNDRV_TIMER_IFLG_CALLBACK) { @@ -345,11 +334,7 @@ int snd_timer_close(struct snd_timer_instance *timeri) spin_lock_irq(&timer->lock); } spin_unlock_irq(&timer->lock); - mutex_lock(&register_mutex); - list_del(&timeri->open_list); - if (list_empty(&timer->open_list_head) && - timer->hw.close) - timer->hw.close(timer); + /* remove slave links */ spin_lock_irq(&slave_active_lock); spin_lock(&timer->lock); @@ -363,18 +348,27 @@ int snd_timer_close(struct snd_timer_instance *timeri) } spin_unlock(&timer->lock); spin_unlock_irq(&slave_active_lock); - /* release a card refcount for safe disconnection */ - if (timer->card) - put_device(&timer->card->card_dev); - mutex_unlock(&register_mutex); + + /* slave doesn't need to release timer resources below */ + if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) + timer = NULL; } - out: + if (timeri->private_free) timeri->private_free(timeri); kfree(timeri->owner); kfree(timeri); - if (timer) + + if (timer) { + if (list_empty(&timer->open_list_head) && timer->hw.close) + timer->hw.close(timer); + /* release a card refcount for safe disconnection */ + if (timer->card) + put_device(&timer->card->card_dev); module_put(timer->module); + } + + mutex_unlock(&register_mutex); return 0; } -- 2.7.1

1 1

[alsa-devel] Usb audio - unsuported sampling rates
by Gordon Dilan 12 Feb '16

12 Feb '16

Hello, I'm using an usb mic which(according to it's producer should support up to 48kHz sampling rate). The problem is ALSA allows me to use only 16 kHz for this device. I do not want to resample the data, I want to sample it at 48kHz in order to be able to record some high pitch sounds 18-20kHz. I would want to try to do any modifications necessary in order to try support 48kHz, but I'm not sure where to start. Some information: cat /proc/asound/modules ... 1 snd_usb_audio arecord --list-devices **** List of CAPTURE Hardware Devices **** .... card 1: CameraB409241 [USB Camera-B4.09.24.1], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 when I try to use: arecord -v -D hw:1,0 -f S16_LE -c 4 -r 48000 gigi.wav I get this: Recording WAVE 'gigi.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Channels 4 Warning: rate is not accurate (requested = 48000Hz, got = 16000Hz) please, try the plug plugin Hardware PCM card 1 'USB Camera-B4.09.24.1' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 4 rate : 16000 exact rate : 16000 (16000/1) msbits : 16 buffer_size : 8000 period_size : 2000 period_time : 125000 tstamp_mode : NONE period_step : 1 avail_min : 2000 period_event : 0 start_threshold : 1 stop_threshold : 8000 silence_threshold: 0 silence_size : 0 boundary : 2097152000 appl_ptr : 0 hw_ptr : 0 Any sampling rate I would try higher or lower than 16kHz, I will always get 16000 kHz. Some more information: lsusb Bus 001 Device 007: ID 1415:2000 Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc. Sony Playstation Eye lsusb -t /: Bus 01.Port 1: Dev 1, Class=root_hub, Driver=ehci_hcd/2p, 480M |__ Port 1: Dev 2, If 0, Class=hub, Driver=hub/6p, 480M |__ Port 2: Dev 7, If 0, Class=vend., Driver=ov534, 480M |__ Port 2: Dev 7, If 1, Class=audio, Driver=snd-usb-audio, 480M |__ Port 2: Dev 7, If 2, Class=audio, Driver=snd-usb-audio, 480M At the moment I'm looking inside ALSA's source code to try to see from where this limitation of 16000kHz for my device appears, but I have to admit that I'm kind of lost. Any pointers on what direction should I go to try make my desired rate supported would be greatly appreciated! Thank you and best regards, Gordon

3 6

[alsa-devel] [PATCH 0/2] ALSA: dice: improve Dice notification handling
by Takashi Sakamoto 12 Feb '16

12 Feb '16

Hi, This patchset improves Dice notification handling mainly for old firmwares. Dice-based models with earlier firmwares brings 'fail to ensure phase lock' message to ALSA dice driver. This is due to no Dice transaction at confirming clock status. Although this patchet enables ALSA dice driver to handle Dice-based models with old firmwares, I reccomend users to work with updated firmwares because they may include some bug fixes and improve device's behaviours. Regards Takashi Sakamoto (2): ALSA: dice: change notification mask to detect lock status change ALSA: dice: old firmware optimization for Dice notification sound/firewire/dice/dice-stream.c | 17 ++++++++++++++--- sound/firewire/dice/dice-transaction.c | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) -- 2.5.0

2 3

[alsa-devel] ASoC fixes for v4.5
by Mark Brown 12 Feb '16

12 Feb '16

The following changes since commit 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95: Linux 4.5-rc3 (2016-02-07 15:38:30 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.5-rc4 for you to fetch changes up to f11aec0d7c835c3b83e74e3fd60d2e48a850c857: Merge remote-tracking branches 'asoc/fix/rt5659', 'asoc/fix/sigmadsp', 'asoc/fix/simple', 'asoc/fix/wm5110' and 'asoc/fix/wm8960' into asoc-linus (2016-02-10 19:23:09 +0000) ---------------------------------------------------------------- ASoC: Fixes for v4.5 A rather large batch of fixes here, almost all in the Intel driver. The changes that got merged in this merge window for Skylake were rather large and as well as issues that you'd expect in a large block of new code there were some problems created for older processors which needed fixing up. Things are largely settling down now hopefully. ---------------------------------------------------------------- Aaro Koskinen (1): ASoC: simple-card: don't fail if sysclk setting is not supported Arnd Bergmann (2): ASoC: mediatek: add i2c dependency ASoC: rt5659: avoid unused variable warning for rt5659_acpi_match Axel Lin (1): ASoC: rt5659: Fix irq leak Bard Liao (2): ASoC: rt286: fix capture doesn't work at some cases ASoC: rt5645: fix the shift bit of IN1 boost Dan Carpenter (1): ASoC: AMD: free memory on error Dharageswari.R (1): ASoC: Intel: Skylake: Fix pipe memory allocation leak Guneshwor Singh (2): ASoC: Intel: Skylake: Fix delay wrap condition ASoC: Intel: Skylake: Fix mcps freeup after module unbind failure Jeeja KP (6): ASoC: Intel: Skylake: Fix return of skl_get_queue_index ASoC: Intel: Skylake: Fix the module state check condition ASoC: Intel: Skylake: Fix not to stop sink pipe in pga pmd event ASoC: Intel: Skylake: Fix bind of source with multiple sinks ASoC: Intel: Skylake: Add missing PRE/POST_PMU handlers for vmixer ASoC: Intel: Skylake: Fix stereo DMIC record Jon Medhurst (Tixy) (1): ASoC: dwc: Ensure i2s_reg_comp{1,2} is always initialised Lars-Peter Clausen (2): ASoC: imx-spdif: Fix crash on suspend ASoC: dapm: Don't prefix autodisable widgets twice Maciej S. Szmigiero (1): ASoC: fsl_ssi: remove explicit register defaults Mans Rullgard (1): ASoC: mxs-saif: fix clk_prepare() without matching clk_unprepare() Mark Brown (7): Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel-kconfig' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus Merge remote-tracking branches 'asoc/fix/amd', 'asoc/fix/arizona', 'asoc/fix/dpcm', 'asoc/fix/dwc', 'asoc/fix/fsl' and 'asoc/fix/fsl-ssi' into asoc-linus Merge remote-tracking branches 'asoc/fix/imx-spdif', 'asoc/fix/mtk', 'asoc/fix/mxs-saif', 'asoc/fix/qcom' and 'asoc/fix/rt286' into asoc-linus Merge remote-tracking branches 'asoc/fix/rt5659', 'asoc/fix/sigmadsp', 'asoc/fix/simple', 'asoc/fix/wm5110' and 'asoc/fix/wm8960' into asoc-linus Pascal Huerst (1): ASoC: sigmadsp: Fix missleading return value Pierre-Louis Bossart (2): ASoC: Intel: Atom: fix regression on compress DAI ASoC: Intel: Load the atom DPCM driver only Richard Fitzgerald (2): ASoC: wm5110: Unregister compressed platform when driver is removed ASoC: arizona: fref must be limited in pseudo-fractional mode Srinivas Kandagatla (1): ASoC: qcom: use correct device pointer in dma allocation Stuart Henderson (2): ASoC: wm8960: Fix input boost mixer left/right naming ASoC: wm8960: Fix WM8960_SYSCLK_PLL mode Sudip Mukherjee (1): ASoC: Intel: Skylake: Fix memory leak Vinod Koul (6): ASoC: dpcm: fix the BE state on hw_free ASoC: Intel: Skylake: Fix the memory overwrite of tlv buffer ASoC: Intel: Skylake: Remove autosuspend delay ASoC: Intel: Revert "ASoC: Intel: fix ACPI probe regression with Atom DPCM driver" ASoC: Intel: Create independent acpi match module ASoC: Intel: Add module tags for common match module Xiubo Li (1): ASoC: fsl: document DT compatible string "fsl,imx-audio-wm8960" .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 + sound/soc/amd/acp-pcm-dma.c | 1 + sound/soc/codecs/arizona.c | 43 ++++++++++++- sound/soc/codecs/rt286.c | 26 +------- sound/soc/codecs/rt5645.c | 2 +- sound/soc/codecs/rt5659.c | 31 ++++----- sound/soc/codecs/rt5659.h | 1 - sound/soc/codecs/sigmadsp-i2c.c | 5 +- sound/soc/codecs/wm5110.c | 1 + sound/soc/codecs/wm8960.c | 40 ++++++------ sound/soc/dwc/designware_i2s.c | 5 +- sound/soc/fsl/fsl_ssi.c | 42 ++++++------ sound/soc/fsl/imx-spdif.c | 2 - sound/soc/generic/simple-card.c | 2 +- sound/soc/intel/Kconfig | 13 +++- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 + sound/soc/intel/boards/skl_rt286.c | 5 +- sound/soc/intel/common/Makefile | 9 +-- sound/soc/intel/common/sst-acpi.c | 4 ++ sound/soc/intel/common/sst-match-acpi.c | 3 + sound/soc/intel/skylake/skl-messages.c | 6 +- sound/soc/intel/skylake/skl-pcm.c | 1 + sound/soc/intel/skylake/skl-topology.c | 75 +++++++++++++++------- sound/soc/intel/skylake/skl.c | 2 - sound/soc/mediatek/Kconfig | 4 +- sound/soc/mxs/mxs-saif.c | 13 +++- sound/soc/qcom/lpass-platform.c | 15 ++--- sound/soc/soc-dapm.c | 8 +-- sound/soc/soc-pcm.c | 3 +- 29 files changed, 221 insertions(+), 144 deletions(-)

2 1

[alsa-devel] Linking ALSA sequencer kernel clients to their device
by Martin Koegler 12 Feb '16

12 Feb '16

In my domain, people use multiple identical USB-MIDI keyboards - each is assigned a different functions. They expect to kept this mapping across reboots. The sound card number are dynamic, therefore they can change after reboots. The only stable device ID is the sysfs path of the used USB port. This means, that I need to associate a kernel sequencer client number with a sysfs device. rawmidi devices expose the card number via IOCTLs, which allows to find the corresponding device in sysfs. The sequencer provides no identifing data. Chromium works around this issue by scanning rawmidi as well as sequencer devices and matching them by using assumtions, how the kernel register sequencer devices. So I thought about exposing the missing information via sysfs: >From 776dd02d8d7eae89c2699be27eedf81eaf690a0e Mon Sep 17 00:00:00 2001 From: Martin Koegler <martin.koegler(a)chello.at> Date: Mon, 8 Feb 2016 22:53:42 +0100 Subject: [PATCH] Provide sequencer client number via sysfs Provides the missing link between real hardware devices and kernel sequencer clients. Signed-off-by: Martin Koegler <martin.koegler(a)chello.at> --- sound/core/seq/seq_midi.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c index 5dd0ee2..0d807e2 100644 --- a/sound/core/seq/seq_midi.c +++ b/sound/core/seq/seq_midi.c @@ -271,6 +271,31 @@ static void snd_seq_midisynth_delete(struct seq_midisynth *msynth) snd_midi_event_free(msynth->parser); } +static ssize_t +client_number_show_attr(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct snd_seq_device *device = container_of(dev, struct snd_seq_device, dev); + struct snd_card *card = device->card; + struct seq_midisynth_client *client; + + client = card ? synths[card->number] : NULL; + return snprintf(buf, PAGE_SIZE, "%i\n", client ? client->seq_client : -1); +} + +static DEVICE_ATTR(client, S_IRUGO, client_number_show_attr, NULL); + +static ssize_t +device_number_show_attr(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct snd_seq_device *device = container_of(dev, struct snd_seq_device, dev); + + return snprintf(buf, PAGE_SIZE, "%i\n", device->device); +} + +static DEVICE_ATTR(device, S_IRUGO, device_number_show_attr, NULL); + /* register new midi synth port */ static int snd_seq_midisynth_probe(struct device *_dev) @@ -287,6 +312,7 @@ snd_seq_midisynth_probe(struct device *_dev) struct snd_card *card = dev->card; int device = dev->device; unsigned int input_count = 0, output_count = 0; + int error; if (snd_BUG_ON(!card || device < 0 || device >= SNDRV_RAWMIDI_DEVICES)) return -EINVAL; @@ -332,6 +358,16 @@ snd_seq_midisynth_probe(struct device *_dev) kfree(info); return -ENOMEM; } + error = device_create_file(&dev->dev, &dev_attr_client); + if (error >= 0) + error = device_create_file(&dev->dev, &dev_attr_device); + if (error < 0) { + snd_seq_delete_kernel_client(client->seq_client); + kfree(client); + mutex_unlock(&register_mutex); + kfree(info); + return error; + } } msynth = kcalloc(ports, sizeof(struct seq_midisynth), GFP_KERNEL); @@ -451,6 +487,8 @@ snd_seq_midisynth_remove(struct device *_dev) kfree(msynth); client->num_ports--; if (client->num_ports <= 0) { + device_remove_file(&dev->dev, &dev_attr_client); + device_remove_file(&dev->dev, &dev_attr_device); snd_seq_delete_kernel_client(client->seq_client); synths[card->number] = NULL; kfree(client); -- 2.1.4

2 2

[alsa-devel] Resend [GIT PULL]: Update sst audio firmware for Skylake
by Vinod Koul 11 Feb '16

11 Feb '16

Resending again as previous email bounced for linux-firmware(a)kernel.org... Hello Linux firmware maintainers, Please PULL to receive the updated version of Skylake audio firmware. This PULL request has two patches, first one creates a sym link for binary name which helps us to keep different versions of firmware in git Second one updates to latest FW v869 The following changes since commit 52442afee9907bc32a058f22bb3295d040677c26: brcm: add firmware for bcm4366 device (2016-01-25 15:15:34 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/firmware.git skl for you to fetch changes up to f7996657e8f25386541593242cb8e906d9808ec7: linux-firmware: intel: Update Skylake audio firmware (2016-02-04 10:36:52 +0530) ---------------------------------------------------------------- Vinod Koul (2): linux-firmware: intel: add symbolic link and file versions linux-firmware: intel: Update Skylake audio firmware WHENCE | 4 ++-- intel/dsp_fw_release.bin | Bin 233472 -> 23 bytes intel/dsp_fw_release_v827.bin | Bin 0 -> 233472 bytes intel/dsp_fw_release_v869.bin | Bin 0 -> 233472 bytes 4 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 120000 intel/dsp_fw_release.bin create mode 100644 intel/dsp_fw_release_v827.bin create mode 100644 intel/dsp_fw_release_v869.bin Thanks -- ~Vinod

2 1

[alsa-devel] [PATCH] conf: topology: Add topolgy for skylake i2s configuration
by Subhransu S. Prusty 11 Feb '16

11 Feb '16

This patch adds basic playback/capture support for skylake i2s platform. DSP topology module data are passed through the binary files. The framework parses these files and puts the data in the widget private section for the corresponding widget. This is parsed by kernel driver and stored as module config for the DSP. Based on usecase these data are sent to the DSP through IPCs for further processing. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- configure.ac | 2 + src/conf/topology/Makefile.am | 2 +- src/conf/topology/skl/Makefile.am | 5 + src/conf/topology/skl/i2slinux/Makefile.am | 5 + src/conf/topology/skl/i2slinux/codec0_in-cpr-1.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/i2slinux/codec0_in-mi.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/codec0_out-cpr-4.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/i2slinux/codec0_out-mo.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/codec1_out-cpr-5.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/i2slinux/codec1_out-mo.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/dmic01_hifi_in-cpr-3.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/dmic01_hifi_in-mi.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/hdmi1_pt_out-cpr-7.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/hdmi1_pt_out-cpr-8.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/hdmi2_pt_out-cpr-10.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/hdmi2_pt_out-cpr-9.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/hdmi3_pt_out-cpr-11.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/hdmi3_pt_out-cpr-12.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/i2slinux/media0_in-cpr-0.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/i2slinux/media0_in-mi.bin | Bin 0 -> 4268 bytes .../topology/skl/i2slinux/media0_out-cpr-6.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/i2slinux/media0_out-mo.bin | Bin 0 -> 4268 bytes src/conf/topology/skl/skl_i2s_linux.conf | 337 +++++++++++++++++++++ 23 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 src/conf/topology/skl/Makefile.am create mode 100644 src/conf/topology/skl/i2slinux/Makefile.am create mode 100644 src/conf/topology/skl/i2slinux/codec0_in-cpr-1.bin create mode 100644 src/conf/topology/skl/i2slinux/codec0_in-mi.bin create mode 100644 src/conf/topology/skl/i2slinux/codec0_out-cpr-4.bin create mode 100644 src/conf/topology/skl/i2slinux/codec0_out-mo.bin create mode 100644 src/conf/topology/skl/i2slinux/codec1_out-cpr-5.bin create mode 100644 src/conf/topology/skl/i2slinux/codec1_out-mo.bin create mode 100644 src/conf/topology/skl/i2slinux/dmic01_hifi_in-cpr-3.bin create mode 100644 src/conf/topology/skl/i2slinux/dmic01_hifi_in-mi.bin create mode 100644 src/conf/topology/skl/i2slinux/hdmi1_pt_out-cpr-7.bin create mode 100644 src/conf/topology/skl/i2slinux/hdmi1_pt_out-cpr-8.bin create mode 100644 src/conf/topology/skl/i2slinux/hdmi2_pt_out-cpr-10.bin create mode 100644 src/conf/topology/skl/i2slinux/hdmi2_pt_out-cpr-9.bin create mode 100644 src/conf/topology/skl/i2slinux/hdmi3_pt_out-cpr-11.bin create mode 100644 src/conf/topology/skl/i2slinux/hdmi3_pt_out-cpr-12.bin create mode 100644 src/conf/topology/skl/i2slinux/media0_in-cpr-0.bin create mode 100644 src/conf/topology/skl/i2slinux/media0_in-mi.bin create mode 100644 src/conf/topology/skl/i2slinux/media0_out-cpr-6.bin create mode 100644 src/conf/topology/skl/i2slinux/media0_out-mo.bin create mode 100644 src/conf/topology/skl/skl_i2s_linux.conf diff --git a/configure.ac b/configure.ac index 9490d39..af6ea6e 100644 --- a/configure.ac +++ b/configure.ac @@ -660,6 +660,8 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/broadwell-rt286/Makefile \ src/conf/topology/Makefile \ src/conf/topology/broadwell/Makefile \ + src/conf/topology/skl/Makefile \ + src/conf/topology/skl/i2slinux/Makefile \ modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ alsalisp/Makefile aserver/Makefile \ test/Makefile test/lsb/Makefile \ diff --git a/src/conf/topology/Makefile.am b/src/conf/topology/Makefile.am index f56a96c..ce011f3 100644 --- a/src/conf/topology/Makefile.am +++ b/src/conf/topology/Makefile.am @@ -1 +1 @@ -SUBDIRS=broadwell +SUBDIRS=broadwell skl diff --git a/src/conf/topology/skl/Makefile.am b/src/conf/topology/skl/Makefile.am new file mode 100644 index 0000000..623f1d0 --- /dev/null +++ b/src/conf/topology/skl/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS=i2slinux +alsaconfigdir = @ALSA_CONFIG_DIR@ +topologydir = $(alsaconfigdir)/topology/skl +topology_DATA = skl_i2s_linux.conf +EXTRA_DIST = $(topology_DATA) diff --git a/src/conf/topology/skl/i2slinux/Makefile.am b/src/conf/topology/skl/i2slinux/Makefile.am new file mode 100644 index 0000000..c57da9f --- /dev/null +++ b/src/conf/topology/skl/i2slinux/Makefile.am @@ -0,0 +1,5 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +i2slinuxdir = $(alsaconfigdir)/topology/skl/i2slinux +i2slinux_DATA = codec0_in-cpr-1.bin codec0_out-mo.bin dmic01_hifi_in-cpr-3.bin hdmi1_pt_out-cpr-8.bin hdmi3_pt_out-cpr-11.bin media0_in-cpr-0.bin media0_out-mo.bin codec0_in-mi.bin codec1_out-cpr-5.bin dmic01_hifi_in-mi.bin hdmi2_pt_out-cpr-10.bin hdmi3_pt_out-cpr-12.bin media0_in-mi.bin codec0_out-cpr-4.bin codec1_out-mo.bin hdmi1_pt_out-cpr-7.bin hdmi2_pt_out-cpr-9.bin media0_out-cpr-6.bin + +EXTRA_DIST = $(i2slinux_DATA) diff --git a/src/conf/topology/skl/i2slinux/codec0_in-cpr-1.bin b/src/conf/topology/skl/i2slinux/codec0_in-cpr-1.bin new file mode 100644 index 0000000000000000000000000000000000000000..67ec763d25a7c6a87a2090a620aba6ec9a15a87f GIT binary patch literal 4268 zcmeIuF%E+;6a!Ev6<Y_!j#c+a5E#h#8{k|_JxA}+!v&}6PG{su-?5Y||D~sOU7m)J zt&d?ewloeo^sB{Xiffu@1J4Bx@0Vi&8>3D=&T}3NT+zV$+O`jH=Y8Y+zOeyqDdk&E i97p>fy`Pvyt4Tlt5|DrdBp?9^NI(J-kbngK64(I`Xcztf literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/codec0_in-mi.bin b/src/conf/topology/skl/i2slinux/codec0_in-mi.bin new file mode 100644 index 0000000000000000000000000000000000000000..bde78994ea15d128cbd9446fc6927a3b3a67a135 GIT binary patch literal 4268 zcmeIvy%B&Q3<l81ot=dvxBzzu_(KcG9FAh;9PZ(8niQ^Jp<g(X9MI(9!Z?gewA#g~ z*WUP`=j@6u!KOSU?~)0`QSmx<$wV6`*%wD82dm=LP)$lnx1B^CSJ`s?M9c4={;T!x d^MCbUF&6|N009U<00Izz00bZa0SLS&a05GX7nlG5 literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/codec0_out-cpr-4.bin b/src/conf/topology/skl/i2slinux/codec0_out-cpr-4.bin new file mode 100644 index 0000000000000000000000000000000000000000..cfa5661fc67763d279ed03c1288a2d8b8d13f2df GIT binary patch literal 4268 zcmeIuF%E+;3<c01%GiOCvFaWP0s|S{P|n5FbMziPT=+rkbVlEj9b56@7hl$OX&QX8 zKKRkt#c@c!Uo5<*u*7*bFm9;v{Wv)GD@(}|u3|pRaOX}{bHw@s9(-HovBnN)a?X2m i;c|BW+5d%UbeaStAOQ(TKmrnwfCMBU0SQRpFM$m(f*1e* literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/codec0_out-mo.bin b/src/conf/topology/skl/i2slinux/codec0_out-mo.bin new file mode 100644 index 0000000000000000000000000000000000000000..50873bb1ab6dfcd7a6fdd3885031f42099298713 GIT binary patch literal 4268 zcmeIuu@QhE3<c1j78Vwc-~!wMirOOR9F9We9PZ(8niO_!;Llz1?~+unkAC#V2knM5 z>A}vMUQ&uW+RcYPL>E>=Tm|=eC{mo6hxE-=%VL+&P)S84fB7QnIHl$CR?Gi?zrPkp Z2tWV=5P$##AOHafKmY;|fB*!(1s-(zH=6(e literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/codec1_out-cpr-5.bin b/src/conf/topology/skl/i2slinux/codec1_out-cpr-5.bin new file mode 100644 index 0000000000000000000000000000000000000000..2b3b7a0dd62d9ab6ea407eae631089e41228c73e GIT binary patch literal 4268 zcmeIuF%H5o3<c1iP&NieM$|o0n|5eMlhSiBagN@jhYLT5z0B3OWXG1X_@#$+U7m)J zt&d?ec4-`P=ogF6DK2TA4U7}cSl<qg{fnh$4d*>vTZao8cuw4Hz@6`n`TNEWxRz4B j&4J6_{d@ZZ)95q_NI(J-kbndvAOQ(TKmrnwz+VC%QGOT# literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/codec1_out-mo.bin b/src/conf/topology/skl/i2slinux/codec1_out-mo.bin new file mode 100644 index 0000000000000000000000000000000000000000..860883d9d4587ffa15d64ec7dee2a69c367fffb2 GIT binary patch literal 4268 zcmeIuyA6Oa3<S_4qM)E)1Qv)CJ^|X0z#NQ1#T@Lxa9|g7Y`~r5vlOR#UG#%@KG?QT zqwSk%wR1|*#%A@Q3$YE0gTx@id1TVSE~Rrz3VqnLO5`xc==}m}**bc8Q_26o-(L%E Z3Q&Lo6rcbFC_n)UP=Epypa2EF1s-)GH=6(e literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/dmic01_hifi_in-cpr-3.bin b/src/conf/topology/skl/i2slinux/dmic01_hifi_in-cpr-3.bin new file mode 100644 index 0000000000000000000000000000000000000000..853de5655bbfd9f26a1820811c29cdc3b345e0d6 GIT binary patch literal 4268 zcmeIuu?>ST5Czb02c=38F+mov1cm~a7Zc{9${g7v!#Uq5J=Eyiy7RZ}=3aVQ*X3yl z+4>kpV@l(YL%&#jO>s%{Y~Z?Zf8Gv`d1b3rm-DRFqiJrq!h2q^et`$iTK{iMz`c~R jg%h{E`S;#WOry~xAOQ(TKmrnwfCMBU0SQPz0*3^CGzS<F literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/dmic01_hifi_in-mi.bin b/src/conf/topology/skl/i2slinux/dmic01_hifi_in-mi.bin new file mode 100644 index 0000000000000000000000000000000000000000..97cb2f4e6d47bbec1a61ec22d0cb5825944b978a GIT binary patch literal 4268 zcmeIvy$ysg3<cnqAW>a$Bd|auAR&;J0CO-36?5Dk49D38D^S3*<R2wz{Kco(#d&O< zAN$6IIwUttesN1`^VH?wbDbbzP~f*4>A)sM^OP`puv#e}l(1H(?Eot2ntFZ3SKeRq gQ~TTZf9k(-FA7kA0u-PC1t>rP3Q&Lo6u3{|4{X*Kn*aa+ literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/hdmi1_pt_out-cpr-7.bin b/src/conf/topology/skl/i2slinux/hdmi1_pt_out-cpr-7.bin new file mode 100644 index 0000000000000000000000000000000000000000..eaca9488b52e8fc7722ac9966498031c7f9675a0 GIT binary patch literal 4268 zcmeIuu@QqX3<c0HQlz0^ge>4YFci2{4D@V7l{vCUhJ){dn$+Caoh{i?qnF;^wt4JB z_AZ9OS*4-Rp<6u8V_ecSIT#N-@%<Q#^~S55onaMVYx%7?VHKa)e!z>loYFa?;rv<O iHDB$2)xWEY_L6`EBp?9^NI(J-kbndvAOQ*dD{ug4IUGj- literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/hdmi1_pt_out-cpr-8.bin b/src/conf/topology/skl/i2slinux/hdmi1_pt_out-cpr-8.bin new file mode 100644 index 0000000000000000000000000000000000000000..88908216321996f8696fab9528dceb0f095f0ba2 GIT binary patch literal 4268 zcmeIuu@QqX3<c0HQjj7AC1n=y9T*B+DkjWD#T?lq!zJGZHPqbKoh;dMqnBRZb$J>> z_CAKu*`;yFp<g_{r?{kfb}(+Z<Fgrz{mP@{k6{&HUS1!lVHK}fzrd5VWtPbv4gc@` iRqN6INAs(?XfFv!KmrnwfCMBU0SQPz0uqqGS%E+Mo*W<m literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/hdmi2_pt_out-cpr-10.bin b/src/conf/topology/skl/i2slinux/hdmi2_pt_out-cpr-10.bin new file mode 100644 index 0000000000000000000000000000000000000000..ae8ca45258aea59a8458d4ac481678e4e63b7bd6 GIT binary patch literal 4268 zcmeIuF%E+;3<c0{x}d59BV#WR2?7Hd-B8ZO#5sD89<Kcvm|;fWl4B>%;+J0Db$J>> z_CAKu*`;yFp<g_{r?{kfb}(+Z<Fgrz{mP@{k6{&HUS1!lVHK}fzrd5VWtPbv4gc@` iRqN6INAs(?XfFv!KmrnwfCMBU0SQPz0uqqGS%E(-5ga1` literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/hdmi2_pt_out-cpr-9.bin b/src/conf/topology/skl/i2slinux/hdmi2_pt_out-cpr-9.bin new file mode 100644 index 0000000000000000000000000000000000000000..71e94823f7316fa9c0a73b46b1867388d64608cb GIT binary patch literal 4268 zcmeIuu?>VU3<c0{t~n$MMz{qcL7+%V6ONvZsF;I27!I6*8fx?{Id<YSesR#INuhH| zTkm?cF7{n=?WF!6{1nGgVevtUZ54?1iyb)+3n>7Z^J|4Kq_8WN9r#(znI~7&_W$bN hTJQG1o4?hCdr^P_6rcbFC_n)UP=Epypa2D)3Y?jp97+HH literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/hdmi3_pt_out-cpr-11.bin b/src/conf/topology/skl/i2slinux/hdmi3_pt_out-cpr-11.bin new file mode 100644 index 0000000000000000000000000000000000000000..4b3c12c102218f93ec6c5d93725e63dff9a0205a GIT binary patch literal 4268 zcmeIuu?>VU3<c0{t~x=%2)95a2oy<a!qKx46?3o$!+}#!Lyf*A$4;EaFAmx?DReGr z>s_zb#lB0foz(w>pW-+wEIuf)tpc%ru_NbUAq60Fey#9@6n4e313#-d^W=)!{$KrD h>)rl$^S8QiFA7kA0u-PC1t>rP3Q&Lo6rjLUffLIC98CZK literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/hdmi3_pt_out-cpr-12.bin b/src/conf/topology/skl/i2slinux/hdmi3_pt_out-cpr-12.bin new file mode 100644 index 0000000000000000000000000000000000000000..b8cd0949df74607d278ada0cb1f8f7fdfe36d24c GIT binary patch literal 4268 zcmeIuF%E+;3<c0{I#pum$k+=+g1|sV6Uw=mI0yIW;o6^p8D{h?Id<YKerfWy&0`<3 zcQFjkE)9JS-Qw{x#wE?OgYiI(eKQ#Ql}E`R!z#eMyw-TaDqgXEfj4WzER!Q%{D1U! ht!Mk6&F|`>y(Az32}nQ!5|DrdBp?9^NI(Kt1^!-j93}t& literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/media0_in-cpr-0.bin b/src/conf/topology/skl/i2slinux/media0_in-cpr-0.bin new file mode 100644 index 0000000000000000000000000000000000000000..01934b36352524d571f91f327c9870cd1a712d9a GIT binary patch literal 4268 zcmeIup%H*E3<b~xEP@eOpm$IZRE7ecjZn<N9t;P+0u8$NbC)J<YVyKlZ5zklMeDp9 z3|$!d=(^SXGWs>lvk9U^o`;H}?l@B32rWc(ORp7XTHq@CCDNd#Op`Zi{D1pg>(~BY d^IToH7X>Il0SZun0u-PC1t>rP3Q*v$zyp$896A61 literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/media0_in-mi.bin b/src/conf/topology/skl/i2slinux/media0_in-mi.bin new file mode 100644 index 0000000000000000000000000000000000000000..fb8847d95047226fb83c2e65ab54ed859ae942fb GIT binary patch literal 4268 zcmeIv!3}^Q3<Xf&?7<OSfCK?iuAt1}D4v|dJseJ36Ibwnze#CHx%A;;7{ZdQc4_Rj zH$LiVc14$H^E_nlvWbF1QXac}>P8pNi$d~X<)fjQREoOo6r!Wb$&)u)djIyd*1zvx b>%U?z2tWV=5P$##AOHafKmY;|_)g#k$ekCF literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/media0_out-cpr-6.bin b/src/conf/topology/skl/i2slinux/media0_out-cpr-6.bin new file mode 100644 index 0000000000000000000000000000000000000000..37e8d593a7c096c4f75f92e8941e74b02497472e GIT binary patch literal 4268 zcmeIuu?>ST5CzbGjzmR~5wd_KFci4Fm{4aVD(1)@8IF86w4_G=q_e-}YwqQzcU_r= zSiDbhbf!EGCH9M_*OZn#&koiN4L+N}m{%UPca{af-aODEz(P&y7kKcl&9S5IoIf5H i4QKnG{a=(tYe_%?5|DrdBp?9^NI(J-kbngK7We@L)*L|q literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/i2slinux/media0_out-mo.bin b/src/conf/topology/skl/i2slinux/media0_out-mo.bin new file mode 100644 index 0000000000000000000000000000000000000000..3c2336079fb1c6cae8d8557a3724cfb90f4733de GIT binary patch literal 4268 zcmeIuy%B&Q3<Y4IvaoOj7vK&>)D}VJa1<-&a1V#mm%`2seBttQB-Q6r7=sJZ_CucR z(9OjzIVYRC5~7c(kE>G%gLfWUY0Nu{<c+B0V>2i<F0_$pzm#gxC1w3agZsblUki2$ YP=Epypa2CZKmiI+fC3bt00q7U9%Sq{ng9R* literal 0 HcmV?d00001 diff --git a/src/conf/topology/skl/skl_i2s_linux.conf b/src/conf/topology/skl/skl_i2s_linux.conf new file mode 100644 index 0000000..53cb1c1 --- /dev/null +++ b/src/conf/topology/skl/skl_i2s_linux.conf @@ -0,0 +1,337 @@ +SectionData."media0_in cpr 0" { + file "skl/i2slinux/media0_in-cpr-0.bin" +} +SectionData."media0_in mi" { + file "skl/i2slinux/media0_in-mi.bin" +} +SectionData."media0_out mo" { + file "skl/i2slinux/media0_out-mo.bin" +} +SectionData."media0_out cpr 6" { + file "skl/i2slinux/media0_out-cpr-6.bin" +} +SectionData."codec0_out mo" { + file "skl/i2slinux/codec0_out-mo.bin" +} +SectionData."codec0_out cpr 4" { + file "skl/i2slinux/codec0_out-cpr-4.bin" +} +SectionData."codec1_out mo" { + file "skl/i2slinux/codec1_out-mo.bin" +} +SectionData."codec1_out cpr 5" { + file "skl/i2slinux/codec1_out-cpr-5.bin" +} +SectionData."codec0_in cpr 1" { + file "skl/i2slinux/codec0_in-cpr-1.bin" +} +SectionData."codec0_in mi" { + file "skl/i2slinux/codec0_in-mi.bin" +} +SectionData."dmic01_hifi_in cpr 3" { + file "skl/i2slinux/dmic01_hifi_in-cpr-3.bin" +} +SectionData."dmic01_hifi_in mi" { + file "skl/i2slinux/dmic01_hifi_in-mi.bin" +} +SectionData."hdmi1_pt_out cpr 7" { + file "skl/i2slinux/hdmi1_pt_out-cpr-7.bin" +} +SectionData."hdmi1_pt_out cpr 8" { + file "skl/i2slinux/hdmi1_pt_out-cpr-8.bin" +} +SectionData."hdmi2_pt_out cpr 9" { + file "skl/i2slinux/hdmi2_pt_out-cpr-9.bin" +} +SectionData."hdmi2_pt_out cpr 10" { + file "skl/i2slinux/hdmi2_pt_out-cpr-10.bin" +} +SectionData."hdmi3_pt_out cpr 11" { + file "skl/i2slinux/hdmi3_pt_out-cpr-11.bin" +} +SectionData."hdmi3_pt_out cpr 12" { + file "skl/i2slinux/hdmi3_pt_out-cpr-12.bin" +} + +SectionControlMixer."media0_in mi Switch" { + index"1" + invert "false" + max "1" + no_pm "true" + channel."fl" { + reg "-1" + shift "0" + } + channel."fr" { + reg "-1" + shift "0" + } + ops."ctl" { + get "64" + put "64" + info "64" + } +} +SectionControlMixer."codec0_in mi Switch" { + index"1" + invert "false" + max "1" + no_pm "true" + channel."fl" { + reg "-1" + shift "0" + } + channel."fr" { + reg "-1" + shift "0" + } + ops."ctl" { + get "64" + put "64" + info "64" + } +} +SectionControlMixer."dmic01_hifi_in mi Switch" { + index"1" + invert "false" + max "1" + no_pm "true" + channel."fl" { + reg "-1" + shift "0" + } + channel."fr" { + reg "-1" + shift "0" + } + ops."ctl" { + get "64" + put "64" + info "64" + } +} + +SectionWidget."media0_in cpr 0" { + index"1" + type"mixer" + no_pm "true" + event_type "3" + event_flags "9" + data "media0_in cpr 0" +} +SectionWidget."media0_in mi" { + index"1" + type"pga" + no_pm "true" + event_type "4" + event_flags "9" + subseq "10" + data "media0_in mi" +} +SectionWidget."media0_out mo" { + index"1" + type"mixer" + no_pm "true" + event_type "1" + event_flags "15" + subseq "10" + data "media0_out mo" + mixer [ + "media0_in mi Switch" + "codec0_in mi Switch" + "dmic01_hifi_in mi Switch" + ] +} +SectionWidget."media0_out cpr 6" { + index"1" + type"pga" + no_pm "true" + event_type "4" + data "media0_out cpr 6" +} +SectionWidget."codec0_out mo" { + index"1" + type"mixer" + no_pm "true" + event_type "1" + event_flags "15" + subseq "10" + data "codec0_out mo" + mixer [ + "media0_in mi Switch" + "codec0_in mi Switch" + "dmic01_hifi_in mi Switch" + ] +} +SectionWidget."codec0_out cpr 4" { + index"1" + type"pga" + no_pm "true" + event_type "4" + data "codec0_out cpr 4" +} +SectionWidget."codec0_out" { + index"1" + type"aif_out" + no_pm "true" +} +SectionWidget."codec1_out mo" { + index"1" + type"mixer" + no_pm "true" + event_type "1" + event_flags "15" + subseq "10" + data "codec1_out mo" + mixer [ + "media0_in mi Switch" + "codec0_in mi Switch" + "dmic01_hifi_in mi Switch" + ] +} +SectionWidget."codec1_out cpr 5" { + index"1" + type"pga" + no_pm "true" + event_type "4" + data "codec1_out cpr 5" +} +SectionWidget."codec1_out" { + index"1" + type"aif_out" + no_pm "true" +} +SectionWidget."codec0_in cpr 1" { + index"1" + type"mixer" + no_pm "true" + event_type "3" + event_flags "9" + data "codec0_in cpr 1" +} +SectionWidget."codec0_in mi" { + index"1" + type"pga" + no_pm "true" + event_type "4" + event_flags "9" + subseq "10" + data "codec0_in mi" +} +SectionWidget."codec0_in" { + index"1" + type"aif_in" + no_pm "true" +} +SectionWidget."dmic01_hifi_in cpr 3" { + index"1" + type"mixer" + no_pm "true" + event_type "3" + event_flags "9" + data "dmic01_hifi_in cpr 3" +} +SectionWidget."dmic01_hifi_in mi" { + index"1" + type"pga" + no_pm "true" + event_type "4" + event_flags "9" + subseq "10" + data "dmic01_hifi_in mi" +} +SectionWidget."dmic01_hifi" { + index"1" + type"aif_in" + no_pm "true" +} +SectionWidget."hdmi1_pt_out cpr 7" { + index"1" + type"mixer" + no_pm "true" + event_type "3" + event_flags "9" + data "hdmi1_pt_out cpr 7" +} +SectionWidget."hdmi1_pt_out cpr 8" { + index"1" + type"pga" + no_pm "true" + event_type "4" + data "hdmi1_pt_out cpr 8" +} +SectionWidget."iDisp1_out" { + index"1" + type"aif_out" + no_pm "true" +} +SectionWidget."hdmi2_pt_out cpr 9" { + index"1" + type"mixer" + no_pm "true" + event_type "3" + event_flags "9" + data "hdmi2_pt_out cpr 9" +} +SectionWidget."hdmi2_pt_out cpr 10" { + index"1" + type"pga" + no_pm "true" + event_type "4" + data "hdmi2_pt_out cpr 10" +} +SectionWidget."iDisp2_out" { + index"1" + type"aif_out" + no_pm "true" +} +SectionWidget."hdmi3_pt_out cpr 11" { + index"1" + type"mixer" + no_pm "true" + event_type "3" + event_flags "9" + data "hdmi3_pt_out cpr 11" +} +SectionWidget."hdmi3_pt_out cpr 12" { + index"1" + type"pga" + no_pm "true" + event_type "4" + data "hdmi3_pt_out cpr 12" +} +SectionGraph."Pipeline 1 Graph" { + index"1" + lines [ + "media0_in mi, , media0_in cpr 0" + "media0_in cpr 0, , System Playback" + "media0_out mo, media0_in mi Switch, media0_in mi" + "media0_out mo, codec0_in mi Switch, codec0_in mi" + "media0_out mo, dmic01_hifi_in mi Switch, dmic01_hifi_in mi" + "media0_out cpr 6, , media0_out mo" + "System Capture, , media0_out cpr 6" + "codec0_out mo, media0_in mi Switch, media0_in mi" + "codec0_out mo, codec0_in mi Switch, codec0_in mi" + "codec0_out mo, dmic01_hifi_in mi Switch, dmic01_hifi_in mi" + "codec0_out cpr 4, , codec0_out mo" + "codec0_out, , codec0_out cpr 4" + "codec1_out mo, media0_in mi Switch, media0_in mi" + "codec1_out mo, codec0_in mi Switch, codec0_in mi" + "codec1_out mo, dmic01_hifi_in mi Switch, dmic01_hifi_in mi" + "codec1_out cpr 5, , codec1_out mo" + "codec1_out, , codec1_out cpr 5" + "codec0_in mi, , codec0_in cpr 1" + "codec0_in cpr 1, , codec0_in" + "dmic01_hifi_in mi, , dmic01_hifi_in cpr 3" + "dmic01_hifi_in cpr 3, , dmic01_hifi" + "hdmi1_pt_out cpr 8, , hdmi1_pt_out cpr 7" + "hdmi1_pt_out cpr 7, , HDMI1 Playback" + "iDisp1_out, , hdmi1_pt_out cpr 8" + "hdmi2_pt_out cpr 10, , hdmi2_pt_out cpr 9" + "hdmi2_pt_out cpr 9, , HDMI2 Playback" + "iDisp2_out, , hdmi2_pt_out cpr 10" + "hdmi3_pt_out cpr 12, , hdmi3_pt_out cpr 11" + "hdmi3_pt_out cpr 11, , HDMI3 Playback" + "iDisp1_out, , hdmi3_pt_out cpr 12" + ] +} -- 1.9.1

4 11

Re: [alsa-devel] [PATCH 18/19] ASoC: Intel: Atom: add support for RT5642
by Luka Karinja 11 Feb '16

11 Feb '16

> The machine driver is not loaded when the BIOS uses the 10EC5642 > _HID. Add it to the white list of known _HIDs, codec_name is > already taken care of by previous commit > > Tested on Asus T100TAF. > I'm trying to get sound working on my T100TAF i did apply all the 19 patches on top of broonie/sound and added UCM files to my system. Does the TAF need different UCM file than the T100TA? aplay -l **** List of PLAYBACK Hardware Devices **** card 0: bytcrrt5640 [bytcr-rt5640], device 0: Baytrail Audio (*) [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: bytcrrt5640 [bytcr-rt5640], device 1: Deep-Buffer Audio (*) [] Subdevices: 1/1 Subdevice #0: subdevice #0 dmesg: [ 5.209239] Adding 1049596k swap on /dev/mmcblk0p4. Priority:-1 extents:1 across:1049596k SSFS [ 5.219099] input: PC Speaker as /devices/platform/pcspkr/input/input6 [ 5.273802] i2c i2c-10: Added multiplexed i2c bus 13 [ 5.274629] intel_sst_acpi 80860F28:00: LPE base: 0x50a00000 size:0x200000 [ 5.274638] intel_sst_acpi 80860F28:00: IRAM base: 0x50ac0000 [ 5.274671] intel_sst_acpi 80860F28:00: DRAM base: 0x50b00000 [ 5.274685] intel_sst_acpi 80860F28:00: SHIM base: 0x50b40000 [ 5.274700] intel_sst_acpi 80860F28:00: Mailbox base: 0x50b44000 [ 5.274712] intel_sst_acpi 80860F28:00: DDR base: 0x20000000 [ 5.274842] intel_sst_acpi 80860F28:00: Got drv data max stream 25 [ 5.290156] Error: Driver 'pcspkr' is already registered, aborting... [ 5.311924] random: nonblocking pool is initialized [ 5.397912] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: data=ordered [ 5.506882] genirq: Flags mismatch irq 8. 00000083 (volume_down) vs. 00000000 (rtc0) [ 5.507025] gpio-keys gpio-keys.0.auto: Unable to claim irq 8; error -16 [ 5.507283] gpio-keys: probe of gpio-keys.0.auto failed with error -16 [ 5.507518] input: gpio-keys as /devices/platform/gpio-keys.1.auto/input/input8 [ 5.519513] iTCO_vendor_support: vendor-support=0 [ 5.591021] iTCO_wdt: Intel TCO WatchDog Timer Driver v1.11 [ 5.591153] iTCO_wdt: Found a Bay Trail SoC TCO device (Version=3, TCOBASE=0x0460) [ 5.604447] iTCO_wdt: initialized. heartbeat=30 sec (nowayout=0) [ 5.613586] bytcr_rt5640 bytcr_rt5640: snd-soc-dummy-dai <-> media-cpu-dai mapping ok [ 5.613794] bytcr_rt5640 bytcr_rt5640: snd-soc-dummy-dai <-> deepbuffer-cpu-dai mapping ok [ 5.613922] compress asoc: snd-soc-dummy-dai <-> compress-cpu-dai mapping ok [ 5.615555] bytcr_rt5640 bytcr_rt5640: rt5640-aif1 <-> ssp2-port mapping ok [ 5.642183] asus_wmi: ASUS WMI generic driver loaded [ 5.663786] usbcore: registered new interface driver usbmouse [ 5.665362] usbcore: registered new interface driver usbkbd [ 5.681990] asus_wmi: Initialization: 0x1 [ 5.682121] asus_wmi: BIOS WMI version: 7.9 [ 5.682219] asus_wmi: SFUN value: 0x37 [ 5.685337] input: Asus WMI hotkeys as /devices/platform/asus-nb-wmi/input/input9 [ 5.708007] asus_wmi: Number of fans: 1 [ 5.801413] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 0 doesn't have DAPM widget!!! [ 5.801529] input: SIS0817:00 0457:1071 as /devices/platform/80860F41:03/i2c-11/i2c-SIS0817:00/0018:0457:1071.0004/input/input10 [ 5.802167] hid-multitouch 0018:0457:1071.0004: input,hidraw3: I2C HID v1.00 Device [SIS0817:00 0457:1071] on i2c-SIS0817:00 [ 5.816775] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 1 doesn't have DAPM widget!!! [ 5.816996] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 2 doesn't have DAPM widget!!! [ 5.817204] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 3 doesn't have DAPM widget!!! [ 5.817405] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in0_0 doesn't have DAPM widget!!! [ 5.817616] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in0_1 doesn't have DAPM widget!!! [ 5.818884] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in1_0 doesn't have DAPM widget!!! [ 5.819109] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in1_1 doesn't have DAPM widget!!! [ 5.911351] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 0 doesn't have DAPM widget!!! [ 5.911578] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 1 doesn't have DAPM widget!!! [ 5.911787] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 2 doesn't have DAPM widget!!! [ 5.911997] sst-mfld-platform sst-mfld-platform: Slot control: codec_out tx interleaver slot 3 doesn't have DAPM widget!!! [ 5.912201] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in0_0 doesn't have DAPM widget!!! [ 5.912417] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in0_1 doesn't have DAPM widget!!! [ 5.912634] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in1_0 doesn't have DAPM widget!!! [ 5.915142] sst-mfld-platform sst-mfld-platform: Slot control: codec_in rx deinterleaver codec_in1_1 doesn't have DAPM widget!!! [ 6.042680] intel_rapl: Found RAPL domain package [ 6.042692] intel_rapl: Found RAPL domain core [ 6.247467] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 6.247489] Bluetooth: BNEP filters: protocol multicast [ 6.247515] Bluetooth: BNEP socket layer initialized [ 7.524852] brcmf_sdio_drivestrengthinit: No SDIO Drive strength init done for chip 43340 rev 2 pmurev 20 [ 7.525341] usbcore: registered new interface driver brcmfmac [ 7.722004] brcmf_c_preinit_dcmds: Firmware version = wl0: Jun 17 2014 11:48:43 version 6.10.190.49 (r485840) FWID 01-8744bcd2 [ 7.739335] brcmf_cfg80211_reg_notifier: not a ISO3166 code [ 7.899345] IPv6: ADDRCONF(NETDEV_UP): wlan0: link is not ready [ 7.921532] audit: type=1006 audit(1450805770.516:2): pid=1018 uid=0 old-auid=4294967295 auid=1000 old-ses=4294967295 ses=1 res=1 [ 7.984230] audit: type=1006 audit(1450805770.580:3): pid=1091 uid=0 old-auid=4294967295 auid=1000 old-ses=4294967295 ses=2 res=1 [ 7.996410] IPv6: ADDRCONF(NETDEV_UP): wlan0: link is not ready [ 8.151283] IPv6: ADDRCONF(NETDEV_UP): wlan0: link is not ready [ 9.038571] IPv6: ADDRCONF(NETDEV_UP): wlan0: link is not ready [ 11.245916] Bluetooth: hci1: BCM: chip id 82 [ 11.245928] Bluetooth: hci1: BCM43341B0 (002.001.014) build 0000 [ 11.755123] Bluetooth: hci1: BCM (002.001.014) build 0164 [ 14.513027] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x0 fw_state 0x1 [ 14.513045] intel_sst_acpi 80860F28:00: fw download failed -16 [ 14.513067] intel_sst_acpi 80860F28:00: FW download fail -16 [ 14.513864] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.514676] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.515574] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.518058] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.518941] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.520293] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.525383] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.527248] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.528335] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port [ 14.534111] Baytrail Audio Port: ASoC: no backend DAIs enabled for Baytrail Audio Port

2 4

[alsa-devel] [PATCH 0/6 v2] ALSA: dice: constrain PCM substreams to current sampling transfer frequency
by Takashi Sakamoto 11 Feb '16

11 Feb '16

Hi, This patchset is to update my former RFCv2 and for merge request to upstream. [alsa-devel][RFC][PATCH 00/10 v2] ALSA: dice: stabiliza packet streaming http://mailman.alsa-project.org/pipermail/alsa-devel/2015-December/101897.h… Current ALSA Dice driver is written with somewhat ignoring actual hardware design to perform 'dynamic sample rate selection'. As a result, the driver includes some behaviors against users' expectation or functional misleading. This patchset purges such over-engineering. As a result, userspace applications can start PCM substreams just at current sampling transfer frequency. If users want to start at different sampling rate, they must set favorite rate in advance by tools. Currently, ffado-mixer with ffado-dbus-server[1] and hinawa-dice-common-cui[2] are available as such tool. For technical details, please refer to the post or our discussion in RFCv1: [alsa-devel] [RFC][PATCH 0/8] ALSA: dice: constrain PCM substreams to current sampling transfer frequency http://mailman.alsa-project.org/pipermail/alsa-devel/2015-November/100525.h… [1] as a part of FFADO utility http://subversion.ffado.org/ [2] in hinawa-utils repository https://github.com/takaswie/hinawa-utils Regards Takashi Sakamoto (6): ALSA: dice: limit to current sampling transfer frequency ALSA: dice: limit stream to current sampling transfer frequency. ALSA: dice: add MIDI ports according to current number of MIDI substreams ALSA: dice: get the number of MBLA data channel at opening PCM substream ALSA: dice: purge generating channel cache ALSA: dice: ensure phase lock before starting streaming sound/firewire/dice/dice-midi.c | 23 +++- sound/firewire/dice/dice-pcm.c | 199 +++++++++------------------------ sound/firewire/dice/dice-stream.c | 69 +++++++----- sound/firewire/dice/dice-transaction.c | 54 --------- sound/firewire/dice/dice.c | 67 +---------- sound/firewire/dice/dice.h | 8 -- 6 files changed, 116 insertions(+), 304 deletions(-) -- 2.5.0

2 8

[alsa-devel] [PATCH] ASoC: arizona: fref must be limited in pseudo-fractional mode
by Richard Fitzgerald 10 Feb '16

10 Feb '16

When the FLL is in pseudo-fractional mode there is an additional limit on fref based on the fratio, to prevent aliasing around the Nyquist frequency. If fref exceeds this limit the refclk divider must be increased and the calculation tried again until a suitable combination of fref and fratio is found or we have to fall back to integer mode. This patch also adds some debug log prints around this code. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/arizona.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index a32cfb8..913cfa8 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1899,6 +1899,25 @@ static struct { { 1000000, 13500000, 0, 1 }, }; +static const unsigned int pseudo_fref_max[ARIZONA_FLL_MAX_FRATIO] = { + 13500000, + 6144000, + 6144000, + 3072000, + 3072000, + 2822400, + 2822400, + 1536000, + 1536000, + 1536000, + 1536000, + 1536000, + 1536000, + 1536000, + 1536000, + 768000, +}; + static struct { unsigned int min; unsigned int max; @@ -2012,16 +2031,32 @@ static int arizona_calc_fratio(struct arizona_fll *fll, /* Adjust FRATIO/refdiv to avoid integer mode if possible */ refdiv = cfg->refdiv; + arizona_fll_dbg(fll, "pseudo: initial ratio=%u fref=%u refdiv=%u\n", + init_ratio, Fref, refdiv); + while (div <= ARIZONA_FLL_MAX_REFDIV) { for (ratio = init_ratio; ratio <= ARIZONA_FLL_MAX_FRATIO; ratio++) { if ((ARIZONA_FLL_VCO_CORNER / 2) / - (fll->vco_mult * ratio) < Fref) + (fll->vco_mult * ratio) < Fref) { + arizona_fll_dbg(fll, "pseudo: hit VCO corner\n"); break; + } + + if (Fref > pseudo_fref_max[ratio - 1]) { + arizona_fll_dbg(fll, + "pseudo: exceeded max fref(%u) for ratio=%u\n", + pseudo_fref_max[ratio - 1], + ratio); + break; + } if (target % (ratio * Fref)) { cfg->refdiv = refdiv; cfg->fratio = ratio - 1; + arizona_fll_dbg(fll, + "pseudo: found fref=%u refdiv=%d(%d) ratio=%d\n", + Fref, refdiv, div, ratio); return ratio; } } @@ -2030,6 +2065,9 @@ static int arizona_calc_fratio(struct arizona_fll *fll, if (target % (ratio * Fref)) { cfg->refdiv = refdiv; cfg->fratio = ratio - 1; + arizona_fll_dbg(fll, + "pseudo: found fref=%u refdiv=%d(%d) ratio=%d\n", + Fref, refdiv, div, ratio); return ratio; } } @@ -2038,6 +2076,9 @@ static int arizona_calc_fratio(struct arizona_fll *fll, Fref /= 2; refdiv++; init_ratio = arizona_find_fratio(Fref, NULL); + arizona_fll_dbg(fll, + "pseudo: change fref=%u refdiv=%d(%d) ratio=%u\n", + Fref, refdiv, div, init_ratio); } arizona_fll_warn(fll, "Falling back to integer mode operation\n"); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: sigmadsp: Fix missleading return value
by pascal.huerst＠gmail.com 10 Feb '16

10 Feb '16

From: Pascal Huerst <pascal.huerst(a)gmail.com> Forwarding the return value of i2c_master_send, leads to errors later on, since i2c_master_send returns the number of bytes transmittet. Check for ret < 0 instead and return 0 otherwise. Signed-off-by: Pascal Huerst <pascal.huerst(a)gmail.com> --- sound/soc/codecs/sigmadsp-i2c.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/sigmadsp-i2c.c b/sound/soc/codecs/sigmadsp-i2c.c index 21ca3a5..d374c18 100644 --- a/sound/soc/codecs/sigmadsp-i2c.c +++ b/sound/soc/codecs/sigmadsp-i2c.c @@ -31,7 +31,10 @@ static int sigmadsp_write_i2c(void *control_data, kfree(buf); - return ret; + if (ret < 0) + return ret; + + return 0; } static int sigmadsp_read_i2c(void *control_data, -- 2.4.3

3 2

[alsa-devel] [PATCH] ASoC: sigmadsp: Fix missleading return value
by pascal.huerst＠gmail.com 10 Feb '16

10 Feb '16

From: Pascal Huerst <pascal.huerst(a)gmail.com> Forwarding the return value of i2c_master_send, leads to errors later on, since i2c_master_send returns the number of bytes transmittet. Check for ret < 0 instead and return 0 otherwise. Signed-off-by: Pascal Huerst <pascal.huerst(a)gmail.com> --- sound/soc/codecs/sigmadsp-i2c.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/sigmadsp-i2c.c b/sound/soc/codecs/sigmadsp-i2c.c index 21ca3a5..d374c18 100644 --- a/sound/soc/codecs/sigmadsp-i2c.c +++ b/sound/soc/codecs/sigmadsp-i2c.c @@ -31,7 +31,10 @@ static int sigmadsp_write_i2c(void *control_data, kfree(buf); - return ret; + if (ret < 0) + return ret; + + return 0; } static int sigmadsp_read_i2c(void *control_data, -- 2.4.3

2 1

[alsa-devel] topic/hda-mst branch merged to for-next
by Takashi Iwai 10 Feb '16

10 Feb '16

JFYI, I merged topic/hda-mst branch to for-next branch for wider testing. It means that this will be included in 4.6. I'll keep topic/hda-mst branch for a while, but for future patches, it might be better to based on for-next branch. Takashi

2 1

[alsa-devel] [PATCH] ASoC: cs4271: add regulator consumer support
by pascal.huerst＠gmail.com 10 Feb '16

10 Feb '16

From: Pascal Huerst <pascal.huerst(a)gmail.com> The cs4271 has three power domains: vd, vl and va. Enable them all, as long as the codec is in use. While at it, factored out the reset code into its own function. Signed-off-by: Pascal Huerst <pascal.huerst(a)gmail.com> --- Documentation/devicetree/bindings/sound/cs4271.txt | 7 +++ sound/soc/codecs/cs4271.c | 69 +++++++++++++++++++--- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/cs4271.txt b/Documentation/devicetree/bindings/sound/cs4271.txt index e2cd1d7..6e699ce 100644 --- a/Documentation/devicetree/bindings/sound/cs4271.txt +++ b/Documentation/devicetree/bindings/sound/cs4271.txt @@ -33,12 +33,19 @@ Optional properties: Note that this is not needed in case the clocks are stable throughout the entire runtime of the codec. + - vd-supply: Digital power + - vl-supply: Logic power + - va-supply: Analog Power + Examples: codec_i2c: cs4271@10 { compatible = "cirrus,cs4271"; reg = <0x10>; reset-gpio = <&gpio 23 0>; + vd-supply = <&vdd_3v3_reg>; + vl-supply = <&vdd_3v3_reg>; + va-supply = <&vdd_3v3_reg>; }; codec_spi: cs4271@0 { diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index e770ee6..0c0010b 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -26,6 +26,7 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_gpio.h> +#include <linux/regulator/consumer.h> #include <sound/pcm.h> #include <sound/soc.h> #include <sound/tlv.h> @@ -157,6 +158,10 @@ static bool cs4271_volatile_reg(struct device *dev, unsigned int reg) return reg == CS4271_CHIPID; } +static const char * const supply_names[] = { + "vd", "vl", "va" +}; + struct cs4271_private { unsigned int mclk; bool master; @@ -170,6 +175,7 @@ struct cs4271_private { int gpio_disable; /* enable soft reset workaround */ bool enable_soft_reset; + struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)]; }; static const struct snd_soc_dapm_widget cs4271_dapm_widgets[] = { @@ -487,6 +493,20 @@ static struct snd_soc_dai_driver cs4271_dai = { .symmetric_rates = 1, }; +static int cs4271_reset(struct snd_soc_codec *codec) +{ + struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); + + if (gpio_is_valid(cs4271->gpio_nreset)) { + gpio_set_value(cs4271->gpio_nreset, 0); + mdelay(1); + gpio_set_value(cs4271->gpio_nreset, 1); + mdelay(1); + } + + return 0; +} + #ifdef CONFIG_PM static int cs4271_soc_suspend(struct snd_soc_codec *codec) { @@ -499,6 +519,9 @@ static int cs4271_soc_suspend(struct snd_soc_codec *codec) if (ret < 0) return ret; + regcache_mark_dirty(cs4271->regmap); + regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); + return 0; } @@ -507,6 +530,16 @@ static int cs4271_soc_resume(struct snd_soc_codec *codec) int ret; struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); + ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies), + cs4271->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + + /* Do a proper reset after power up */ + cs4271_reset(codec); + /* Restore codec state */ ret = regcache_sync(cs4271->regmap); if (ret < 0) @@ -553,19 +586,24 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec) } #endif + ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies), + cs4271->supplies); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); + return ret; + } + if (cs4271plat) { amutec_eq_bmutec = cs4271plat->amutec_eq_bmutec; cs4271->enable_soft_reset = cs4271plat->enable_soft_reset; } - if (gpio_is_valid(cs4271->gpio_nreset)) { - /* Reset codec */ - gpio_direction_output(cs4271->gpio_nreset, 0); - mdelay(1); - gpio_set_value(cs4271->gpio_nreset, 1); - /* Give the codec time to wake up */ - mdelay(1); - } + /* Reset codec */ + cs4271_reset(codec); + + ret = regcache_sync(cs4271->regmap); + if (ret < 0) + return ret; ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, CS4271_MODE2_PDN | CS4271_MODE2_CPEN, @@ -595,6 +633,9 @@ static int cs4271_codec_remove(struct snd_soc_codec *codec) /* Set codec to the reset state */ gpio_set_value(cs4271->gpio_nreset, 0); + regcache_mark_dirty(cs4271->regmap); + regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); + return 0; }; @@ -617,6 +658,7 @@ static int cs4271_common_probe(struct device *dev, { struct cs4271_platform_data *cs4271plat = dev->platform_data; struct cs4271_private *cs4271; + int i, ret; cs4271 = devm_kzalloc(dev, sizeof(*cs4271), GFP_KERNEL); if (!cs4271) @@ -638,6 +680,17 @@ static int cs4271_common_probe(struct device *dev, return ret; } + for (i = 0; i < ARRAY_SIZE(supply_names); i++) + cs4271->supplies[i].supply = supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(cs4271->supplies), + cs4271->supplies); + + if (ret < 0) { + dev_err(dev, "Failed to get regulators: %d\n", ret); + return ret; + } + *c = cs4271; return 0; } -- 2.4.3

1 0

[alsa-devel] [PATCH] MAINTAINERS: add msm mailing list to sound/soc/qcom
by Srinivas Kandagatla 10 Feb '16

10 Feb '16

This patch adds msm mailing list to sound/soc/qcom so that get_maintainers would return correct list to CC to. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7f1fa4f..213be2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5820,6 +5820,7 @@ F: include/uapi/linux/ipmi* QCOM AUDIO (ASoC) DRIVERS M: Patrick Lai <plai(a)codeaurora.org> M: Banajit Goswami <bgoswami(a)codeaurora.org> +L: linux-arm-msm(a)vger.kernel.org L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/qcom/ -- 1.9.1

1 0

[alsa-devel] Should snd_card_free() check for null pointer?
by Jerome Marchand 10 Feb '16

10 Feb '16

Hi, Before commit f24640648186b (ALSA: Use standard device refcount for card accounting), snd_card_free() would return -EINVAL on a null pointer. Now it ends up in a null pointer dereference. There is at least one driver that can call snd_card_free() with null argument: saa7134_alsa. It can easily be triggered by just inserting and removing the module (no need to have the hardware). I don't think that is a rule, but it seems that the standard behavior of *_free() functions is to check for null pointer. What do you think? Thanks, Jerome

2 3

[alsa-devel] [PATCH] ASoC: rt5645: add "coreboot" to dmi_system_id list
by Bard Liao 09 Feb '16

09 Feb '16

There are some Google projects with manufacturer name different from "GOOGLE". So we need to add DMI list for those projects. However some OEMs / vendors want to keep secret before product launch. So, we can't use DMI_SYS_VENDOR for them. Fortunately, the BIOS vendor field is the same for all chrome os projects. It allows us to match chrome projects by DMI_BIOS_VENDOR = "coreboot". Signed-off-by: John Lin <john.lin(a)realtek.com> Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 93e8c90..8521b22 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3552,6 +3552,12 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), }, }, + { + .ident = "Google Chrome", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "coreboot"), + }, + }, { } }; -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [PATCH v2 00/22] Sharing media resources across ALSA and au0828 drivers
by Shuah Khan 09 Feb '16

09 Feb '16

This patch series updates ALSA driver, and au0828 core driver to use Managed Media controller API and Media Controller API to share media resource (tuner). This Patch v2 series is based on linux_media master. This work addresses Mauro and Takashi's comments. Composite or S-Video connector is the input case is still under discussion and isn't addressed in this series. Patches 3 and 4 need documentation updates and will be sent later this week. Shuah Khan (22): uapi/media.h: Declare interface types for ALSA media: Add ALSA Media Controller function entities media: Media Controller register/unregister entity_notify API media: Media Controller enable/disable source handler API media: Media Controller export non locking __media_entity_setup_link() media: Media Controller non-locking __media_entity_pipeline_start/stop() media: v4l-core add enable/disable source common interfaces media: Move au8522_media_pads enum to au8522.h from au8522_priv.h media: au8522 change to create MC pad for ALSA Audio Out media: Change v4l-core to check if source is free media: dvb-frontend invoke enable/disable_source handlers media: au0828 video remove au0828_enable_analog_tuner() media: au0828 video change to use v4l_enable_media_source() media: au0828 change to use Managed Media Controller API media: au0828 handle media_init and media_register window media: au0828 create tuner to decoder link in disabled state media: au0828 disable tuner to demod link media: au0828 Use au8522_media_pads enum for pad defines media: au0828-core register entity_notify hook media: au0828 add enable, disable source handlers sound/usb: Use Media Controller API to share media resources media: Ensure media device unregister is done only once drivers/media/dvb-core/dvb_frontend.c | 139 ++---------- drivers/media/dvb-core/dvb_frontend.h | 3 + drivers/media/dvb-frontends/au8522.h | 8 + drivers/media/dvb-frontends/au8522_decoder.c | 1 + drivers/media/dvb-frontends/au8522_priv.h | 8 - drivers/media/media-device.c | 73 +++++- drivers/media/media-devnode.c | 15 +- drivers/media/media-entity.c | 51 ++++- drivers/media/usb/au0828/au0828-core.c | 272 +++++++++++++++++++++-- drivers/media/usb/au0828/au0828-video.c | 75 +------ drivers/media/usb/au0828/au0828.h | 4 + drivers/media/v4l2-core/Makefile | 2 +- drivers/media/v4l2-core/v4l2-fh.c | 2 + drivers/media/v4l2-core/v4l2-ioctl.c | 30 +++ drivers/media/v4l2-core/v4l2-mc.c | 60 +++++ drivers/media/v4l2-core/videobuf2-core.c | 4 + include/media/media-device.h | 44 ++++ include/media/media-devnode.h | 17 ++ include/media/media-entity.h | 12 + include/media/v4l2-dev.h | 1 + include/media/v4l2-mc.h | 52 +++++ include/uapi/linux/media.h | 33 +++ sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 ++ sound/usb/card.h | 1 + sound/usb/media.c | 319 +++++++++++++++++++++++++++ sound/usb/media.h | 72 ++++++ sound/usb/mixer.h | 1 + sound/usb/pcm.c | 28 ++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 3 + 33 files changed, 1117 insertions(+), 236 deletions(-) create mode 100644 drivers/media/v4l2-core/v4l2-mc.c create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h -- 2.5.0

3 44