* [PATCH 17/19] drivers/scsi/qla1280: Use the DMA_{64,32}BIT_MASK constants
@ 2005-02-20 17:12 Tobias Klauser
2005-03-20 13:20 ` [UPDATE PATCH 17/19] drivers/scsi/qla1280: Use the DMA_32BIT_MASK constant Tobias Klauser
0 siblings, 1 reply; 2+ messages in thread
From: Tobias Klauser @ 2005-02-20 17:12 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-scsi
Hello,
Description: Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
--- linux-2.6.11-rc4.orig/drivers/scsi/qla1280.c 2005-02-13 17:13:07.000000000 +0100
+++ linux-2.6.11-rc4/drivers/scsi/qla1280.c 2005-02-16 21:16:19.000000000 +0100
@@ -4741,7 +4741,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 - aboring\n", ha->host_no);
error = -ENODEV;
@@ -4751,7 +4751,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 - aboring\n", ha->host_no);
error = -ENODEV;
^ permalink raw reply [flat|nested] 2+ messages in thread
* [UPDATE PATCH 17/19] drivers/scsi/qla1280: Use the DMA_32BIT_MASK constant
2005-02-20 17:12 [PATCH 17/19] drivers/scsi/qla1280: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
@ 2005-03-20 13:20 ` Tobias Klauser
0 siblings, 0 replies; 2+ messages in thread
From: Tobias Klauser @ 2005-03-20 13:20 UTC (permalink / raw)
To: kernel-janitors; +Cc: andrew.vasquez, linux-scsi
The previous patch did not compile cleanly on all architectures so
here's a fixed one.
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors
on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
--- linux-2.6.11.orig/drivers/scsi/qla1280.c 2005-03-02 12:50:38.000000000 +0100
+++ linux-2.6.11/drivers/scsi/qla1280.c 2005-03-20 13:27:54.000000000 +0100
@@ -345,6 +345,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>
@@ -4741,7 +4742,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 - aboring\n", ha->host_no);
error = -ENODEV;
@@ -4751,7 +4752,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 - aboring\n", ha->host_no);
error = -ENODEV;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-03-20 13:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-20 17:12 [PATCH 17/19] drivers/scsi/qla1280: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
2005-03-20 13:20 ` [UPDATE PATCH 17/19] drivers/scsi/qla1280: Use the DMA_32BIT_MASK constant Tobias Klauser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox