Attachment 66313 Details for Bug 145759

[patch] aic7xxx-disable-tcq-fix

aic7xxx-disable-tcq-fix (text/plain), 2.09 KB, created by Hannes Reinecke on 2006-02-03 10:00:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hannes Reinecke

Created: 2006-02-03 10:00:14 UTC

Size: 2.09 KB

patch

obsolete

>Subject: aic7xxx fails to install
>References: 145759
>
>Occasionally aic7{9,x}xx simply fails to work. This might be due to
>incorrect queue_depth handling of the driver; is sets a default queue
>depth of '2' if tagged queuing is disabled. This looks dodgy to say
>the least. Setting it to the expected '1' fixes this problem.
>
>Signed-off-by: Hannes Reinecke <hare@suse.de>
>
>diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
>index 78c8338..b9e3776 100644
>--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
>+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
>@@ -1346,25 +1346,15 @@ ahd_platform_set_tags(struct ahd_softc *
> 
> 	switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
> 	case AHD_DEV_Q_BASIC:
>-		scsi_adjust_queue_depth(sdev,
>-					MSG_SIMPLE_TASK,
>-					dev->openings + dev->active);
>+		scsi_set_tag_type(sdev, MSG_SIMPLE_TASK);
>+		scsi_activate_tcq(sdev, dev->openings + dev->active);
> 		break;
> 	case AHD_DEV_Q_TAGGED:
>-		scsi_adjust_queue_depth(sdev,
>-					MSG_ORDERED_TASK,
>-					dev->openings + dev->active);
>+		scsi_set_tag_type(sdev, MSG_ORDERED_TASK);
>+		scsi_activate_tcq(sdev, dev->openings + dev->active);
> 		break;
> 	default:
>-		/*
>-		 * We allow the OS to queue 2 untagged transactions to
>-		 * us at any time even though we can only execute them
>-		 * serially on the controller/device.  This should
>-		 * remove some latency.
>-		 */
>-		scsi_adjust_queue_depth(sdev,
>-					/*NON-TAGGED*/0,
>-					/*queue depth*/2);
>+		scsi_deactivate_tcq(sdev, 1);
> 		break;
> 	}
> }
>diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
>index 051970e..e3181a3 100644
>--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
>+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
>@@ -1336,13 +1336,7 @@ ahc_platform_set_tags(struct ahc_softc *
> 		scsi_activate_tcq(sdev, dev->openings + dev->active);
> 		break;
> 	default:
>-		/*
>-		 * We allow the OS to queue 2 untagged transactions to
>-		 * us at any time even though we can only execute them
>-		 * serially on the controller/device.  This should
>-		 * remove some latency.
>-		 */
>-		scsi_deactivate_tcq(sdev, 2);
>+		scsi_deactivate_tcq(sdev, 1);
> 		break;
> 	}
> }

Actions: View | Diff

Attachments on bug 145759: 66055 | 66313