GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SCSI] aacraid: Do not set DMA mask to 32 bit first if adapter only supports 31

Browse source 
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Acked-by: Achim Leubner <Achim_Leubner@pmc-sierra.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Rolf Eike Beer 2009-07-01 22:43:39 +02:00 • committed by James Bottomley
parent 0c47087485
commit 0dcae66fd9
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/scsi/aacraid/linit.c
View file

@ -1091,6 +1091,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
struct list_head *insert = &aac_devices; struct list_head *insert = &aac_devices;
int error = -ENODEV; int error = -ENODEV;
int unique_id = 0; int unique_id = 0;
u64 dmamask;
list_for_each_entry(aac, &aac_devices, entry) { list_for_each_entry(aac, &aac_devices, entry) {
if (aac->id > unique_id) if (aac->id > unique_id)
@ -1104,17 +1105,18 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
goto out; goto out;
error = -ENODEV; error = -ENODEV;
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) ||
pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
goto out_disable_pdev;
/* /*
* If the quirk31 bit is set, the adapter needs adapter * If the quirk31 bit is set, the adapter needs adapter
* to driver communication memory to be allocated below 2gig * to driver communication memory to be allocated below 2gig
*/ */
if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(31)) || dmamask = DMA_BIT_MASK(31);
pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(31))) else
goto out_disable_pdev; dmamask = DMA_BIT_MASK(32);
if (pci_set_dma_mask(pdev, dmamask) ||
pci_set_consistent_dma_mask(pdev, dmamask))
goto out_disable_pdev;
pci_set_master(pdev); pci_set_master(pdev);