leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgb4vf: do not use PCI resources before pci_enable_device()

Browse Source 
IRQ and resource[] may not have correct values until
after PCI hotplug setup occurs at pci_enable_device() time.

The semantic match that finds this problem is as follows:

// <smpl>
@@
identifier x;
identifier request ~= "pci_request.*|pci_resource.*";
@@

(
* x->irq
|
* x->resource
|
* request(x, ...)
)
 ...
*pci_enable_device(x)
// </smpl>

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kulikov Vasiliy 2010-08-03 05:43:15 +00:00 committed by David S. Miller
parent 7aaaaa1e44
commit 7a0c2029d6
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/cxgb4vf/cxgb4vf_main.c
View File

@ -2462,15 +2462,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
version_printed = 1; version_printed = 1;
} }
/*
* Reserve PCI resources for the device. If we can't get them some
* other driver may have already claimed the device ...
*/
err = pci_request_regions(pdev, KBUILD_MODNAME);
if (err) {
dev_err(&pdev->dev, "cannot obtain PCI resources\n");
return err;
}
/* /*
* Initialize generic PCI device state. * Initialize generic PCI device state.
@ -2478,7 +2469,17 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) { if (err) {
dev_err(&pdev->dev, "cannot enable PCI device\n"); dev_err(&pdev->dev, "cannot enable PCI device\n");
goto err_release_regions; return err;
}
/*
* Reserve PCI resources for the device. If we can't get them some
* other driver may have already claimed the device ...
*/
err = pci_request_regions(pdev, KBUILD_MODNAME);
if (err) {
dev_err(&pdev->dev, "cannot obtain PCI resources\n");
goto err_disable_device;
} }
/* /*
@ -2491,14 +2492,14 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
if (err) { if (err) {
dev_err(&pdev->dev, "unable to obtain 64-bit DMA for" dev_err(&pdev->dev, "unable to obtain 64-bit DMA for"
" coherent allocations\n"); " coherent allocations\n");
goto err_disable_device; goto err_release_regions;
} }
pci_using_dac = 1; pci_using_dac = 1;
} else { } else {
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
if (err != 0) { if (err != 0) {
dev_err(&pdev->dev, "no usable DMA configuration\n"); dev_err(&pdev->dev, "no usable DMA configuration\n");
goto err_disable_device; goto err_release_regions;
} }
pci_using_dac = 0; pci_using_dac = 0;
} }
@ -2514,7 +2515,7 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
adapter = kzalloc(sizeof(*adapter), GFP_KERNEL); adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
if (!adapter) { if (!adapter) {
err = -ENOMEM; err = -ENOMEM;
goto err_disable_device; goto err_release_regions;
} }
pci_set_drvdata(pdev, adapter); pci_set_drvdata(pdev, adapter);
adapter->pdev = pdev; adapter->pdev = pdev;
@ -2750,13 +2751,13 @@ err_free_adapter:
kfree(adapter); kfree(adapter);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
err_disable_device:
pci_disable_device(pdev);
pci_clear_master(pdev);
err_release_regions: err_release_regions:
pci_release_regions(pdev); pci_release_regions(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
pci_clear_master(pdev);
err_disable_device:
pci_disable_device(pdev);
err_out: err_out:
return err; return err;