From: Don Brace Date: Fri, 6 May 2016 19:16:15 +0000 (-0700) Subject: hpsa: correct initialization order issue X-Git-Tag: v4.1.12-92~161^2~7 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8959df7c543ce5a9dd03909624a2f04c40ab408c;p=users%2Fjedix%2Flinux-maple.git hpsa: correct initialization order issue The driver was calling scsi_scan_host before enabling interrupts. This has gone unnoticed except for customers running in intx mode. Calling scsi_scan_host before interrupts are enabled causes "irq XX: nobody cared" messages and the driver to hang. This patch enables interrupts before the call to scsi_scan_host. Reported-by: Piotr Karbowski Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Reviewed-by: Johannes Thumshirn Signed-off-by: Don Brace Orabug: 23064595 Signed-off-by: Manjunath Govindashetty --- diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 81c9c13ce7691..6b178e42605c3 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -8582,11 +8582,6 @@ reinit_after_soft_reset: if (rc) goto clean6; /* sg, cmd, irq, shost, pci, lu, aer/h */ - /* hook into SCSI subsystem */ - rc = hpsa_scsi_add_host(h); - if (rc) - goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h */ - /* create the resubmit workqueue */ h->rescan_ctlr_wq = hpsa_create_controller_wq(h, "rescan"); if (!h->rescan_ctlr_wq) { @@ -8683,6 +8678,11 @@ reinit_after_soft_reset: dev_info(&h->pdev->dev, "Can't track change to report lun data\n"); + /* hook into SCSI subsystem */ + rc = hpsa_scsi_add_host(h); + if (rc) + goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h */ + /* Monitor the controller for firmware lockups */ h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL; INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker);