From: James Bottomley <James.Bottomley@steeleye.com>
Date: Tue, 2 Aug 2005 14:32:17 +0000 (-0500)
Subject: [SCSI] aic7xxx: final fixes for DT handling
X-Git-Tag: v2.6.13-rc6~53^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=84e66ee7ec7aaa789945403b7cbde7a0b08c15ef;p=linux-2.6-omap-h63xx.git

[SCSI] aic7xxx: final fixes for DT handling

The aic7xxx can support Data Group transfers at periods > 12.5, so
eliminate that restriction.  Additionally wide is a requirement for DT
so ensure wide is set if users request DT.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d0d0b84a31f..d79a2ae8997 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -2429,16 +2429,16 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
 	unsigned int ppr_options = tinfo->goal.ppr_options
 		& ~MSG_EXT_PPR_DT_REQ;
 	unsigned int period = tinfo->goal.period;
+	unsigned int width = tinfo->goal.width;
 	unsigned long flags;
 	struct ahc_syncrate *syncrate;
 
 	if (dt) {
-		period = 9;	/* 12.5ns is the only period valid for DT */
 		ppr_options |= MSG_EXT_PPR_DT_REQ;
-	} else if (period == 9) {
+		if (!width)
+			ahc_linux_set_width(starget, 1);
+	} else if (period == 9)
 		period = 10;	/* if resetting DT, period must be >= 25ns */
-		ppr_options &= ~MSG_EXT_PPR_DT_REQ;
-	}
 
 	ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
 			    starget->channel + 'A', ROLE_INITIATOR);