[PATCH] drivers/ide/cs5520.c : Use the DMA_{64,32}BIT_MASK constants

[PATCH] drivers/ide/cs5520.c : Use the DMA_{64,32}BIT_MASK constants

[Tobias Klauser]

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.orig/drivers/ide/pci/cs5520.c	2005-03-02 12:50:39.000000000 +0100
+++ linux-2.6.11/drivers/ide/pci/cs5520.c	2005-03-03 11:46:46.000000000 +0100
@@ -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;
 	}

[KJ] Re: [PATCH] drivers/ide/cs5520.c : Use the DMA_{64, 32}BIT_MASK constants

[Bartlomiej Zolnierkiewicz]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

On Tue, 8 Mar 2005 14:33:58 +0100, Tobias Klauser <tklauser@nuerscht.ch> wrote:
> Hello,

Hi,

> 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
 
> Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
> 
> --- linux-2.6.11.orig/drivers/ide/pci/cs5520.c  2005-03-02 12:50:39.000000000 +0100
> +++ linux-2.6.11/drivers/ide/pci/cs5520.c       2005-03-03 11:46:46.000000000 +0100
> @@ -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

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] Re: [PATCH UPDATE] drivers/ide/cs5520.c : Use the DMA_{64, 32}BIT_MASK constants

[Tobias Klauser]

[-- Attachment #1: Type: text/plain, Size: 2158 bytes --]

On Thu, Mar 10, 2005 at 05:30:12PM +0100, Bartlomiej Zolnierkiewicz wrote:
> On Tue, 8 Mar 2005 14:33:58 +0100, Tobias Klauser <tklauser@nuerscht.ch> wrote:
> > 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.

> > Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
> > 
> > --- linux-2.6.11.orig/drivers/ide/pci/cs5520.c  2005-03-02 12:50:39.000000000 +0100
> > +++ linux-2.6.11/drivers/ide/pci/cs5520.c       2005-03-03 11:46:46.000000000 +0100
> > @@ -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 <tklauser@nuerscht.ch>

--- linux-2.6.11.orig/drivers/ide/pci/cs5520.c	2005-03-02 12:50:39.000000000 +0100
+++ linux-2.6.11/drivers/ide/pci/cs5520.c	2005-03-10 17:55:23.894909672 +0100
@@ -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;
 	}

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [PATCH UPDATE] drivers/ide/cs5520.c : Use the DMA_{64,32}BIT_MASK constants

[Bartlomiej Zolnierkiewicz]

applied