All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/2] qla4xxx: Driver Fault Recovery
@ 2009-04-24 16:24 Karen Higgins
  2009-04-27 15:09 ` Mike Christie
  0 siblings, 1 reply; 4+ messages in thread
From: Karen Higgins @ 2009-04-24 16:24 UTC (permalink / raw)
  To: linux-scsi@vger.kernel.org

Driver Fault Recovery

Fixed driver bug where adapter recovery did not complete if there were
outstanding commands detected on that host adapter.

Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
---
 drivers/scsi/qla4xxx/ql4_os.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index eb3a414..fcc65a5 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -904,18 +904,17 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha,
     /* Flush any pending ddb changed AENs */
     qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
 
+    qla4xxx_flush_active_srbs(ha);
+
     /* Reset the firmware.    If successful, function
      * returns with ISP interrupts enabled.
      */
-    if (status == QLA_SUCCESS) {
-        DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
-                  ha->host_no, __func__));
-        qla4xxx_flush_active_srbs(ha);
-        if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
-            status = qla4xxx_soft_reset(ha);
-        else
-            status = QLA_ERROR;
-    }
+    DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
+              ha->host_no, __func__));
+    if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
+        status = qla4xxx_soft_reset(ha);
+    else
+        status = QLA_ERROR;
 
     /* Flush any pending ddb changed AENs */
     qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
@@ -1644,7 +1643,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
     ha = (struct scsi_qla_host *) cmd->device->host->hostdata;
 
     dev_info(&ha->pdev->dev,
-           "scsi(%ld:%d:%d:%d): ADAPTER RESET ISSUED.\n", ha->host_no,
+           "scsi(%ld:%d:%d:%d): HOST RESET ISSUED.\n", ha->host_no,
            cmd->device->channel, cmd->device->id, cmd->device->lun);
 
     if (qla4xxx_wait_for_hba_online(ha) != QLA_SUCCESS) {
-- 
1.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] qla4xxx: Driver Fault Recovery
  2009-04-24 16:24 [PATCH 2/2] qla4xxx: Driver Fault Recovery Karen Higgins
@ 2009-04-27 15:09 ` Mike Christie
  2009-04-27 15:13   ` Matthew Wilcox
  0 siblings, 1 reply; 4+ messages in thread
From: Mike Christie @ 2009-04-27 15:09 UTC (permalink / raw)
  To: Karen Higgins; +Cc: linux-scsi@vger.kernel.org

Karen Higgins wrote:
> Driver Fault Recovery
> 
> Fixed driver bug where adapter recovery did not complete if there were
> outstanding commands detected on that host adapter.
> 
> Signed-off-by: Karen Higgins <karen.higgins@qlogic.com>
> ---
>  drivers/scsi/qla4xxx/ql4_os.c |   19 +++++++++----------
>  1 files changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
> index eb3a414..fcc65a5 100644
> --- a/drivers/scsi/qla4xxx/ql4_os.c
> +++ b/drivers/scsi/qla4xxx/ql4_os.c
> @@ -904,18 +904,17 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha,
>      /* Flush any pending ddb changed AENs */
>      qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
>  
> +    qla4xxx_flush_active_srbs(ha);
> +
>      /* Reset the firmware.    If successful, function
>       * returns with ISP interrupts enabled.
>       */
> -    if (status == QLA_SUCCESS) {
> -        DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
> -                  ha->host_no, __func__));
> -        qla4xxx_flush_active_srbs(ha);
> -        if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
> -            status = qla4xxx_soft_reset(ha);
> -        else
> -            status = QLA_ERROR;
> -    }
> +    DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
> +              ha->host_no, __func__));
> +    if (ql4xxx_lock_drvr_wait(ha) == QLA_SUCCESS)
> +        status = qla4xxx_soft_reset(ha);
> +    else
> +        status = QLA_ERROR;
>  
>      /* Flush any pending ddb changed AENs */
>      qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
> @@ -1644,7 +1643,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
>      ha = (struct scsi_qla_host *) cmd->device->host->hostdata;
>  
>      dev_info(&ha->pdev->dev,
> -           "scsi(%ld:%d:%d:%d): ADAPTER RESET ISSUED.\n", ha->host_no,
> +           "scsi(%ld:%d:%d:%d): HOST RESET ISSUED.\n", ha->host_no,
>             cmd->device->channel, cmd->device->id, cmd->device->lun);
>  
>      if (qla4xxx_wait_for_hba_online(ha) != QLA_SUCCESS) {



My mailer is messing up the formatting so it looks like spaces instead 
of tabs are getting adedd. If that is my mailers fault then patch looks ok:

Reviewed-by Mike Christie <michaelc@cs.wisc.edu>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] qla4xxx: Driver Fault Recovery
  2009-04-27 15:09 ` Mike Christie
@ 2009-04-27 15:13   ` Matthew Wilcox
  2009-04-27 15:15     ` Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Matthew Wilcox @ 2009-04-27 15:13 UTC (permalink / raw)
  To: Mike Christie; +Cc: Karen Higgins, linux-scsi@vger.kernel.org

On Mon, Apr 27, 2009 at 10:09:12AM -0500, Mike Christie wrote:
> My mailer is messing up the formatting so it looks like spaces instead 
> of tabs are getting adedd. If that is my mailers fault then patch looks ok:

My mailer's rendering it as:

- ???????????status = QLA_ERROR;
- ???}
+ ???DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
+ ?????????????ha->host_no, __func__));

so there's definitely something weird going on with these patches.

-- 
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] qla4xxx: Driver Fault Recovery
  2009-04-27 15:13   ` Matthew Wilcox
@ 2009-04-27 15:15     ` Christoph Hellwig
  0 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2009-04-27 15:15 UTC (permalink / raw)
  To: Matthew Wilcox; +Cc: Mike Christie, Karen Higgins, linux-scsi@vger.kernel.org

On Mon, Apr 27, 2009 at 09:13:49AM -0600, Matthew Wilcox wrote:
> On Mon, Apr 27, 2009 at 10:09:12AM -0500, Mike Christie wrote:
> > My mailer is messing up the formatting so it looks like spaces instead 
> > of tabs are getting adedd. If that is my mailers fault then patch looks ok:
> 
> My mailer's rendering it as:
> 
> - ???????????status = QLA_ERROR;
> - ???}
> + ???DEBUG2(printk("scsi%ld: %s - Performing soft reset..\n",
> + ?????????????ha->host_no, __func__));
> 
> so there's definitely something weird going on with these patches.

As does my mailer.  I've seen the same mangling for lots of patches on
the X.org list so it must be something fashionable for graphical mailers
or similar :)


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-04-27 15:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-24 16:24 [PATCH 2/2] qla4xxx: Driver Fault Recovery Karen Higgins
2009-04-27 15:09 ` Mike Christie
2009-04-27 15:13   ` Matthew Wilcox
2009-04-27 15:15     ` Christoph Hellwig

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.