git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From cb590700e04d4f59179c44f360217f5ad04ae262 Mon Sep 17 00:00:00 2001
   2 From: "himanshu.madhani@cavium.com" <himanshu.madhani@cavium.com>
   3 Date: Wed, 24 May 2017 18:06:18 -0700
   4 Subject: scsi: qla2xxx: Fix recursive loop during target mode configuration for ISP25XX leaving system unresponsive
   5
   6 From: himanshu.madhani@cavium.com <himanshu.madhani@cavium.com>
   7
   8 commit cb590700e04d4f59179c44f360217f5ad04ae262 upstream.
   9
  10 Following messages are seen into system logs
  11
  12 qla2xxx [0000:09:00.0]-00af:9: Performing ISP error recovery - ha=ffff98315ee30000.
  13 qla2xxx [0000:09:00.0]-504b:9: RISC paused -- HCCR=40, Dumping firmware.
  14 qla2xxx [0000:09:00.0]-d009:9: Firmware has been previously dumped (ffffba488c001000) -- ignoring request.
  15 qla2xxx [0000:09:00.0]-504b:9: RISC paused -- HCCR=40, Dumping firmware.
  16
  17 See Bugzilla for details
  18 https://bugzilla.kernel.org/show_bug.cgi?id=195285
  19
  20 Fixes: d74595278f4ab ("scsi: qla2xxx: Add multiple queue pair functionality.")
  21 Reported-by: Laurence Oberman <loberman@redhat.com>
  22 Reported-by: Anthony Bloodoff <anthony.bloodoff@gmail.com>
  23 Tested-by: Laurence Oberman <loberman@redhat.com>
  24 Tested-by: Anthony Bloodoff <anthony.bloodoff@gmail.com>
  25 Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
  26 Signed-off-by: Giridhar Malavali <giridhar.malavali@cavium.com>
  27 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  28 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  29
  30 ---
  31  drivers/scsi/qla2xxx/qla_isr.c |    2 +-
  32  1 file changed, 1 insertion(+), 1 deletion(-)
  33
  34 --- a/drivers/scsi/qla2xxx/qla_isr.c
  35 +++ b/drivers/scsi/qla2xxx/qla_isr.c
  36 @@ -3282,7 +3282,7 @@ msix_register_fail:
  37         }
  38
  39         /* Enable MSI-X vector for response queue update for queue 0 */
  40 -       if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {
  41 +       if (IS_QLA25XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha)) {
  42                 if (ha->msixbase && ha->mqiobase &&
  43                     (ha->max_rsp_queues > 1 || ha->max_req_queues > 1 ||
  44                      ql2xmqsupport))