* [Patch v2] Replacing 0xff.. with correct DMA_xBIT_MASK
@ 2006-01-12 20:27 M.Gehre
2006-01-12 20:31 ` Linus Torvalds
0 siblings, 1 reply; 2+ messages in thread
From: M.Gehre @ 2006-01-12 20:27 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel
From: Matthias Gehre
Included is a patch to replace all occurences of 0xff..
in calls to function pci_set_dma_mask() and pci_set_consistant_dma_mask()
with the corresponding DMA_xBIT_MASK from linux/dma-mapping.h.
This patch was made against 2.6.15-git8.
Signed-off-by: Matthias Gehre <M.Gehre@gmx.de>
---
Task was found on janitor.kernelnewbies.org
This is a new version of an early submitted patch.
It's now against 2.6.15-git8 and includes some instances
that had been forgotten the last time.
Please CC answer to me.
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/Documentation/DMA-mapping.txt linux-2.6.15-git8_patch/Documentation/DMA-mapping.txt
--- linux-2.6.15-git8/Documentation/DMA-mapping.txt 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/Documentation/DMA-mapping.txt 2006-01-12 20:50:27.000000000 +0100
@@ -199,6 +199,8 @@ address during PCI bus mastering you mig
"mydev: 24-bit DMA addressing not available.\n");
goto ignore_this_device;
}
+[Better use DMA_24BIT_MASK instead of 0x00ffffff.
+See linux/include/dma-mapping.h for reference.]
When pci_set_dma_mask() is successful, and returns zero, the PCI layer
saves away this mask you have provided. The PCI layer will use this
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/atm/lanai.c linux-2.6.15-git8_patch/drivers/atm/lanai.c
--- linux-2.6.15-git8/drivers/atm/lanai.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/atm/lanai.c 2006-01-12 21:15:40.000000000 +0100
@@ -1971,7 +1971,7 @@ static int __devinit lanai_pci_start(str
"(itf %d): No suitable DMA available.\n", lanai->number);
return -EBUSY;
}
- if (pci_set_consistent_dma_mask(pci, 0xFFFFFFFF) != 0) {
+ if (pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) != 0) {
printk(KERN_WARNING DEV_LABEL
"(itf %d): No suitable DMA available.\n", lanai->number);
return -EBUSY;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/block/umem.c linux-2.6.15-git8_patch/drivers/block/umem.c
--- linux-2.6.15-git8/drivers/block/umem.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/block/umem.c 2006-01-12 20:50:27.000000000 +0100
@@ -50,6 +50,7 @@
#include <linux/timer.h>
#include <linux/pci.h>
#include <linux/slab.h>
+#include <linux/dma-mapping.h>
#include <linux/fcntl.h> /* O_ACCMODE */
#include <linux/hdreg.h> /* HDIO_GETGEO */
@@ -892,8 +893,8 @@ static int __devinit mm_pci_probe(struct
printk(KERN_INFO "Micro Memory(tm) controller #%d found at %02x:%02x (PCI Mem Module (Battery Backup))\n",
card->card_number, dev->bus->number, dev->devfn);
- if (pci_set_dma_mask(dev, 0xffffffffffffffffLL) &&
- !pci_set_dma_mask(dev, 0xffffffffLL)) {
+ if (pci_set_dma_mask(dev, DMA_64BIT_MASK) &&
+ !pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "MM%d: NO suitable DMA found\n",num_cards);
return -ENOMEM;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/net/forcedeth.c linux-2.6.15-git8_patch/drivers/net/forcedeth.c
--- linux-2.6.15-git8/drivers/net/forcedeth.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/net/forcedeth.c 2006-01-12 20:50:27.000000000 +0100
@@ -124,6 +124,7 @@
#include <linux/random.h>
#include <linux/init.h>
#include <linux/if_vlan.h>
+#include <linux/dma-mapping.h>
#include <asm/irq.h>
#include <asm/io.h>
@@ -2310,7 +2311,7 @@ static int __devinit nv_probe(struct pci
if (id->driver_data & DEV_HAS_HIGH_DMA) {
/* packet format 3: supports 40-bit addressing */
np->desc_ver = DESC_VER_3;
- if (pci_set_dma_mask(pci_dev, 0x0000007fffffffffULL)) {
+ if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) {
printk(KERN_INFO "forcedeth: 64-bit DMA failed, using 32-bit addressing for device %s.\n",
pci_name(pci_dev));
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/net/ioc3-eth.c linux-2.6.15-git8_patch/drivers/net/ioc3-eth.c
--- linux-2.6.15-git8/drivers/net/ioc3-eth.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/net/ioc3-eth.c 2006-01-12 21:16:17.000000000 +0100
@@ -44,6 +44,7 @@
#include <linux/ip.h>
#include <linux/tcp.h>
#include <linux/udp.h>
+#include <linux/dma-mapping.h>
#ifdef CONFIG_SERIAL_8250
#include <linux/serial.h>
@@ -1193,17 +1194,17 @@ static int ioc3_probe(struct pci_dev *pd
int err, pci_using_dac;
/* Configure DMA attributes. */
- err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+ err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
if (!err) {
pci_using_dac = 1;
- err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+ err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
if (err < 0) {
printk(KERN_ERR "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n", pci_name(pdev));
goto out;
}
} else {
- err = pci_set_dma_mask(pdev, 0xffffffffULL);
+ err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
printk(KERN_ERR "%s: No usable DMA configuration, "
"aborting.\n", pci_name(pdev));
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/net/ns83820.c linux-2.6.15-git8_patch/drivers/net/ns83820.c
--- linux-2.6.15-git8/drivers/net/ns83820.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/net/ns83820.c 2006-01-12 20:50:27.000000000 +0100
@@ -1831,10 +1831,10 @@ static int __devinit ns83820_init_one(st
int using_dac = 0;
/* See if we can set the dma mask early on; failure is fatal. */
- if (sizeof(dma_addr_t) == 8 &&
- !pci_set_dma_mask(pci_dev, 0xffffffffffffffffULL)) {
+ if (sizeof(dma_addr_t) == 8 &&
+ !pci_set_dma_mask(pci_dev, DMA_64BIT_MASK)) {
using_dac = 1;
- } else if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {
+ } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
using_dac = 0;
} else {
printk(KERN_WARNING "ns83820.c: pci_set_dma_mask failed!\n");
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/net/tg3.c linux-2.6.15-git8_patch/drivers/net/tg3.c
--- linux-2.6.15-git8/drivers/net/tg3.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/net/tg3.c 2006-01-12 21:02:03.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/tcp.h>
#include <linux/workqueue.h>
#include <linux/prefetch.h>
+#include <linux/dma-mapping.h>
#include <net/checksum.h>
@@ -10492,17 +10493,17 @@ static int __devinit tg3_init_one(struct
}
/* Configure DMA attributes. */
- err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+ err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
if (!err) {
pci_using_dac = 1;
- err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+ err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
if (err < 0) {
printk(KERN_ERR PFX "Unable to obtain 64 bit DMA "
"for consistent allocations\n");
goto err_out_free_res;
}
} else {
- err = pci_set_dma_mask(pdev, 0xffffffffULL);
+ err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
printk(KERN_ERR PFX "No usable DMA configuration, "
"aborting.\n");
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/net/wan/wanxl.c linux-2.6.15-git8_patch/drivers/net/wan/wanxl.c
--- linux-2.6.15-git8/drivers/net/wan/wanxl.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/net/wan/wanxl.c 2006-01-12 20:50:27.000000000 +0100
@@ -577,8 +577,8 @@ static int __devinit wanxl_pci_init_one(
We set both dma_mask and consistent_dma_mask to 28 bits
and pray pci_alloc_consistent() will use this info. It should
work on most platforms */
- if (pci_set_consistent_dma_mask(pdev, 0x0FFFFFFF) ||
- pci_set_dma_mask(pdev, 0x0FFFFFFF)) {
+ if (pci_set_consistent_dma_mask(pdev, DMA_28BIT_MASK) ||
+ pci_set_dma_mask(pdev, DMA_28BIT_MASK)) {
printk(KERN_ERR "wanXL: No usable DMA configuration\n");
return -EIO;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/net/wireless/prism54/islpci_hotplug.c linux-2.6.15-git8_patch/drivers/net/wireless/prism54/islpci_hotplug.c
--- linux-2.6.15-git8/drivers/net/wireless/prism54/islpci_hotplug.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/net/wireless/prism54/islpci_hotplug.c 2006-01-12 20:50:27.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/init.h> /* For __init, __exit */
+#include <linux/dma-mapping.h>
#include "prismcompat.h"
#include "islpci_dev.h"
@@ -125,7 +126,7 @@ prism54_probe(struct pci_dev *pdev, cons
}
/* enable PCI DMA */
- if (pci_set_dma_mask(pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
printk(KERN_ERR "%s: 32-bit PCI DMA not supported", DRV_NAME);
goto do_pci_disable_device;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/a100u2w.c linux-2.6.15-git8_patch/drivers/scsi/a100u2w.c
--- linux-2.6.15-git8/drivers/scsi/a100u2w.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/a100u2w.c 2006-01-12 20:50:27.000000000 +0100
@@ -89,6 +89,7 @@
#include <linux/string.h>
#include <linux/ioport.h>
#include <linux/slab.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/irq.h>
@@ -1052,7 +1053,7 @@ static int __devinit inia100_probe_one(s
if (pci_enable_device(pdev))
goto out;
- if (pci_set_dma_mask(pdev, 0xffffffffULL)) {
+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "Unable to set 32bit DMA "
"on inia100 adapter, ignoring.\n");
goto out_disable_device;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/aacraid/aachba.c linux-2.6.15-git8_patch/drivers/scsi/aacraid/aachba.c
--- linux-2.6.15-git8/drivers/scsi/aacraid/aachba.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/aacraid/aachba.c 2006-01-12 21:04:50.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/slab.h>
#include <linux/completion.h>
#include <linux/blkdev.h>
+#include <linux/dma-mapping.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h>
@@ -822,12 +823,12 @@ int aac_get_adapter_info(struct aac_dev*
dev->dac_support = (dacmode!=0);
}
if(dev->dac_support != 0) {
- if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL) &&
- !pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL)) {
+ if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
+ !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
dev->name, dev->id);
- } else if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFULL) &&
- !pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFULL)) {
+ } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
+ !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
dev->name, dev->id);
dev->dac_support = 0;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/aacraid/linit.c linux-2.6.15-git8_patch/drivers/scsi/aacraid/linit.c
--- linux-2.6.15-git8/drivers/scsi/aacraid/linit.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/aacraid/linit.c 2006-01-12 21:06:03.000000000 +0100
@@ -49,6 +49,7 @@
#include <linux/ioctl32.h>
#include <linux/delay.h>
#include <linux/smp_lock.h>
+#include <linux/dma-mapping.h>
#include <asm/semaphore.h>
#include <scsi/scsi.h>
@@ -752,16 +753,16 @@ static int __devinit aac_probe_one(struc
if (error)
goto out;
- if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) ||
- pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL))
+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||
+ pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
goto out;
/*
* If the quirk31 bit is set, the adapter needs adapter
* to driver communication memory to be allocated below 2gig
*/
if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
- if (pci_set_dma_mask(pdev, 0x7FFFFFFFULL) ||
- pci_set_consistent_dma_mask(pdev, 0x7FFFFFFFULL))
+ if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||
+ pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))
goto out;
pci_set_master(pdev);
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/atp870u.c linux-2.6.15-git8_patch/drivers/scsi/atp870u.c
--- linux-2.6.15-git8/drivers/scsi/atp870u.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/atp870u.c 2006-01-12 20:50:28.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/spinlock.h>
#include <linux/pci.h>
#include <linux/blkdev.h>
+#include <linux/dma-mapping.h>
#include <asm/system.h>
#include <asm/io.h>
@@ -2632,7 +2633,7 @@ static int atp870u_probe(struct pci_dev
if (pci_enable_device(pdev))
return -EIO;
- if (!pci_set_dma_mask(pdev, 0xFFFFFFFFUL)) {
+ if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
printk(KERN_INFO "atp870u: use 32bit DMA mask.\n");
} else {
printk(KERN_ERR "atp870u: DMA mask required but not available.\n");
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/BusLogic.c linux-2.6.15-git8_patch/drivers/scsi/BusLogic.c
--- linux-2.6.15-git8/drivers/scsi/BusLogic.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/BusLogic.c 2006-01-12 20:50:28.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/stat.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
#include <scsi/scsicam.h>
#include <asm/dma.h>
@@ -676,7 +677,7 @@ static int __init BusLogic_InitializeMul
if (pci_enable_device(PCI_Device))
continue;
- if (pci_set_dma_mask(PCI_Device, (u64) 0xffffffff))
+ if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK ))
continue;
Bus = PCI_Device->bus->number;
@@ -831,7 +832,7 @@ static int __init BusLogic_InitializeMul
if (pci_enable_device(PCI_Device))
continue;
- if (pci_set_dma_mask(PCI_Device, (u64) 0xffffffff))
+ if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK))
continue;
Bus = PCI_Device->bus->number;
@@ -885,7 +886,7 @@ static int __init BusLogic_InitializeFla
if (pci_enable_device(PCI_Device))
continue;
- if (pci_set_dma_mask(PCI_Device, (u64) 0xffffffff))
+ if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK))
continue;
Bus = PCI_Device->bus->number;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/dpt_i2o.c linux-2.6.15-git8_patch/drivers/scsi/dpt_i2o.c
--- linux-2.6.15-git8/drivers/scsi/dpt_i2o.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/dpt_i2o.c 2006-01-12 20:50:28.000000000 +0100
@@ -57,6 +57,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
#include <linux/reboot.h>
#include <linux/spinlock.h>
#include <linux/smp_lock.h>
+#include <linux/dma-mapping.h>
#include <linux/timer.h>
#include <linux/string.h>
@@ -883,8 +884,8 @@ static int adpt_install_hba(struct scsi_
return -EINVAL;
}
pci_set_master(pDev);
- if (pci_set_dma_mask(pDev, 0xffffffffffffffffULL) &&
- pci_set_dma_mask(pDev, 0xffffffffULL))
+ if (pci_set_dma_mask(pDev, DMA_64BIT_MASK) &&
+ pci_set_dma_mask(pDev, DMA_32BIT_MASK))
return -EINVAL;
base_addr0_phys = pci_resource_start(pDev,0);
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/eata.c linux-2.6.15-git8_patch/drivers/scsi/eata.c
--- linux-2.6.15-git8/drivers/scsi/eata.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/eata.c 2006-01-12 20:50:28.000000000 +0100
@@ -490,6 +490,7 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
#include <asm/byteorder.h>
#include <asm/dma.h>
#include <asm/io.h>
@@ -1428,7 +1429,7 @@ static int port_detect(unsigned long por
if (ha->pdev) {
pci_set_master(ha->pdev);
- if (pci_set_dma_mask(ha->pdev, 0xffffffff))
+ if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK))
printk("%s: warning, pci_set_dma_mask failed.\n",
ha->board_name);
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/gdth.c linux-2.6.15-git8_patch/drivers/scsi/gdth.c
--- linux-2.6.15-git8/drivers/scsi/gdth.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/gdth.c 2006-01-12 20:50:28.000000000 +0100
@@ -388,6 +388,7 @@
#include <linux/proc_fs.h>
#include <linux/time.h>
#include <linux/timer.h>
+#include <linux/dma-mapping.h>
#ifdef GDTH_RTC
#include <linux/mc146818rtc.h>
#endif
@@ -4527,15 +4528,15 @@ static int __init gdth_detect(Scsi_Host_
if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT)||
/* 64-bit DMA only supported from FW >= x.43 */
(!ha->dma64_support)) {
- if (pci_set_dma_mask(pcistr[ctr].pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "GDT-PCI %d: Unable to set 32-bit DMA\n", hanum);
err = TRUE;
}
} else {
shp->max_cmd_len = 16;
- if (!pci_set_dma_mask(pcistr[ctr].pdev, 0xffffffffffffffffULL)) {
+ if (!pci_set_dma_mask(pcistr[ctr].pdev, DMA_64BIT_MASK)) {
printk("GDT-PCI %d: 64-bit DMA enabled\n", hanum);
- } else if (pci_set_dma_mask(pcistr[ctr].pdev, 0xffffffff)) {
+ } else if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "GDT-PCI %d: Unable to set 64/32-bit DMA\n", hanum);
err = TRUE;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/initio.c linux-2.6.15-git8_patch/drivers/scsi/initio.c
--- linux-2.6.15-git8/drivers/scsi/initio.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/initio.c 2006-01-12 20:50:28.000000000 +0100
@@ -127,6 +127,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <scsi/scsi.h>
@@ -2780,7 +2781,7 @@ static int tul_NewReturnNumberOfAdapters
if (((dRegValue & 0xFF00) >> 8) == 0xFF)
dRegValue = 0;
wBIOS = (wBIOS << 8) + ((UWORD) ((dRegValue & 0xFF00) >> 8));
- if (pci_set_dma_mask(pDev, 0xffffffff)) {
+ if (pci_set_dma_mask(pDev, DMA_32BIT_MASK)) {
printk(KERN_WARNING
"i91u: Could not set 32 bit DMA mask\n");
continue;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/ips.c linux-2.6.15-git8_patch/drivers/scsi/ips.c
--- linux-2.6.15-git8/drivers/scsi/ips.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/ips.c 2006-01-12 20:50:28.000000000 +0100
@@ -178,6 +178,7 @@
#include <linux/blkdev.h>
#include <linux/types.h>
+#include <linux/dma-mapping.h>
#include <scsi/sg.h>
@@ -7300,10 +7301,10 @@ ips_init_phase1(struct pci_dev *pci_dev,
* are guaranteed to be < 4G.
*/
if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) &&
- !pci_set_dma_mask(ha->pcidev, 0xffffffffffffffffULL)) {
+ !pci_set_dma_mask(ha->pcidev, DMA_64BIT_MASK)) {
(ha)->flags |= IPS_HA_ENH_SG;
} else {
- if (pci_set_dma_mask(ha->pcidev, 0xffffffffULL) != 0) {
+ if (pci_set_dma_mask(ha->pcidev, DMA_32BIT_MASK) != 0) {
printk(KERN_WARNING "Unable to set DMA Mask\n");
return ips_abort_init(ha, index);
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/megaraid.c linux-2.6.15-git8_patch/drivers/scsi/megaraid.c
--- linux-2.6.15-git8/drivers/scsi/megaraid.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/megaraid.c 2006-01-12 20:50:28.000000000 +0100
@@ -44,6 +44,7 @@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/dma-mapping.h>
#include <scsi/scsicam.h>
#include "scsi.h"
@@ -2090,7 +2091,7 @@ make_local_pdev(adapter_t *adapter, stru
memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
- if( pci_set_dma_mask(*pdev, 0xffffffff) != 0 ) {
+ if( pci_set_dma_mask(*pdev, DMA_32BIT_MASK) != 0 ) {
kfree(*pdev);
return -1;
}
@@ -4865,10 +4866,10 @@ megaraid_probe_one(struct pci_dev *pdev,
/* Set the Mode of addressing to 64 bit if we can */
if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
- pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+ pci_set_dma_mask(pdev, DMA_64BIT_MASK);
adapter->has_64bit_addr = 1;
} else {
- pci_set_dma_mask(pdev, 0xffffffff);
+ pci_set_dma_mask(pdev, DMA_32BIT_MASK);
adapter->has_64bit_addr = 0;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/nsp32.c linux-2.6.15-git8_patch/drivers/scsi/nsp32.c
--- linux-2.6.15-git8/drivers/scsi/nsp32.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/nsp32.c 2006-01-12 20:50:28.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/ctype.h>
+#include <linux/dma-mapping.h>
#include <asm/dma.h>
#include <asm/system.h>
@@ -2776,7 +2777,7 @@ static int nsp32_detect(Scsi_Host_Templa
/*
* setup DMA
*/
- if (pci_set_dma_mask(PCIDEV, 0xffffffffUL) != 0) {
+ if (pci_set_dma_mask(PCIDEV, DMA_32BIT_MASK) != 0) {
nsp32_msg (KERN_ERR, "failed to set PCI DMA mask");
goto scsi_unregister;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/qla1280.c linux-2.6.15-git8_patch/drivers/scsi/qla1280.c
--- linux-2.6.15-git8/drivers/scsi/qla1280.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/qla1280.c 2006-01-12 20:50:28.000000000 +0100
@@ -348,6 +348,7 @@
#include <linux/pci_ids.h>
#include <linux/interrupt.h>
#include <linux/init.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/irq.h>
@@ -4571,7 +4572,7 @@ qla1280_probe_one(struct pci_dev *pdev,
#ifdef QLA_64BIT_PTR
if (pci_set_dma_mask(ha->pdev, (dma_addr_t) ~ 0ULL)) {
- if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "scsi(%li): Unable to set a "
"suitable DMA mask - aborting\n", ha->host_no);
error = -ENODEV;
@@ -4581,7 +4582,7 @@ qla1280_probe_one(struct pci_dev *pdev,
dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n",
ha->host_no);
#else
- if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "scsi(%li): Unable to set a "
"suitable DMA mask - aborting\n", ha->host_no);
error = -ENODEV;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/drivers/scsi/qlogicfc.c linux-2.6.15-git8_patch/drivers/scsi/qlogicfc.c
--- linux-2.6.15-git8/drivers/scsi/qlogicfc.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/drivers/scsi/qlogicfc.c 2006-01-12 20:50:28.000000000 +0100
@@ -61,6 +61,7 @@
#include <linux/unistd.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/irq.h>
#include "scsi.h"
@@ -737,8 +738,8 @@ static int isp2x00_detect(Scsi_Host_Temp
continue;
/* Try to configure DMA attributes. */
- if (pci_set_dma_mask(pdev, 0xffffffffffffffffULL) &&
- pci_set_dma_mask(pdev, 0xffffffffULL))
+ if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) &&
+ pci_set_dma_mask(pdev, DMA_32BIT_MASK))
continue;
host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata));
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/include/linux/dma-mapping.h linux-2.6.15-git8_patch/include/linux/dma-mapping.h
--- linux-2.6.15-git8/include/linux/dma-mapping.h 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/include/linux/dma-mapping.h 2006-01-12 21:01:25.000000000 +0100
@@ -20,6 +20,8 @@ enum dma_data_direction {
#define DMA_31BIT_MASK 0x000000007fffffffULL
#define DMA_30BIT_MASK 0x000000003fffffffULL
#define DMA_29BIT_MASK 0x000000001fffffffULL
+#define DMA_28BIT_MASK 0x000000000fffffffULL
+#define DMA_24BIT_MASK 0x0000000000ffffffULL
#include <asm/dma-mapping.h>
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/oss/esssolo1.c linux-2.6.15-git8_patch/sound/oss/esssolo1.c
--- linux-2.6.15-git8/sound/oss/esssolo1.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/oss/esssolo1.c 2006-01-12 20:50:28.000000000 +0100
@@ -2346,7 +2346,7 @@ static int __devinit solo1_probe(struct
/* Recording requires 24-bit DMA, so attempt to set dma mask
* to 24 bits first, then 32 bits (playback only) if that fails.
*/
- if (pci_set_dma_mask(pcidev, 0x00ffffff) &&
+ if (pci_set_dma_mask(pcidev, DMA_24BIT_MASK) &&
pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");
return -ENODEV;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/oss/sonicvibes.c linux-2.6.15-git8_patch/sound/oss/sonicvibes.c
--- linux-2.6.15-git8/sound/oss/sonicvibes.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/oss/sonicvibes.c 2006-01-12 20:50:28.000000000 +0100
@@ -116,6 +116,7 @@
#include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/gameport.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -2551,7 +2552,7 @@ static int __devinit sv_probe(struct pci
return -ENODEV;
if (pcidev->irq == 0)
return -ENODEV;
- if (pci_set_dma_mask(pcidev, 0x00ffffff)) {
+ if (pci_set_dma_mask(pcidev, DMA_24BIT_MASK)) {
printk(KERN_WARNING "sonicvibes: architecture does not support 24bit PCI busmaster DMA\n");
return -ENODEV;
}
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/ad1889.c linux-2.6.15-git8_patch/sound/pci/ad1889.c
--- linux-2.6.15-git8/sound/pci/ad1889.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/ad1889.c 2006-01-12 20:50:28.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/interrupt.h>
#include <linux/compiler.h>
#include <linux/delay.h>
+#include <linux/dma-mapping.h>
#include <sound/driver.h>
#include <sound/core.h>
@@ -920,8 +921,8 @@ snd_ad1889_create(snd_card_t *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;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/ali5451/ali5451.c linux-2.6.15-git8_patch/sound/pci/ali5451/ali5451.c
--- linux-2.6.15-git8/sound/pci/ali5451/ali5451.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/ali5451/ali5451.c 2006-01-12 21:12:09.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/info.h>
@@ -2238,8 +2239,8 @@ static int __devinit snd_ali_create(snd_
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check, if we can restrict PCI DMA transfers to 31 bits */
- if (pci_set_dma_mask(pci, 0x7fffffff) < 0 ||
- pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) {
snd_printk("architecture does not support 31bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/als4000.c linux-2.6.15-git8_patch/sound/pci/als4000.c
--- linux-2.6.15-git8/sound/pci/als4000.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/als4000.c 2006-01-12 21:07:27.000000000 +0100
@@ -65,6 +65,7 @@
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/rawmidi.h>
@@ -667,8 +668,8 @@ static int __devinit snd_card_als4000_pr
return err;
}
/* check, if we can restrict PCI DMA transfers to 24 bits */
- if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
- pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/azt3328.c linux-2.6.15-git8_patch/sound/pci/azt3328.c
--- linux-2.6.15-git8/sound/pci/azt3328.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/azt3328.c 2006-01-12 21:14:12.000000000 +0100
@@ -99,6 +99,7 @@
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
@@ -1356,8 +1357,8 @@ static int __devinit snd_azf3328_create(
chip->irq = -1;
/* check if we can restrict PCI DMA transfers to 24 bits */
- if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
- pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/emu10k1/emu10k1x.c linux-2.6.15-git8_patch/sound/pci/emu10k1/emu10k1x.c
--- linux-2.6.15-git8/sound/pci/emu10k1/emu10k1x.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/emu10k1/emu10k1x.c 2006-01-12 20:50:28.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/pcm.h>
@@ -913,8 +914,8 @@ static int __devinit snd_emu10k1x_create
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;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/es1938.c linux-2.6.15-git8_patch/sound/pci/es1938.c
--- linux-2.6.15-git8/sound/pci/es1938.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/es1938.c 2006-01-12 21:08:32.000000000 +0100
@@ -55,6 +55,7 @@
#include <linux/gameport.h>
#include <linux/moduleparam.h>
#include <linux/delay.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
@@ -1487,8 +1488,8 @@ static int __devinit snd_es1938_create(s
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check, if we can restrict PCI DMA transfers to 24 bits */
- if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
- pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/es1968.c linux-2.6.15-git8_patch/sound/pci/es1968.c
--- linux-2.6.15-git8/sound/pci/es1968.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/es1968.c 2006-01-12 21:09:24.000000000 +0100
@@ -103,6 +103,7 @@
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/mpu401.h>
@@ -2562,8 +2563,8 @@ static int __devinit snd_es1968_create(s
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("architecture does not support 28bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/ice1712/ice1712.c linux-2.6.15-git8_patch/sound/pci/ice1712/ice1712.c
--- linux-2.6.15-git8/sound/pci/ice1712/ice1712.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/ice1712/ice1712.c 2006-01-12 21:13:29.000000000 +0100
@@ -55,6 +55,7 @@
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/cs8427.h>
#include <sound/info.h>
@@ -2522,8 +2523,8 @@ static int __devinit snd_ice1712_create(
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("architecture does not support 28bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/maestro3.c linux-2.6.15-git8_patch/sound/pci/maestro3.c
--- linux-2.6.15-git8/sound/pci/maestro3.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/maestro3.c 2006-01-12 21:11:09.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/info.h>
#include <sound/control.h>
@@ -2653,8 +2654,8 @@ snd_m3_create(snd_card_t *card, struct p
return -EIO;
/* 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("architecture does not support 28bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/mixart/mixart.c linux-2.6.15-git8_patch/sound/pci/mixart/mixart.c
--- linux-2.6.15-git8/sound/pci/mixart/mixart.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/mixart/mixart.c 2006-01-12 20:50:28.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/info.h>
@@ -1284,7 +1285,7 @@ static int __devinit snd_mixart_probe(st
pci_set_master(pci);
/* check if we can restrict PCI DMA transfers to 32 bits */
- if (pci_set_dma_mask(pci, 0xffffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/sonicvibes.c linux-2.6.15-git8_patch/sound/pci/sonicvibes.c
--- linux-2.6.15-git8/sound/pci/sonicvibes.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/sonicvibes.c 2006-01-12 21:12:46.000000000 +0100
@@ -30,6 +30,7 @@
#include <linux/slab.h>
#include <linux/gameport.h>
#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/pcm.h>
@@ -1243,8 +1244,8 @@ static int __devinit snd_sonicvibes_crea
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check, if we can restrict PCI DMA transfers to 24 bits */
- if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
- pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
diff -uprN -X linux-2.6.15-git8/Documentation/dontdiff linux-2.6.15-git8/sound/pci/trident/trident_main.c linux-2.6.15-git8_patch/sound/pci/trident/trident_main.c
--- linux-2.6.15-git8/sound/pci/trident/trident_main.c 2005-11-24 23:10:21.000000000 +0100
+++ linux-2.6.15-git8_patch/sound/pci/trident/trident_main.c 2006-01-12 21:10:21.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/gameport.h>
+#include <linux/dma-mapping.h>
#include <sound/core.h>
#include <sound/info.h>
@@ -3539,8 +3540,8 @@ int __devinit snd_trident_create(snd_car
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check, if we can restrict PCI DMA transfers to 30 bits */
- if (pci_set_dma_mask(pci, 0x3fffffff) < 0 ||
- pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) {
+ if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) {
snd_printk("architecture does not support 30bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
@@ -3949,8 +3950,8 @@ static int snd_trident_resume(snd_card_t
trident_t *trident = card->pm_private_data;
pci_enable_device(trident->pci);
- if (pci_set_dma_mask(trident->pci, 0x3fffffff) < 0 ||
- pci_set_consistent_dma_mask(trident->pci, 0x3fffffff) < 0)
+ if (pci_set_dma_mask(trident->pci, DMA_30BIT_MASK) < 0 ||
+ pci_set_consistent_dma_mask(trident->pci, DMA_30BIT_MASK) < 0)
snd_printk(KERN_WARNING "trident: can't set the proper DMA mask\n");
pci_set_master(trident->pci); /* to be sure */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Patch v2] Replacing 0xff.. with correct DMA_xBIT_MASK
2006-01-12 20:27 [Patch v2] Replacing 0xff.. with correct DMA_xBIT_MASK M.Gehre
@ 2006-01-12 20:31 ` Linus Torvalds
0 siblings, 0 replies; 2+ messages in thread
From: Linus Torvalds @ 2006-01-12 20:31 UTC (permalink / raw)
To: M.Gehre; +Cc: linux-kernel
On Thu, 12 Jan 2006, M.Gehre wrote:
>
> From: Matthias Gehre
Btw, when doing the "From:" thing, I'd really prefer the email address
too, so that it ends up in the author field.
In fact, if there is nothing that looks like an email address, my patch
application scripts will ignore this "From:" in the body of the mail, and
use the From: from the headers (now, in this case it obviously is the
right thing to do, but if somebody else passes the email on to me, it
would result in you not being properly credited as author for the commit,
although the commit _message_ would then have that "From:" line in it).
Having an email address in the authorship data is just too convenient (ie
something goes wrong with the change, and we need to contact the author or
similar).
Linus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-12 20:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-12 20:27 [Patch v2] Replacing 0xff.. with correct DMA_xBIT_MASK M.Gehre
2006-01-12 20:31 ` Linus Torvalds
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).