[SCSI] hpsa: call pci_disable_device on driver unload

As Jenx Axboe explained to me: "In earlier times (2.6.18 and pre, iirc), Linux
disabled IO and mem bars on pci_disable_device(). Now in newer kernel it does
not. And in the newer kernels you run into problems if you DON'T disable the
device on exit, since when it later loads the device is already in the enabled
state - and pci_enable_device() then does nothing. This typically screws
MSI/MSI-X." This is what the big scary comment that says pci_disable_device
does "something nasty" to smart arrays was evidently referring to.

If pci_disable_device is not called on driver rmmod, subsequently insmod'ing
the driver may in result in some cases fail to be able to receive interrupts,
esp.  if other drivers are loaded between unloading and loading hpsa.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f49047478c94c4fb9b8b0c1980196b6389aa4fbf..732ae3dc04497a58c4dc8f86911d4c3e2a7b34a5 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3984,10 +3984,7 @@ err_out_free_res:
                iounmap(h->cfgtable);
        if (h->vaddr)
                iounmap(h->vaddr);
-       /*
-        * Deliberately omit pci_disable_device(): it does something nasty to
-        * Smart Array controllers that pci_enable_device does not undo
-        */
+       pci_disable_device(h->pdev);
        pci_release_regions(h->pdev);
        return err;
 }
@@ -4526,10 +4523,7 @@ static void __devexit hpsa_remove_one(struct pci_dev *pdev)
        kfree(h->cmd_pool_bits);
        kfree(h->blockFetchTable);
        kfree(h->hba_inquiry_data);
-       /*
-        * Deliberately omit pci_disable_device(): it does something nasty to
-        * Smart Array controllers that pci_enable_device does not undo
-        */
+       pci_disable_device(pdev);
        pci_release_regions(pdev);
        pci_set_drvdata(pdev, NULL);
        kfree(h);