From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Date: Thu, 10 Mar 2005 16:59:24 +0000 Subject: [KJ] Re: [PATCH UPDATE] drivers/ide/cs5520.c : Use the DMA_{64, Message-Id: <20050310165924.GA4213@localhost.localdomain> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============77111840491477524==" List-Id: References: <20050308133358.GA5311@localhost.localdomain> <58cb370e050310083053a0e495@mail.gmail.com> In-Reply-To: <58cb370e050310083053a0e495@mail.gmail.com> To: Bartlomiej Zolnierkiewicz Cc: kernel-janitors@lists.osdl.org, linux-ide@vger.kernel.org --===============77111840491477524== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Mar 10, 2005 at 05:30:12PM +0100, Bartlomiej Zolnierkiewicz wrote: > On Tue, 8 Mar 2005 14:33:58 +0100, Tobias Klauser 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 > > > > --- 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 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 --- 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 #include +#include + 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; } --===============77111840491477524== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============77111840491477524==-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Subject: [KJ] Re: [PATCH UPDATE] drivers/ide/cs5520.c : Use the DMA_{64, 32}BIT_MASK constants Date: Thu, 10 Mar 2005 17:59:24 +0100 Message-ID: <20050310165924.GA4213@localhost.localdomain> References: <20050308133358.GA5311@localhost.localdomain> <58cb370e050310083053a0e495@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============77111840491477524==" In-Reply-To: <58cb370e050310083053a0e495@mail.gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-janitors-bounces@lists.osdl.org Errors-To: kernel-janitors-bounces@lists.osdl.org To: Bartlomiej Zolnierkiewicz Cc: kernel-janitors@lists.osdl.org, linux-ide@vger.kernel.org List-Id: linux-ide@vger.kernel.org --===============77111840491477524== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Mar 10, 2005 at 05:30:12PM +0100, Bartlomiej Zolnierkiewicz wrote: > On Tue, 8 Mar 2005 14:33:58 +0100, Tobias Klauser 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 > > > > --- 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 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 --- 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 #include +#include + 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; } --===============77111840491477524== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============77111840491477524==--