Merge tag 'sound-4.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Takashi writes:
  "sound fixes for 4.19-rc5

   here comes a collection of various fixes, mostly for stable-tree
   or regression fixes.

   Two relatively high LOCs are about the (rather simple) conversion of
   uapi integer types in topology API, and a regression fix about HDMI
   hotplug notification on AMD HD-audio.  The rest are all small
   individual fixes like ASoC Intel Skylake race condition, minor
   uninitialized page leak in emu10k1 ioctl, Firewire audio error paths,
   and so on."

* tag 'sound-4.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (33 commits)
  ALSA: fireworks: fix memory leak of response buffer at error path
  ALSA: oxfw: fix memory leak of discovered stream formats at error path
  ALSA: oxfw: fix memory leak for model-dependent data at error path
  ALSA: bebob: fix memory leak for M-Audio FW1814 and ProjectMix I/O at error path
  ALSA: hda - Enable runtime PM only for discrete GPU
  ALSA: oxfw: fix memory leak of private data
  ALSA: firewire-tascam: fix memory leak of private data
  ALSA: firewire-digi00x: fix memory leak of private data
  sound: don't call skl_init_chip() to reset intel skl soc
  sound: enable interrupt after dma buffer initialization
  Revert "ASoC: Intel: Skylake: Acquire irq after RIRB allocation"
  ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
  ASoC: cs4265: fix MMTLR Data switch control
  ASoC: AMD: Ensure reset bit is cleared before configuring
  ALSA: fireface: fix memory leak in ff400_switch_fetching_mode()
  ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
  ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER
  ASoC: rsnd: adg: care clock-frequency size
  ASoC: uniphier: change status to orphan
  ASoC: rsnd: fixup not to call clk_get/set under non-atomic
  ...

4 files changed, 59 insertions, 52 deletions

diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index a34539b7f750..7e6ac0114d55 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -133,15 +133,18 @@ struct vga_switcheroo_handler {
  * @can_switch: check if the device is in a position to switch now.
  *      Mandatory. The client should return false if a user space process
  *      has one of its device files open
+ * @gpu_bound: notify the client id to audio client when the GPU is bound.
  *
  * Client callbacks. A client can be either a GPU or an audio device on a GPU.
  * The @set_gpu_state and @can_switch methods are mandatory, @reprobe may be
  * set to NULL. For audio clients, the @reprobe member is bogus.
+ * OTOH, @gpu_bound is only for audio clients, and not used for GPU clients.
  */
 struct vga_switcheroo_client_ops {
         void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state);
         void (*reprobe)(struct pci_dev *dev);
         bool (*can_switch)(struct pci_dev *dev);
+        void (*gpu_bound)(struct pci_dev *dev, enum vga_switcheroo_client_id);
 };
 
 #if defined(CONFIG_VGA_SWITCHEROO)
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 6f1e1f3b3063..cd1773d0e08f 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -412,6 +412,7 @@ void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus);
 void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus);
 void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus);
 void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);
+int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset);
 
 void snd_hdac_bus_update_rirb(struct hdac_bus *bus);
 int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index af9ef16cc34d..fdaaafdc7a00 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -407,6 +407,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
 void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
 int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
+                         struct snd_soc_pcm_runtime *rtd,
                          const struct snd_soc_pcm_stream *params,
                          unsigned int num_params,
                          struct snd_soc_dapm_widget *source,
diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index f58cafa42f18..f39352cef382 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -10,6 +10,8 @@
 #ifndef __HDA_TPLG_INTERFACE_H__
 #define __HDA_TPLG_INTERFACE_H__
 
+#include <linux/types.h>
+
 /*
  * Default types range from 0~12. type can range from 0 to 0xff
  * SST types start at higher to avoid any overlapping in future
@@ -143,10 +145,10 @@ enum skl_module_param_type {
 };
 
 struct skl_dfw_algo_data {
-        u32 set_params:2;
-        u32 rsvd:30;
-        u32 param_id;
-        u32 max;
+        __u32 set_params:2;
+        __u32 rsvd:30;
+        __u32 param_id;
+        __u32 max;
         char params[0];
 } __packed;
 
@@ -163,68 +165,68 @@ enum skl_tuple_type {
 /* v4 configuration data */
 
 struct skl_dfw_v4_module_pin {
-        u16 module_id;
-        u16 instance_id;
+        __u16 module_id;
+        __u16 instance_id;
 } __packed;
 
 struct skl_dfw_v4_module_fmt {
-        u32 channels;
-        u32 freq;
-        u32 bit_depth;
-        u32 valid_bit_depth;
-        u32 ch_cfg;
-        u32 interleaving_style;
-        u32 sample_type;
-        u32 ch_map;
+        __u32 channels;
+        __u32 freq;
+        __u32 bit_depth;
+        __u32 valid_bit_depth;
+        __u32 ch_cfg;
+        __u32 interleaving_style;
+        __u32 sample_type;
+        __u32 ch_map;
 } __packed;
 
 struct skl_dfw_v4_module_caps {
-        u32 set_params:2;
-        u32 rsvd:30;
-        u32 param_id;
-        u32 caps_size;
-        u32 caps[HDA_SST_CFG_MAX];
+        __u32 set_params:2;
+        __u32 rsvd:30;
+        __u32 param_id;
+        __u32 caps_size;
+        __u32 caps[HDA_SST_CFG_MAX];
 } __packed;
 
 struct skl_dfw_v4_pipe {
-        u8 pipe_id;
-        u8 pipe_priority;
-        u16 conn_type:4;
-        u16 rsvd:4;
-        u16 memory_pages:8;
+        __u8 pipe_id;
+        __u8 pipe_priority;
+        __u16 conn_type:4;
+        __u16 rsvd:4;
+        __u16 memory_pages:8;
 } __packed;
 
 struct skl_dfw_v4_module {
         char uuid[SKL_UUID_STR_SZ];
 
-        u16 module_id;
-        u16 instance_id;
-        u32 max_mcps;
-        u32 mem_pages;
-        u32 obs;
-        u32 ibs;
-        u32 vbus_id;
-
-        u32 max_in_queue:8;
-        u32 max_out_queue:8;
-        u32 time_slot:8;
-        u32 core_id:4;
-        u32 rsvd1:4;
-
-        u32 module_type:8;
-        u32 conn_type:4;
-        u32 dev_type:4;
-        u32 hw_conn_type:4;
-        u32 rsvd2:12;
-
-        u32 params_fixup:8;
-        u32 converter:8;
-        u32 input_pin_type:1;
-        u32 output_pin_type:1;
-        u32 is_dynamic_in_pin:1;
-        u32 is_dynamic_out_pin:1;
-        u32 is_loadable:1;
-        u32 rsvd3:11;
+        __u16 module_id;
+        __u16 instance_id;
+        __u32 max_mcps;
+        __u32 mem_pages;
+        __u32 obs;
+        __u32 ibs;
+        __u32 vbus_id;
+
+        __u32 max_in_queue:8;
+        __u32 max_out_queue:8;
+        __u32 time_slot:8;
+        __u32 core_id:4;
+        __u32 rsvd1:4;
+
+        __u32 module_type:8;
+        __u32 conn_type:4;
+        __u32 dev_type:4;
+        __u32 hw_conn_type:4;
+        __u32 rsvd2:12;
+
+        __u32 params_fixup:8;
+        __u32 converter:8;
+        __u32 input_pin_type:1;
+        __u32 output_pin_type:1;
+        __u32 is_dynamic_in_pin:1;
+        __u32 is_dynamic_out_pin:1;
+        __u32 is_loadable:1;
+        __u32 rsvd3:11;
 
         struct skl_dfw_v4_pipe pipe;
         struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE];