Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=428ed6024fa74a271142f3257966e9b5e1cb37a1
Commit:     428ed6024fa74a271142f3257966e9b5e1cb37a1
Parent:     e00c5d8b4d800b95b72b3f072e1d55d7c7034702
Author:     Dan Aloni <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 8 09:57:36 2007 -0800
Committer:  Dan Williams <[EMAIL PROTECTED]>
CommitDate: Wed Jul 11 16:10:53 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Chris Leech <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
 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 b3fca12..c4209af 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to