From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser 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 Message-ID: <20050320123747.GD3491@localhost.localdomain> References: <20050220165530.GD14375@helium.tklauser.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Received: from server3.hostpoint.ch ([217.26.52.13]:33809 "EHLO server3.hostpoint.ch") by vger.kernel.org with ESMTP id S261194AbVCTMhy (ORCPT ); Sun, 20 Mar 2005 07:37:54 -0500 Content-Disposition: inline In-Reply-To: <20050220165530.GD14375@helium.tklauser.home> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: kernel-janitors@lists.osdl.org Cc: jgarzik@pobox.com, linux-ide@vger.kernel.org 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 --- 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 #include #include +#include #include "scsi.h" #include #include @@ -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));