[libata] explicitly set consistent DMA mask to 0xffffffff

Do not rely on the default being 0xffffffff.

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 14a30889b4e3c27ae489dd02677f5f83570694f5..1b2dd124192394eeab8d2ab5e6920fbcf6ac401f 100644 (file)
--- 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 c16f887b5a95c98af9b1f5b301913d78129c7b38..7d3ee074b9105316d0074aeb94a4cb1aa2aa7a6d 100644 (file)
--- 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 826804394ddeec9a2a00db6c9539b3850c300725..219dcef7d9eede6624ce1a6e50ad62f8f7b44eec 100644 (file)
--- 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 97f39b9ae9f91af7afd8a2df0ca035d0b9f9ab35..250a9788450b7133643b4fd295150ed327df2752 100644 (file)
--- 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 0819825d85e974bdb2130b9f232d7b71c8f8d356..770f5a825f2f180d10928bc0369590eeb428bc01 100644 (file)
--- 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;