Commit 044d5dfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A few last-minute fixes for rc1:

   - ALSA core timer and sequencer fixes for bugs spotted by syzkaller

   - a couple of trivial HD-audio fixups

   - additional PCI / codec IDs for Intel Geminilake

   - fixes for CT-XFi DMA mask bugs"

* tag 'sound-fix-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: seq: Fix link corruption by event error handling
  ALSA: hda - Add subwoofer support for Dell Inspiron 17 7000 Gaming
  ALSA: ctxfi: Fallback DMA mask to 32bit
  ALSA: timer: Reject user params with too small ticks
  ALSA: hda: Add Geminilake HDMI codec ID
  ALSA: hda - Fix micmute hotkey problem for a lenovo AIO machine
  ALSA: hda - Add Geminilake PCI ID
parents 544a068f f3ac9f73

sound/core/seq/seq_fifo.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,7 @@ int snd_seq_fifo_event_in(struct snd_seq_fifo *f, 
	f->tail = cell;

	f->tail = cell;

	if (f->head == NULL)

	if (f->head == NULL)

		f->head = cell;

		f->head = cell;

	cell->next = NULL;

	f->cells++;

	f->cells++;

	spin_unlock_irqrestore(&f->lock, flags);

	spin_unlock_irqrestore(&f->lock, flags);
@@ -214,6 +215,8 @@ void snd_seq_fifo_cell_putback(struct snd_seq_fifo *f, 
		spin_lock_irqsave(&f->lock, flags);

		spin_lock_irqsave(&f->lock, flags);

		cell->next = f->head;

		cell->next = f->head;

		f->head = cell;

		f->head = cell;

		if (!f->tail)

			f->tail = cell;

		f->cells++;

		f->cells++;

		spin_unlock_irqrestore(&f->lock, flags);

		spin_unlock_irqrestore(&f->lock, flags);

	}

	}

sound/core/timer.c

+15 −3
Original line number Original line Diff line number Diff line
@@ -1702,10 +1702,22 @@ static int snd_timer_user_params(struct file *file, 
		return -EBADFD;

		return -EBADFD;

	if (copy_from_user(&params, _params, sizeof(params)))

	if (copy_from_user(&params, _params, sizeof(params)))

		return -EFAULT;

		return -EFAULT;

	if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE) && params.ticks < 1) {

	if (!(t->hw.flags & SNDRV_TIMER_HW_SLAVE)) {

		u64 resolution;



		if (params.ticks < 1) {

			err = -EINVAL;

			goto _end;

		}



		/* Don't allow resolution less than 1ms */

		resolution = snd_timer_resolution(tu->timeri);

		resolution *= params.ticks;

		if (resolution < 1000000) {

			err = -EINVAL;

			err = -EINVAL;

			goto _end;

			goto _end;

		}

		}

	}

	if (params.queue_size > 0 &&

	if (params.queue_size > 0 &&

	    (params.queue_size < 32 || params.queue_size > 1024)) {

	    (params.queue_size < 32 || params.queue_size > 1024)) {

		err = -EINVAL;

		err = -EINVAL;

sound/pci/ctxfi/cthw20k1.c

+6 −13
Original line number Original line Diff line number Diff line
@@ -27,12 +27,6 @@ 
#include "cthw20k1.h"

#include "cthw20k1.h"

#include "ct20k1reg.h"

#include "ct20k1reg.h"





#if BITS_PER_LONG == 32

#define CT_XFI_DMA_MASK		DMA_BIT_MASK(32) /* 32 bit PTE */

#else

#define CT_XFI_DMA_MASK		DMA_BIT_MASK(64) /* 64 bit PTE */

#endif



struct hw20k1 {

struct hw20k1 {

	struct hw hw;

	struct hw hw;

	spinlock_t reg_20k1_lock;

	spinlock_t reg_20k1_lock;
@@ -1904,19 +1898,18 @@ static int hw_card_start(struct hw *hw) 
{

{

	int err;

	int err;

	struct pci_dev *pci = hw->pci;

	struct pci_dev *pci = hw->pci;

	const unsigned int dma_bits = BITS_PER_LONG;





	err = pci_enable_device(pci);

	err = pci_enable_device(pci);

	if (err < 0)

	if (err < 0)

		return err;

		return err;





	/* Set DMA transfer mask */

	/* Set DMA transfer mask */

	if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||

	if (dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {

	    dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {

		dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));

		dev_err(hw->card->dev,

	} else {

			"architecture does not support PCI busmaster DMA with mask 0x%llx\n",

		dma_set_mask(&pci->dev, DMA_BIT_MASK(32));

			CT_XFI_DMA_MASK);

		dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));

		err = -ENXIO;

		goto error1;

	}

	}





	if (!hw->io_base) {

	if (!hw->io_base) {

sound/pci/ctxfi/cthw20k2.c

+6 −13
Original line number Original line Diff line number Diff line
@@ -26,12 +26,6 @@ 
#include "cthw20k2.h"

#include "cthw20k2.h"

#include "ct20k2reg.h"

#include "ct20k2reg.h"





#if BITS_PER_LONG == 32

#define CT_XFI_DMA_MASK		DMA_BIT_MASK(32) /* 32 bit PTE */

#else

#define CT_XFI_DMA_MASK		DMA_BIT_MASK(64) /* 64 bit PTE */

#endif



struct hw20k2 {

struct hw20k2 {

	struct hw hw;

	struct hw hw;

	/* for i2c */

	/* for i2c */
@@ -2029,19 +2023,18 @@ static int hw_card_start(struct hw *hw) 
	int err = 0;

	int err = 0;

	struct pci_dev *pci = hw->pci;

	struct pci_dev *pci = hw->pci;

	unsigned int gctl;

	unsigned int gctl;

	const unsigned int dma_bits = BITS_PER_LONG;





	err = pci_enable_device(pci);

	err = pci_enable_device(pci);

	if (err < 0)

	if (err < 0)

		return err;

		return err;





	/* Set DMA transfer mask */

	/* Set DMA transfer mask */

	if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||

	if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {

	    dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {

		dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));

		dev_err(hw->card->dev,

	} else {

			"architecture does not support PCI busmaster DMA with mask 0x%llx\n",

		dma_set_mask(&pci->dev, DMA_BIT_MASK(32));

			CT_XFI_DMA_MASK);

		dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));

		err = -ENXIO;

		goto error1;

	}

	}





	if (!hw->io_base) {

	if (!hw->io_base) {

sound/pci/hda/hda_intel.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -2255,6 +2255,9 @@ static const struct pci_device_id azx_ids[] = { 
	/* Broxton-T */

	/* Broxton-T */

	{ PCI_DEVICE(0x8086, 0x1a98),

	{ PCI_DEVICE(0x8086, 0x1a98),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

	/* Gemini-Lake */

	{ PCI_DEVICE(0x8086, 0x3198),

	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },

	/* Haswell */

	/* Haswell */

	{ PCI_DEVICE(0x8086, 0x0a0c),

	{ PCI_DEVICE(0x8086, 0x0a0c),

	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },

	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },

CRA Git | Maintained and supported by SUSTech CRA and CCSE