]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
ipr: Clear interrupt on croc/crocodile when running with LSI
authorBrian King <brking@linux.vnet.ibm.com>
Mon, 27 Jun 2016 14:09:40 +0000 (09:09 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Aug 2016 08:21:03 +0000 (10:21 +0200)
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>
drivers/scsi/ipr.c

index 2b7bc7df1edfa0624225c726aecd00978cfb293a..9d92f798b8b2ad6e587e379661adaa7b8b4fb272 100644 (file)
@@ -9644,6 +9644,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");
        }