Attachment 308787 Details for Bug 450645 – 84xx fw_ready fix

[patch] 84xx fw_ready fix

qla2xxx_rhel4.7_84xx_fwready_logic_patch12.txt (text/plain), 1.33 KB, created by Marcus Barrow on 2008-06-10 10:15:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Barrow

Created: 2008-06-10 10:15:35 UTC

Size: 1.33 KB

patch

obsolete

>
>
>BZ 450645 [3/11] several fixes: ioctl module and slab corruption
>
>Correct ISP84XX logic operations in qla2x00_fw_ready().
>
>This patch fixes a simple logic error in init code for 85xx boards,
>which can require more time to initialize.
>
>Tested by QLogic.
>
>---
> drivers/scsi/qla2xxx/qla_init.c |    7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
>index a3cd7a7..fb42132 100644
>--- a/drivers/scsi/qla2xxx/qla_init.c
>+++ b/drivers/scsi/qla2xxx/qla_init.c
>@@ -1299,8 +1299,8 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)
> 				DEBUG16(printk("scsi(%ld): fw_state=%x "
> 				    "84xx=%x.\n", ha->host_no, state[0],
> 				    state[2]));
>-				if (state[2] & (FSTATE_LOGGED_IN |
>-				    FSTATE_WAITING_FOR_VERIFY)) {
>+				if ((state[2] & FSTATE_LOGGED_IN) &&
>+				     (state[2] & FSTATE_WAITING_FOR_VERIFY)) {
> 					DEBUG16(printk("scsi(%ld): Sending "
> 					    "verify iocb.\n", ha->host_no));
> 
>@@ -1311,7 +1311,8 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)
> 
> 					/* Add time taken to initialize. */
> 					cs84xx_time = jiffies - cs84xx_time;
>-					wtime += cs84xx_time * 2;
>+					wtime += cs84xx_time;
>+					mtime += cs84xx_time;
> 					DEBUG16(printk("scsi(%ld): Increasing "
> 					    "wait time by %ld. New time %ld\n",
> 					    ha->host_no, cs84xx_time, wtime));
>-- 
>1.4.4.1
>

Actions: View | Diff

Attachments on bug 450645: 308785 | 308786 | 308787 | 308788 | 308789 | 308790 | 308791 | 308792 | 308793 | 308794 | 308795