diff options
| author | Dan Aloni <da\\-x@monatomic.org> | 2007-03-08 18:57:36 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2007-07-12 01:10:53 +0200 |
| commit | 428ed6024fa74a271142f3257966e9b5e1cb37a1 (patch) | |
| tree | b74af2d50f292ec377a567368e0dd41fe439d1b7 /drivers/dma | |
| parent | I/OAT: warning fix (diff) | |
| download | linux-428ed6024fa74a271142f3257966e9b5e1cb37a1.tar.xz linux-428ed6024fa74a271142f3257966e9b5e1cb37a1.zip | |
I/OAT: fix I/OAT for kexec
Under kexec, I/OAT initialization breaks over busy resources because the
previous kernel did not release them.
I'm not sure this fix can be considered a complete one but it works for me.
I guess something similar to the *_remove method should occur there..
Signed-off-by: Dan Aloni <da-x@monatomic.org>
Signed-off-by: Chris Leech <christopher.leech@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/ioatdma.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c index b3fca1200a73..c4209af4fde4 100644 --- a/drivers/dma/ioatdma.c +++ b/drivers/dma/ioatdma.c @@ -41,6 +41,7 @@ /* internal functions */ static int __devinit ioat_probe(struct pci_dev *pdev, const struct pci_device_id *ent); +static void ioat_shutdown(struct pci_dev *pdev); static void __devexit ioat_remove(struct pci_dev *pdev); static int enumerate_dma_channels(struct ioat_device *device) @@ -557,6 +558,7 @@ static struct pci_driver ioat_pci_driver = { .name = "ioatdma", .id_table = ioat_pci_tbl, .probe = ioat_probe, + .shutdown = ioat_shutdown, .remove = __devexit_p(ioat_remove), }; @@ -781,9 +783,20 @@ err_request_regions: err_set_dma_mask: pci_disable_device(pdev); err_enable_device: + + printk(KERN_ERR "Intel(R) I/OAT DMA Engine initialization failed\n"); + return err; } +static void ioat_shutdown(struct pci_dev *pdev) +{ + struct ioat_device *device; + device = pci_get_drvdata(pdev); + + dma_async_device_unregister(&device->common); +} + static void __devexit ioat_remove(struct pci_dev *pdev) { struct ioat_device *device; |