From d93bf80c0507a63b962092e97d4c0d732b9bbab2 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 18 Mar 2004 07:55:48 -0500 Subject: [PATCH] [libata] explicitly set consistent DMA mask to 0xffffffff Do not rely on the default being 0xffffffff. --- drivers/scsi/libata-core.c | 3 +++ drivers/scsi/sata_promise.c | 3 +++ drivers/scsi/sata_sil.c | 3 +++ drivers/scsi/sata_svw.c | 3 +++ drivers/scsi/sata_via.c | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 14a30889b4e3c..1b2dd12419239 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -3147,6 +3147,9 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, } rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); + if (rc) + goto err_out_regions; + rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index c16f887b5a95c..7d3ee074b9105 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -1667,6 +1667,9 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id * goto err_out; rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); + if (rc) + goto err_out_regions; + rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c index 826804394ddee..219dcef7d9eed 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/scsi/sata_sil.c @@ -329,6 +329,9 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out; rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); + if (rc) + goto err_out_regions; + rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c index 97f39b9ae9f91..250a9788450b7 100644 --- a/drivers/scsi/sata_svw.c +++ b/drivers/scsi/sata_svw.c @@ -287,6 +287,9 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e goto err_out; rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); + if (rc) + goto err_out_regions; + rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c index 0819825d85e97..770f5a825f2f1 100644 --- a/drivers/scsi/sata_via.c +++ b/drivers/scsi/sata_via.c @@ -187,10 +187,10 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_regions; } - rc = pci_set_dma_mask(pdev, 0xffffffffULL); + rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; - rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL); + rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; -- 2.53.0