Attachment 145510 Details for Bug 222460 – v5.01.00-d5

[patch] v5.01.00-d5

qla4xxx-5.01.00-d5.patch (text/plain), 3.74 KB, created by Karen Higgins on 2007-01-13 01:04:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karen Higgins

Created: 2007-01-13 01:04:24 UTC

Size: 3.74 KB

patch

obsolete

>diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
>index 0191c6b..122e180 100644
>--- a/drivers/scsi/qla4xxx/ql4_fw.h
>+++ b/drivers/scsi/qla4xxx/ql4_fw.h
>@@ -382,26 +382,6 @@ #define QL4XXX_UNLOCK_FLASH(a)  \
> 	ql4xxx_sem_unlock(a, QL4022_FLASH_SEM_MASK) )
> 
> 
>-#define QL4XXX_LOCK_DRVR_WAIT(a)  \
>-{																					   \
>-    int i = 0;																			   \
>-    while(1) {																		   \
>-        if(QL4XXX_LOCK_DRVR(a) == 0) {										               \
>-	    set_current_state(TASK_UNINTERRUPTIBLE); \
>-	    schedule_timeout(10); \
>-            if(!i) {																   \
>-                DEBUG2(printk("scsi%d: %s: Waiting for Global Init Semaphore...\n", \
>-		a->host_no,__func__)); \
>-                i++;																   \
>-            }																		   \
>-        }																			   \
>-        else {																		   \
>-            DEBUG2(printk("scsi%d: %s: Global Init Semaphore acquired.\n", \
>-	    a->host_no,__func__));		   \
>-            break;																	   \
>-        }																			   \
>-    }																				   \
>-}
> /* Page # defines for 4022 */
> #define PORT_CTRL_STAT_PAGE                     0 /* 4022 */
> #define HOST_MEM_CFG_PAGE                       1 /* 4022 */
>diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
>index 1b6128e..35ff614 100644
>--- a/drivers/scsi/qla4xxx/ql4_os.c
>+++ b/drivers/scsi/qla4xxx/ql4_os.c
>@@ -44,7 +44,6 @@
>  *      qla4xxx_eh_abort
>  *      qla4xxx_hw_reset
>  *      qla4xxx_soft_reset
>- *      qla4xxx_hard_reset
>  *      qla4xxx_cmd_wait
>  *      qla4xxx_recover_adapter
>  *      qla4xxx_eh_wait_for_active_target_commands
>@@ -639,6 +638,7 @@ #endif
> 
> 	/* Issue Soft Reset to put firmware in known state */
> 	QL4PRINT(QLP7, printk("scsi%d: %s: Soft Reset\n",ha->host_no,__func__));
>+	(void)qla4xxx_lock_drvr_wait(ha);
> 	qla4xxx_hw_reset(ha);
> 
> 	/* Remove timer thread, if present */
>@@ -3311,6 +3311,11 @@ void qla4xxx_hw_reset(scsi_qla_host_t *h
>  * Input:
>  *      ha - Pointer to host adapter structure.
>  *
>+ * Prerequisite:
>+ *	Make sure that the DRVR semaphore is taken prior to calling this
>+ *	routine.  It's neccessary for the coexistance of the qla3xxx and
>+ *	qla4xxx cards.
>+ *
>  * Returns:
>  *      QLA_SUCCESS - Successfully reset the firmware
>  *      QLA_ERROR   - Failed to reset the firmware
>@@ -3413,28 +3418,6 @@ qla4xxx_soft_reset(scsi_qla_host_t *ha){
> 	LEAVE(__func__);
> 	return(status);
> }
>-
>-/**************************************************************************
>- * qla4xxx_hard_reset
>- *      This routine performs a HARD RESET.
>- *
>- * Input:
>- *      ha - Pointer to host adapter structure.
>- *
>- * Returns:
>- *      QLA_SUCCESS - Successfully reset the firmware
>- *      QLA_ERROR   - Failed to reset the firmware
>- *
>- * Context:
>- *      Kernel context.
>- **************************************************************************/
>-inline uint8_t
>-qla4xxx_hard_reset(scsi_qla_host_t *ha){
>-	/* The QLA4010 really doesn't have an equivalent to a hard reset */
>-	qla4xxx_flush_active_srbs(ha);
>-	return(qla4xxx_soft_reset(ha));
>-}
>-
> /**************************************************************************
>  * qla4xxx_cmd_wait
>  *      This routine stalls the driver until all outstanding commands are
>diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
>index 63a56b1..9e4386d 100644
>--- a/drivers/scsi/qla4xxx/ql4_version.h
>+++ b/drivers/scsi/qla4xxx/ql4_version.h
>@@ -5,9 +5,9 @@
>  * See LICENSE.qla4xxx for copyright and licensing details.
>  */
> 
>-#define QLA4XXX_DRIVER_VERSION      "5.01.00-d4"
>+#define QLA4XXX_DRIVER_VERSION      "5.01.00-d5"
> 
> #define QL4_DRIVER_MAJOR_VER	5
> #define QL4_DRIVER_MINOR_VER	1
> #define QL4_DRIVER_PATCH_VER	0
>-#define QL4_DRIVER_BETA_VER	4
>+#define QL4_DRIVER_BETA_VER	5

Actions: View | Diff

Attachments on bug 222460: 145510 | 146040