Skip to contentSkip to conversation

drivers/ide/cs5520.c : Use the DMA_{64,

PATCH In review Tobias Klauser 2 participants 4 messages Mar 8, 2005 – Mar 18, 2005

Subsystems (2)
Kernel janitors libata
lore
Share & tools
lore

Tobias Klauser

author
#0 lore raw

PATCH 1/1 drivers/ide/cs5520.c : Use the DMA_{64,

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 <[email protected]>
drivers/ide/pci/cs5520.c +1 -1
@@ -227,7 +227,7 @@ static int __devinit cs5520_init_one(str
 		return 1;
 	}
 	pci_set_master(dev);
-	if (pci_set_dma_mask(dev, 0xFFFFFFFF)) {
+	if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
 		printk(KERN_WARNING "cs5520: No suitable DMA available.\n");
 		return -ENODEV;
 	}

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 1 line · Tobias Klauser

Hello,

Hi,

Quoted 3 lines

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

only DMA_32BIT_MASK constant is used in the patch

drivers/ide/pci/cs5520.c 2005-03-03 11:46:46.000000000 +0100 static int __devinit cs5520_init_one(str · line 233

Quoted 13 lines
Signed-off-by Tobias Klauser <[email protected]>
drivers/ide/pci/cs5520.c 2005-03-03 11:46:46.000000000 +0100 renamed from drivers/ide/pci/cs5520.c 2005-03-02 12:50:39.000000000 +0100 +1 -1
@@ -227,7 +227,7 @@ static int __devinit cs5520_init_one(str
                return 1;
        }
        pci_set_master(dev);
-       if (pci_set_dma_mask(dev, 0xFFFFFFFF)) {
+       if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
                printk(KERN_WARNING "cs5520: No suitable DMA available.\n");
                return -ENODEV;
        }

You need to include <linux/dma-mapping.h> explicitly or build will fail for some architectures, i.e. please see:
http://linus.bkbits.net:8080/linux-2.5/cset@41d833427yYZzu6TxydNrr5z6f02cg?nav=index.html|src/|src/drivers|src/drivers/ide|related/drivers/ide/setup-pci.c

Bartlomiej

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#2 lore raw
Quoted 6 lines · Bartlomiej Zolnierkiewicz
Quoted 3 lines · Tobias Klauser

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

only DMA_32BIT_MASK constant is used in the patch

I just took the same description for all patches of this series. Some of them do not include DMA_64BIT_MASK.

Quoted 17 lines

drivers/ide/pci/cs5520.c 2005-03-03 11:46:46.000000000 +0100 static int __devinit cs5520_init_one(str · line 233

Quoted 13 lines
Signed-off-by Tobias Klauser <[email protected]>
drivers/ide/pci/cs5520.c 2005-03-03 11:46:46.000000000 +0100 renamed from drivers/ide/pci/cs5520.c 2005-03-02 12:50:39.000000000 +0100 +1 -1
@@ -227,7 +227,7 @@ static int __devinit cs5520_init_one(str
                return 1;
        }
        pci_set_master(dev);
-       if (pci_set_dma_mask(dev, 0xFFFFFFFF)) {
+       if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
                printk(KERN_WARNING "cs5520: No suitable DMA available.\n");
                return -ENODEV;
        }

You need to include <linux/dma-mapping.h> explicitly or build will fail for some architectures, i.e. please see:
http://linus.bkbits.net:8080/linux-2.5/cset@41d833427yYZzu6TxydNrr5z6f02cg?nav=index.html|src/|src/drivers|src/drivers/ide|related/drivers/ide/setup-pci.c

I only compile-tested this patch on x86 and there it worked. So here's an updated patch:

Signed-off-by Tobias Klauser <[email protected]>
drivers/ide/pci/cs5520.c +3 -1
@@ -51,6 +51,8 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
+#include <linux/dma-mapping.h>
+
 struct pio_clocks
 {
 	int address;

@@ -227,7 +229,7 @@ static int __devinit cs5520_init_one(str
 		return 1;
 	}
 	pci_set_master(dev);
-	if (pci_set_dma_mask(dev, 0xFFFFFFFF)) {
+	if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
 		printk(KERN_WARNING "cs5520: No suitable DMA available.\n");
 		return -ENODEV;
 	}

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors