Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d2f928d authored by Tobias Klauser's avatar Tobias Klauser Committed by Jaroslav Kysela
Browse files

[PATCH] Intruduce DMA_28BIT_MASK 



This patch introduces the DMA_28BIT_MASK constant in dma-mapping.h
ALSA drivers using this mask are changed to use the new constant.

Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 84f3430c

include/linux/dma-mapping.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ enum dma_data_direction { 
#define DMA_31BIT_MASK	0x000000007fffffffULL

#define DMA_30BIT_MASK	0x000000003fffffffULL

#define DMA_29BIT_MASK	0x000000001fffffffULL

#define DMA_28BIT_MASK	0x000000000fffffffULL



#include <asm/dma-mapping.h>

sound/pci/ad1889.c

+4 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/interrupt.h>

#include <linux/compiler.h>
@@ -911,8 +912,8 @@ snd_ad1889_create(struct snd_card *card, 
		return err;



	/* check PCI availability (32bit DMA) */

	if (pci_set_dma_mask(pci, 0xffffffff) < 0 ||

	    pci_set_consistent_dma_mask(pci, 0xffffffff) < 0) {

	if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {

		printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");

		pci_disable_device(pci);

		return -ENXIO;

sound/pci/emu10k1/emu10k1x.c

+7 −6
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/moduleparam.h>

#include <sound/core.h>
@@ -898,8 +899,8 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card, 


	if ((err = pci_enable_device(pci)) < 0)

		return err;

	if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||

	    pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {

	if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {

		snd_printk(KERN_ERR "error to set 28bit mask DMA\n");

		pci_disable_device(pci);

		return -ENXIO;

sound/pci/es1968.c

+3 −2
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/gameport.h>

#include <linux/moduleparam.h>
@@ -2561,8 +2562,8 @@ static int __devinit snd_es1968_create(struct snd_card *card, 
	if ((err = pci_enable_device(pci)) < 0)

		return err;

	/* check, if we can restrict PCI DMA transfers to 28 bits */

	if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||

	    pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {

	if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {

		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");

		pci_disable_device(pci);

		return -ENXIO;

sound/pci/ice1712/ice1712.c

+3 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/moduleparam.h>

#include <linux/mutex.h>
@@ -2553,8 +2554,8 @@ static int __devinit snd_ice1712_create(struct snd_card *card, 
	if ((err = pci_enable_device(pci)) < 0)

		return err;

	/* check, if we can restrict PCI DMA transfers to 28 bits */

	if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||

	    pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {

	if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {

		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");

		pci_disable_device(pci);

		return -ENXIO;