summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBrian King <brking@linux.vnet.ibm.com>2016-06-27 09:09:40 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-10 12:54:49 +0200
commit602efc3c6731484a497871abf557290fe4d104be (patch)
tree7681ac43f8d212da12020fcf11a89abe294eea4c /drivers
parent224d3cc7716dac2372df2b52df78067b3482a751 (diff)
downloadlinux-stable-602efc3c6731484a497871abf557290fe4d104be.tar.gz
linux-stable-602efc3c6731484a497871abf557290fe4d104be.tar.bz2
linux-stable-602efc3c6731484a497871abf557290fe4d104be.zip
ipr: Clear interrupt on croc/crocodile when running with LSI
commit 54e430bbd490e18ab116afa4cd90dcc45787b3df upstream. If we fall back to using LSI on the Croc or Crocodile chip we need to clear the interrupt so we don't hang the system. Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/ipr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d6a691e27d33..d6803a9e5ab8 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -10093,6 +10093,7 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
ioa_cfg->intr_flag = IPR_USE_MSI;
else {
ioa_cfg->intr_flag = IPR_USE_LSI;
+ ioa_cfg->clear_isr = 1;
ioa_cfg->nvectors = 1;
dev_info(&pdev->dev, "Cannot enable MSI.\n");
}