From: Jeff Garzik <jgarzik@pobox.com>
To: Andrew Morton <akpm@osdl.org>, Greg KH <greg@kroah.com>
Cc: scott.feldman@intel.com, linux-kernel@vger.kernel.org
Subject: [PATCH] add PCI_DMA_{64,32}BIT constants
Date: Tue, 23 Mar 2004 00:23:05 -0500 [thread overview]
Message-ID: <20040323052305.GA2287@havoc.gtf.org> (raw)
Been meaning to do this for ages...
Another one for the janitors.
Please do a
bk pull bk://kernel.bkbits.net/jgarzik/pci-dma-mask-2.6
This will update the following files:
Documentation/DMA-mapping.txt | 16 ++++++++--------
drivers/net/e1000/e1000.h | 2 --
drivers/net/ixgb/ixgb.h | 2 --
include/linux/pci.h | 3 +++
4 files changed, 11 insertions(+), 12 deletions(-)
through these ChangeSets:
<jgarzik@redhat.com> (04/03/23 1.1849)
Create PCI_DMA_{64,32]BIT constants, for use in passing to
pci_set_{consistent_}dma_mask().
Use them in e1000 and ixgb.
diff -Nru a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
--- a/Documentation/DMA-mapping.txt Tue Mar 23 00:19:17 2004
+++ b/Documentation/DMA-mapping.txt Tue Mar 23 00:19:17 2004
@@ -132,7 +132,7 @@
The standard 32-bit addressing PCI device would do something like
this:
- if (pci_set_dma_mask(pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(pdev, PCI_DMA_32BIT)) {
printk(KERN_WARNING
"mydev: No suitable DMA available.\n");
goto ignore_this_device;
@@ -151,9 +151,9 @@
int using_dac;
- if (!pci_set_dma_mask(pdev, 0xffffffffffffffff)) {
+ if (!pci_set_dma_mask(pdev, PCI_DMA_64BIT)) {
using_dac = 1;
- } else if (!pci_set_dma_mask(pdev, 0xffffffff)) {
+ } else if (!pci_set_dma_mask(pdev, PCI_DMA_32BIT)) {
using_dac = 0;
} else {
printk(KERN_WARNING
@@ -166,14 +166,14 @@
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;
consistent_using_dac = 1;
- pci_set_consistent_dma_mask(pdev, 0xffffffffffffffff)
- } else if (!pci_set_dma_mask(pdev, 0xffffffff)) {
+ pci_set_consistent_dma_mask(pdev, PCI_DMA_64BIT);
+ } else if (!pci_set_dma_mask(pdev, PCI_DMA_32BIT)) {
using_dac = 0;
consistent_using_dac = 0;
- pci_set_consistent_dma_mask(pdev, 0xffffffff)
+ pci_set_consistent_dma_mask(pdev, PCI_DMA_32BIT);
} else {
printk(KERN_WARNING
"mydev: No suitable DMA available.\n");
@@ -215,7 +215,7 @@
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
struct my_sound_card *card;
diff -Nru a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
--- a/drivers/net/e1000/e1000.h Tue Mar 23 00:19:17 2004
+++ b/drivers/net/e1000/e1000.h Tue Mar 23 00:19:17 2004
@@ -74,8 +74,6 @@
#define BAR_0 0
#define BAR_1 1
#define BAR_5 5
-#define PCI_DMA_64BIT 0xffffffffffffffffULL
-#define PCI_DMA_32BIT 0x00000000ffffffffULL
struct e1000_adapter;
diff -Nru a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
--- a/drivers/net/ixgb/ixgb.h Tue Mar 23 00:19:17 2004
+++ b/drivers/net/ixgb/ixgb.h Tue Mar 23 00:19:17 2004
@@ -65,8 +65,6 @@
#define BAR_0 0
#define BAR_1 1
#define BAR_5 5
-#define PCI_DMA_64BIT 0xffffffffffffffffULL
-#define PCI_DMA_32BIT 0x00000000ffffffffULL
#include "ixgb_hw.h"
#include "ixgb_ee.h"
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h Tue Mar 23 00:19:17 2004
+++ b/include/linux/pci.h Tue Mar 23 00:19:17 2004
@@ -362,6 +362,9 @@
#define PCI_DMA_FROMDEVICE 2
#define PCI_DMA_NONE 3
+#define PCI_DMA_64BIT 0xffffffffffffffffULL
+#define PCI_DMA_32BIT 0x00000000ffffffffULL
+
#define DEVICE_COUNT_COMPATIBLE 4
#define DEVICE_COUNT_RESOURCE 12
next reply other threads:[~2004-03-23 5:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-23 5:23 Jeff Garzik [this message]
2004-03-27 0:29 ` [PATCH] add PCI_DMA_{64,32}BIT constants Greg KH
2004-03-27 0:41 ` Jeff Garzik
2004-03-27 0:48 ` Greg KH
2004-03-27 1:21 ` Jeff Garzik
2004-03-30 6:36 ` Randy.Dunlap
2004-03-30 22:35 ` Jeff Garzik
2004-03-31 1:26 ` Greg KH
2004-03-31 3:58 ` Randy.Dunlap
2004-03-31 22:49 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040323052305.GA2287@havoc.gtf.org \
--to=jgarzik@pobox.com \
--cc=akpm@osdl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=scott.feldman@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox