From: Brian King <brking@linux.vnet.ibm.com>
Date: Mon, 27 Jun 2016 14:09:40 +0000 (-0500)
Subject: ipr: Clear interrupt on croc/crocodile when running with LSI
X-Git-Tag: v4.1.12-92~15^2~44
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=560ecdda5858ce3ecad9f56bf967b394a5672ef1;p=users%2Fjedix%2Flinux-maple.git

ipr: Clear interrupt on croc/crocodile when running with LSI

Orabug: 25308094

[ Upstream commit 54e430bbd490e18ab116afa4cd90dcc45787b3df ]

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.

Cc: <stable@vger.kernel.org>
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: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit 9e0303eb05f9c4f8920570a4b047e2ae3a7964eb)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index cccab6188328f..cd52c070701b8 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9966,6 +9966,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");
 	}