evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I/OAT: clean up of dca provider start and stop

Browse source 
Don't start ioat_dca if ioat_dma didn't start, and then stop ioat_dca
before stopping ioat_dma.  Since the ioat_dma side does the pci device
work, This takes care of ioat_dca trying to use a bad device reference.

Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Shannon Nelson 2007-10-18 03:07:13 -07:00 • committed by Linus Torvalds
parent 7df7cf0676
commit dfe2299e7b
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/dma/ioat.c
View file

@ -71,7 +71,7 @@ static int ioat_setup_functionality(struct pci_dev *pdev, void __iomem *iobase)
switch (version) { switch (version) {
case IOAT_VER_1_2: case IOAT_VER_1_2:
device->dma = ioat_dma_probe(pdev, iobase); device->dma = ioat_dma_probe(pdev, iobase);
if (ioat_dca_enabled) if (device->dma && ioat_dca_enabled)
device->dca = ioat_dca_init(pdev, iobase); device->dca = ioat_dca_init(pdev, iobase);
break; break;
default: default:
@ -85,17 +85,16 @@ static void ioat_shutdown_functionality(struct pci_dev *pdev)
{ {
struct ioat_device *device = pci_get_drvdata(pdev); struct ioat_device *device = pci_get_drvdata(pdev);
if (device->dma) {
ioat_dma_remove(device->dma);
device->dma = NULL;
}
if (device->dca) { if (device->dca) {
unregister_dca_provider(device->dca); unregister_dca_provider(device->dca);
free_dca_provider(device->dca); free_dca_provider(device->dca);
device->dca = NULL; device->dca = NULL;
} }
if (device->dma) {
ioat_dma_remove(device->dma);
device->dma = NULL;
}
} }
static struct pci_driver ioat_pci_driver = { static struct pci_driver ioat_pci_driver = {

4
drivers/dma/ioat_dma.c
View file

@ -941,10 +941,10 @@ void ioat_dma_remove(struct ioatdma_device *device)
struct dma_chan *chan, *_chan; struct dma_chan *chan, *_chan;
struct ioat_dma_chan *ioat_chan; struct ioat_dma_chan *ioat_chan;
dma_async_device_unregister(&device->common);
ioat_dma_remove_interrupts(device); ioat_dma_remove_interrupts(device);
dma_async_device_unregister(&device->common);
pci_pool_destroy(device->dma_pool); pci_pool_destroy(device->dma_pool);
pci_pool_destroy(device->completion_pool); pci_pool_destroy(device->completion_pool);