From patchwork Mon Jun 27 14:09:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian King X-Patchwork-Id: 9200687 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B097060752 for ; Mon, 27 Jun 2016 14:10:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A094128592 for ; Mon, 27 Jun 2016 14:10:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9192E2859B; Mon, 27 Jun 2016 14:10:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 198D728592 for ; Mon, 27 Jun 2016 14:10:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751644AbcF0OKI (ORCPT ); Mon, 27 Jun 2016 10:10:08 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:45805 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750870AbcF0OKG (ORCPT ); Mon, 27 Jun 2016 10:10:06 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5RE3uYv129755 for ; Mon, 27 Jun 2016 10:10:05 -0400 Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) by mx0b-001b2d01.pphosted.com with ESMTP id 23sjvwjdky-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 27 Jun 2016 10:10:05 -0400 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 27 Jun 2016 08:10:03 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 27 Jun 2016 08:09:43 -0600 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: brking@linux.vnet.ibm.com Received: from b01cxnp23032.gho.pok.ibm.com (b01cxnp23032.gho.pok.ibm.com [9.57.198.27]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 836A41FF0064; Mon, 27 Jun 2016 08:09:26 -0600 (MDT) Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u5RE9iBe55902244; Mon, 27 Jun 2016 14:09:44 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 269DDAE05C; Mon, 27 Jun 2016 10:09:42 -0400 (EDT) Received: from localhost.localdomain (unknown [9.10.86.84]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id BC090AE04B; Mon, 27 Jun 2016 10:09:41 -0400 (EDT) Subject: [PATCH 1/1] ipr: Clear interrupt on croc/crocodile when running with LSI To: James.Bottomley@HansenPartnership.com Cc: linux-scsi@vger.kernel.org, wenxiong@linux.vnet.ibm.com, brking@linux.vnet.ibm.com, stable@vger.kernel.org, benh@kernel.crashing.org From: Brian King Date: Mon, 27 Jun 2016 09:09:40 -0500 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062714-0004-0000-0000-00000FC78C1C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062714-0005-0000-0000-0000768B51CA Message-Id: <20160627140941.BC090AE04B@b01ledav005.gho.pok.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-27_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606270150 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: Benjamin Herrenschmidt Signed-off-by: Brian King --- drivers/scsi/ipr.c | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/scsi/ipr.c~ipr_clear_isr drivers/scsi/ipr.c --- linux-2.6.git/drivers/scsi/ipr.c~ipr_clear_isr 2016-06-24 17:37:24.265197867 -0500 +++ linux-2.6.git-bjking1/drivers/scsi/ipr.c 2016-06-24 17:38:39.640943642 -0500 @@ -10097,6 +10097,7 @@ static int ipr_probe_ioa(struct pci_dev 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"); }