Merge branch 'for-linus' into for-next

4 files changed, 17 insertions, 8 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 461c21f21caf..e8131c060c86 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -2329,7 +2329,7 @@ static int pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol,
         struct snd_pcm_substream *substream;
         const struct snd_pcm_chmap_elem *map;
 
-        if (snd_BUG_ON(!info->chmap))
+        if (!info->chmap)
                 return -EINVAL;
         substream = snd_pcm_chmap_substream(info, idx);
         if (!substream)
@@ -2361,7 +2361,7 @@ static int pcm_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         unsigned int __user *dst;
         int c, count = 0;
 
-        if (snd_BUG_ON(!info->chmap))
+        if (!info->chmap)
                 return -EINVAL;
         if (size < 8)
                 return -ENOMEM;
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 9678bc75dc5b..3fc581a5ad62 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -701,7 +701,9 @@ static void out_stream_callback(struct fw_iso_context *context, u32 tstamp,
                 cycle = increment_cycle_count(cycle, 1);
                 if (s->handle_packet(s, 0, cycle, i) < 0) {
                         s->packet_index = -1;
-                        amdtp_stream_pcm_abort(s);
+                        if (in_interrupt())
+                                amdtp_stream_pcm_abort(s);
+                        WRITE_ONCE(s->pcm_buffer_pointer, SNDRV_PCM_POS_XRUN);
                         return;
                 }
         }
@@ -753,7 +755,9 @@ static void in_stream_callback(struct fw_iso_context *context, u32 tstamp,
         /* Queueing error or detecting invalid payload. */
         if (i < packets) {
                 s->packet_index = -1;
-                amdtp_stream_pcm_abort(s);
+                if (in_interrupt())
+                        amdtp_stream_pcm_abort(s);
+                WRITE_ONCE(s->pcm_buffer_pointer, SNDRV_PCM_POS_XRUN);
                 return;
         }
 
diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h
index 6d613f2eb612..ed6eafd10992 100644
--- a/sound/firewire/amdtp-stream.h
+++ b/sound/firewire/amdtp-stream.h
@@ -135,7 +135,7 @@ struct amdtp_stream {
         /* For a PCM substream processing. */
         struct snd_pcm_substream *pcm;
         struct tasklet_struct period_tasklet;
-        unsigned int pcm_buffer_pointer;
+        snd_pcm_uframes_t pcm_buffer_pointer;
         unsigned int pcm_period_pointer;
 
         /* To wait for first packet. */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 1770f085c2a6..01eb1dc7b5b3 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -370,10 +370,12 @@ enum {
 #define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
 #define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0)
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
+#define IS_BXT_T(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x1a98)
 #define IS_GLK(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x3198)
-#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \
-                        IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci)  || \
-                        IS_GLK(pci)
+#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
+#define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci) || \
+                          IS_BXT_T(pci) || IS_KBL(pci) || IS_KBL_LP(pci) || \
+                          IS_KBL_H(pci) || IS_GLK(pci) || IS_CFL(pci))
 
 static char *driver_short_names[] = {
         [AZX_DRIVER_ICH] = "HDA Intel",
@@ -2378,6 +2380,9 @@ static const struct pci_device_id azx_ids[] = {
         /* Kabylake-H */
         { PCI_DEVICE(0x8086, 0xa2f0),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        /* Coffelake */
+        { PCI_DEVICE(0x8086, 0xa348),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE},
         /* Broxton-P(Apollolake) */
         { PCI_DEVICE(0x8086, 0x5a98),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },