From: Tobias Klauser <tklauser@nuerscht.ch>
To: kernel-janitors@lists.osdl.org
Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org
Subject: [KJ] [UPDATE PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64,
Date: Sun, 20 Mar 2005 12:37:47 +0000 [thread overview]
Message-ID: <20050320123747.GD3491@localhost.localdomain> (raw)
In-Reply-To: <20050220165530.GD14375@helium.tklauser.home>
[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]
The previous patch did not compile cleanly on all architectures so
here's a fixed one.
Use the DMA_{64,32}BIT_MASK constants 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/ahci.c 2005-03-02 12:50:38.000000000 +0100
+++ linux-2.6.11/drivers/scsi/ahci.c 2005-03-20 13:27:54.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
+#include <linux/dma-mapping.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
@@ -766,10 +767,10 @@ static int ahci_host_init(struct ata_pro
using_dac = hpriv->cap & HOST_CAP_64;
if (using_dac &&
- !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+ !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+ rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
if (rc) {
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): 64-bit DMA enable failed\n",
pci_name(pdev));
@@ -779,13 +780,13 @@ static int ahci_host_init(struct ata_pro
hpriv->flags |= HOST_CAP_64;
} else {
- rc = pci_set_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",
pci_name(pdev));
return rc;
}
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",
pci_name(pdev));
[-- 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
WARNING: multiple messages have this Message-ID (diff)
From: Tobias Klauser <tklauser@nuerscht.ch>
To: kernel-janitors@lists.osdl.org
Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org
Subject: [UPDATE PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64, 32}BIT_MASK constants
Date: Sun, 20 Mar 2005 13:37:47 +0100 [thread overview]
Message-ID: <20050320123747.GD3491@localhost.localdomain> (raw)
In-Reply-To: <20050220165530.GD14375@helium.tklauser.home>
The previous patch did not compile cleanly on all architectures so
here's a fixed one.
Use the DMA_{64,32}BIT_MASK constants 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/ahci.c 2005-03-02 12:50:38.000000000 +0100
+++ linux-2.6.11/drivers/scsi/ahci.c 2005-03-20 13:27:54.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
+#include <linux/dma-mapping.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
@@ -766,10 +767,10 @@ static int ahci_host_init(struct ata_pro
using_dac = hpriv->cap & HOST_CAP_64;
if (using_dac &&
- !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+ !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+ rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
if (rc) {
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): 64-bit DMA enable failed\n",
pci_name(pdev));
@@ -779,13 +780,13 @@ static int ahci_host_init(struct ata_pro
hpriv->flags |= HOST_CAP_64;
} else {
- rc = pci_set_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",
pci_name(pdev));
return rc;
}
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+ rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",
pci_name(pdev));
next prev parent reply other threads:[~2005-03-20 12:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-20 16:55 [KJ] [PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64, Tobias Klauser
2005-02-20 16:55 ` [PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
2005-02-20 17:39 ` [KJ] Re: [PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64, Jeff Garzik
2005-02-20 17:39 ` [PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64,32}BIT_MASK constants Jeff Garzik
2005-03-20 12:37 ` Tobias Klauser [this message]
2005-03-20 12:37 ` [UPDATE PATCH 04/19] drivers/scsi/ahci: Use the DMA_{64, 32}BIT_MASK constants Tobias Klauser
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=20050320123747.GD3491@localhost.localdomain \
--to=tklauser@nuerscht.ch \
--cc=jgarzik@pobox.com \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-ide@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.