scsi: qla2xxx: stop timer in shutdown path
authorNicholas Piggin <npiggin@gmail.com>
Thu, 24 Oct 2019 06:38:04 +0000 (16:38 +1000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 29 Oct 2019 01:58:01 +0000 (21:58 -0400)
In shutdown/reboot paths, the timer is not stopped:

  qla2x00_shutdown
  pci_device_shutdown
  device_shutdown
  kernel_restart_prepare
  kernel_restart
  sys_reboot

This causes lockups (on powerpc) when firmware config space access calls
are interrupted by smp_send_stop later in reboot.

Fixes: e30d1756480dc ("[SCSI] qla2xxx: Addition of shutdown callback handler.")
Link: https://lore.kernel.org/r/20191024063804.14538-1-npiggin@gmail.com
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_os.c

index e4d765fc03eaf245b27e98673ed3791fb3c991fc..39f7782a133b94f3197c9a34590669f0a051ec8f 100644 (file)
@@ -3529,6 +3529,10 @@ qla2x00_shutdown(struct pci_dev *pdev)
                qla2x00_try_to_stop_firmware(vha);
        }
 
+       /* Disable timer */
+       if (vha->timer_active)
+               qla2x00_stop_timer(vha);
+
        /* Turn adapter off line */
        vha->flags.online = 0;