Commit bae19b18 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge bk://kernel.bkbits.net/jgarzik/pci-dma-mask-2.6

into kroah.com:/home/greg/linux/BK/pci-2.6
parents ec99630f b1776b04
...@@ -132,7 +132,7 @@ exactly why. ...@@ -132,7 +132,7 @@ exactly why.
The standard 32-bit addressing PCI device would do something like The standard 32-bit addressing PCI device would do something like
this: this:
if (pci_set_dma_mask(pdev, 0xffffffff)) { if (pci_set_dma_mask(pdev, PCI_DMA_32BIT)) {
printk(KERN_WARNING printk(KERN_WARNING
"mydev: No suitable DMA available.\n"); "mydev: No suitable DMA available.\n");
goto ignore_this_device; goto ignore_this_device;
...@@ -151,9 +151,9 @@ all 64-bits when accessing streaming DMA: ...@@ -151,9 +151,9 @@ all 64-bits when accessing streaming DMA:
int using_dac; int using_dac;
if (!pci_set_dma_mask(pdev, 0xffffffffffffffff)) { if (!pci_set_dma_mask(pdev, PCI_DMA_64BIT)) {
using_dac = 1; using_dac = 1;
} else if (!pci_set_dma_mask(pdev, 0xffffffff)) { } else if (!pci_set_dma_mask(pdev, PCI_DMA_32BIT)) {
using_dac = 0; using_dac = 0;
} else { } else {
printk(KERN_WARNING printk(KERN_WARNING
...@@ -166,14 +166,14 @@ the case would look like this: ...@@ -166,14 +166,14 @@ the case would look like this:
int using_dac, consistent_using_dac; int using_dac, consistent_using_dac;
if (!pci_set_dma_mask(pdev, 0xffffffffffffffff)) { if (!pci_set_dma_mask(pdev, PCI_DMA_64BIT)) {
using_dac = 1; using_dac = 1;
consistent_using_dac = 1; consistent_using_dac = 1;
pci_set_consistent_dma_mask(pdev, 0xffffffffffffffff) pci_set_consistent_dma_mask(pdev, PCI_DMA_64BIT);
} else if (!pci_set_dma_mask(pdev, 0xffffffff)) { } else if (!pci_set_dma_mask(pdev, PCI_DMA_32BIT)) {
using_dac = 0; using_dac = 0;
consistent_using_dac = 0; consistent_using_dac = 0;
pci_set_consistent_dma_mask(pdev, 0xffffffff) pci_set_consistent_dma_mask(pdev, PCI_DMA_32BIT);
} else { } else {
printk(KERN_WARNING printk(KERN_WARNING
"mydev: No suitable DMA available.\n"); "mydev: No suitable DMA available.\n");
...@@ -215,7 +215,7 @@ most specific mask. ...@@ -215,7 +215,7 @@ most specific mask.
Here is pseudo-code showing how this might be done: Here is pseudo-code showing how this might be done:
#define PLAYBACK_ADDRESS_BITS 0xffffffff #define PLAYBACK_ADDRESS_BITS PCI_DMA_32BIT
#define RECORD_ADDRESS_BITS 0x00ffffff #define RECORD_ADDRESS_BITS 0x00ffffff
struct my_sound_card *card; struct my_sound_card *card;
......
...@@ -74,8 +74,6 @@ ...@@ -74,8 +74,6 @@
#define BAR_0 0 #define BAR_0 0
#define BAR_1 1 #define BAR_1 1
#define BAR_5 5 #define BAR_5 5
#define PCI_DMA_64BIT 0xffffffffffffffffULL
#define PCI_DMA_32BIT 0x00000000ffffffffULL
struct e1000_adapter; struct e1000_adapter;
......
...@@ -65,8 +65,6 @@ struct ixgb_adapter; ...@@ -65,8 +65,6 @@ struct ixgb_adapter;
#define BAR_0 0 #define BAR_0 0
#define BAR_1 1 #define BAR_1 1
#define BAR_5 5 #define BAR_5 5
#define PCI_DMA_64BIT 0xffffffffffffffffULL
#define PCI_DMA_32BIT 0x00000000ffffffffULL
#include "ixgb_hw.h" #include "ixgb_hw.h"
#include "ixgb_ee.h" #include "ixgb_ee.h"
......
...@@ -433,6 +433,9 @@ enum pci_mmap_state { ...@@ -433,6 +433,9 @@ enum pci_mmap_state {
#define PCI_DMA_FROMDEVICE 2 #define PCI_DMA_FROMDEVICE 2
#define PCI_DMA_NONE 3 #define PCI_DMA_NONE 3
#define PCI_DMA_64BIT 0xffffffffffffffffULL
#define PCI_DMA_32BIT 0x00000000ffffffffULL
#define DEVICE_COUNT_COMPATIBLE 4 #define DEVICE_COUNT_COMPATIBLE 4
#define DEVICE_COUNT_RESOURCE 12 #define DEVICE_COUNT_RESOURCE 12
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment