Attachment 156299 Details for Bug 242828 – patch to fix overrun/underrun handling

[patch] patch to fix overrun/underrun handling

patch.isr (text/plain), 3.19 KB, created by David Somayajulu on 2007-06-06 01:36:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Somayajulu

Created: 2007-06-06 01:36:50 UTC

Size: 3.19 KB

patch

obsolete

>diff -uarp linux-2.6.18.noarch.work.patch4.ipv6/drivers/scsi/qla4xxx/ql4_isr.c linux-2.6.18.noarch.work/drivers/scsi/qla4xxx/ql4_isr.c
>--- linux-2.6.18.noarch.work.patch4.ipv6/drivers/scsi/qla4xxx/ql4_isr.c	2007-06-05 18:17:20.000000000 -0700
>+++ linux-2.6.18.noarch.work/drivers/scsi/qla4xxx/ql4_isr.c	2007-06-05 18:20:09.000000000 -0700
>@@ -93,9 +93,18 @@ static void qla4xxx_status_entry(struct 
> 			break;
> 		}
> 
>-		if (sts_entry->iscsiFlags &
>-		    (ISCSI_FLAG_RESIDUAL_OVER|ISCSI_FLAG_RESIDUAL_UNDER))
>+		if (sts_entry->iscsiFlags & ISCSI_FLAG_RESIDUAL_OVER) {
>+			cmd->result = DID_ERROR << 16;
>+			break;
>+		}
>+		if (sts_entry->iscsiFlags & ISCSI_FLAG_RESIDUAL_UNDER) {
> 			cmd->resid = residual;
>+			if (!scsi_status && ((cmd->request_bufflen - residual) <
>+				   cmd->underflow)) {
>+				cmd->result = DID_ERROR << 16;
>+				break;
>+			}
>+		}
> 
> 		cmd->result = DID_OK << 16 | scsi_status;
> 
>@@ -164,7 +173,8 @@ static void qla4xxx_status_entry(struct 
> 
> 	case SCS_DATA_UNDERRUN:
> 	case SCS_DATA_OVERRUN:
>-		if (sts_entry->iscsiFlags & ISCSI_FLAG_RESIDUAL_OVER) {
>+		if ((sts_entry->iscsiFlags & ISCSI_FLAG_RESIDUAL_OVER) ||
>+			(sts_entry->completionStatus == SCS_DATA_OVERRUN)) {
> 			DEBUG2(printk("scsi%ld:%d:%d:%d: %s: " "Data overrun, "
> 				      "residual = 0x%x\n", ha->host_no,
> 				      cmd->device->channel, cmd->device->id,
>@@ -174,21 +184,7 @@ static void qla4xxx_status_entry(struct 
> 			break;
> 		}
> 
>-		if ((sts_entry->iscsiFlags & ISCSI_FLAG_RESIDUAL_UNDER) == 0) {
>-			/*
>-			 * Firmware detected a SCSI transport underrun
>-			 * condition
>-			 */
>-			cmd->resid = residual;
>-			DEBUG2(printk("scsi%ld:%d:%d:%d: %s: UNDERRUN status "
>-				      "detected, xferlen = 0x%x, residual = "
>-				      "0x%x\n",
>-				      ha->host_no, cmd->device->channel,
>-				      cmd->device->id,
>-				      cmd->device->lun, __func__,
>-				      cmd->request_bufflen,
>-				      residual));
>-		}
>+		cmd->resid = residual;
> 
> 		/*
> 		 * If there is scsi_status, it takes precedense over
>@@ -245,13 +241,13 @@ static void qla4xxx_status_entry(struct 
> 				 * will return DID_ERROR.
> 				 */
> 				DEBUG2(printk("scsi%ld:%d:%d:%d: %s: "
>-					      "Mid-layer Data underrun, "
>-					      "xferlen = 0x%x, "
>-					      "residual = 0x%x\n", ha->host_no,
>-					      cmd->device->channel,
>-					      cmd->device->id,
>-					      cmd->device->lun, __func__,
>-					      cmd->request_bufflen, residual));
>+ 					"Mid-layer Data underrun len = 0x%x, "
>+					"resid = 0x%x, compstat = 0x%x\n",
>+					ha->host_no, cmd->device->channel,
>+					cmd->device->id, cmd->device->lun,
>+					__func__, cmd->request_bufflen,
>+					residual,
>+					sts_entry->completionStatus));
> 
> 				cmd->result = DID_ERROR << 16;
> 			} else {
>diff -uarp linux-2.6.18.noarch.work.patch4.ipv6/drivers/scsi/qla4xxx/ql4_version.h linux-2.6.18.noarch.work/drivers/scsi/qla4xxx/ql4_version.h
>--- linux-2.6.18.noarch.work.patch4.ipv6/drivers/scsi/qla4xxx/ql4_version.h	2007-06-05 18:17:20.000000000 -0700
>+++ linux-2.6.18.noarch.work/drivers/scsi/qla4xxx/ql4_version.h	2007-06-05 18:29:41.000000000 -0700
>@@ -5,5 +5,5 @@
>  * See LICENSE.qla4xxx for copyright and licensing details.
>  */
> 
>-#define QLA4XXX_DRIVER_VERSION	"5.01.00-k7_rhel5"
>+#define QLA4XXX_DRIVER_VERSION	"5.01.00-k8_rhel5"
>

Actions: View | Diff

Attachments on bug 242828: 156299 | 156533