Merge tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Small last-minute fixes for 4.13-rc1: a couple of PCM fixes for m68k,
  a cleanup work for legacy ISA msnd driver, and a few HD-audio new IDs
  and quirks"

* tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add hdmi id for a Geminilake variant
  ALSA: hda/realtek - New codec device ID for ALC1220
  ALSA: pcm: Simplify check for dma_mmap_coherent() availability
  ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
  ALSA: msnd: Optimize / harden DSP and MIDI loops
  ALSA: hda/realtek - change the location for one of two front microphones
  ALSA: opl4: Move inline before return type

2 files changed, 27 insertions, 26 deletions

diff --git a/sound/isa/msnd/msnd_midi.c b/sound/isa/msnd/msnd_midi.c
index 912b5a9ccbab..013d8d1170fe 100644
--- a/sound/isa/msnd/msnd_midi.c
+++ b/sound/isa/msnd/msnd_midi.c
@@ -120,24 +120,24 @@ void snd_msndmidi_input_read(void *mpuv)
         unsigned long flags;
         struct snd_msndmidi *mpu = mpuv;
         void *pwMIDQData = mpu->dev->mappedbase + MIDQ_DATA_BUFF;
+        u16 head, tail, size;
 
         spin_lock_irqsave(&mpu->input_lock, flags);
-        while (readw(mpu->dev->MIDQ + JQS_wTail) !=
-               readw(mpu->dev->MIDQ + JQS_wHead)) {
-                u16 wTmp, val;
-                val = readw(pwMIDQData + 2 * readw(mpu->dev->MIDQ + JQS_wHead));
-
-                        if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER,
-                                     &mpu->mode))
-                                snd_rawmidi_receive(mpu->substream_input,
-                                                    (unsigned char *)&val, 1);
-
-                wTmp = readw(mpu->dev->MIDQ + JQS_wHead) + 1;
-                if (wTmp > readw(mpu->dev->MIDQ + JQS_wSize))
-                        writew(0,  mpu->dev->MIDQ + JQS_wHead);
-                else
-                        writew(wTmp,  mpu->dev->MIDQ + JQS_wHead);
+        head = readw(mpu->dev->MIDQ + JQS_wHead);
+        tail = readw(mpu->dev->MIDQ + JQS_wTail);
+        size = readw(mpu->dev->MIDQ + JQS_wSize);
+        if (head > size || tail > size)
+                goto out;
+        while (head != tail) {
+                unsigned char val = readw(pwMIDQData + 2 * head);
+
+                if (test_bit(MSNDMIDI_MODE_BIT_INPUT_TRIGGER, &mpu->mode))
+                        snd_rawmidi_receive(mpu->substream_input, &val, 1);
+                if (++head > size)
+                        head = 0;
+                writew(head, mpu->dev->MIDQ + JQS_wHead);
         }
+ out:
         spin_unlock_irqrestore(&mpu->input_lock, flags);
 }
 EXPORT_SYMBOL(snd_msndmidi_input_read);
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index ad4897337df5..fc4fb1904aef 100644
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -170,23 +170,24 @@ static irqreturn_t snd_msnd_interrupt(int irq, void *dev_id)
 {
         struct snd_msnd *chip = dev_id;
         void *pwDSPQData = chip->mappedbase + DSPQ_DATA_BUFF;
+        u16 head, tail, size;
 
         /* Send ack to DSP */
         /* inb(chip->io + HP_RXL); */
 
         /* Evaluate queued DSP messages */
-        while (readw(chip->DSPQ + JQS_wTail) != readw(chip->DSPQ + JQS_wHead)) {
-                u16 wTmp;
-
-                snd_msnd_eval_dsp_msg(chip,
-                        readw(pwDSPQData + 2 * readw(chip->DSPQ + JQS_wHead)));
-
-                wTmp = readw(chip->DSPQ + JQS_wHead) + 1;
-                if (wTmp > readw(chip->DSPQ + JQS_wSize))
-                        writew(0, chip->DSPQ + JQS_wHead);
-                else
-                        writew(wTmp, chip->DSPQ + JQS_wHead);
+        head = readw(chip->DSPQ + JQS_wHead);
+        tail = readw(chip->DSPQ + JQS_wTail);
+        size = readw(chip->DSPQ + JQS_wSize);
+        if (head > size || tail > size)
+                goto out;
+        while (head != tail) {
+                snd_msnd_eval_dsp_msg(chip, readw(pwDSPQData + 2 * head));
+                if (++head > size)
+                        head = 0;
+                writew(head, chip->DSPQ + JQS_wHead);
         }
+ out:
         /* Send ack to DSP */
         inb(chip->io + HP_RXL);
         return IRQ_HANDLED;