diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2005-08-02 10:32:17 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-08-02 11:50:51 -0400 |
commit | 84e66ee7ec7aaa789945403b7cbde7a0b08c15ef (patch) | |
tree | c8f9f71b8a9fea5f44d66b769b635e9f077b9f01 | |
parent | c2c96f46f46df072e49200a1181b3086cd2f08a6 (diff) |
[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>
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index d0d0b84a31f4..d79a2ae89979 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) | |||
2429 | unsigned int ppr_options = tinfo->goal.ppr_options | 2429 | unsigned int ppr_options = tinfo->goal.ppr_options |
2430 | & ~MSG_EXT_PPR_DT_REQ; | 2430 | & ~MSG_EXT_PPR_DT_REQ; |
2431 | unsigned int period = tinfo->goal.period; | 2431 | unsigned int period = tinfo->goal.period; |
2432 | unsigned int width = tinfo->goal.width; | ||
2432 | unsigned long flags; | 2433 | unsigned long flags; |
2433 | struct ahc_syncrate *syncrate; | 2434 | struct ahc_syncrate *syncrate; |
2434 | 2435 | ||
2435 | if (dt) { | 2436 | if (dt) { |
2436 | period = 9; /* 12.5ns is the only period valid for DT */ | ||
2437 | ppr_options |= MSG_EXT_PPR_DT_REQ; | 2437 | ppr_options |= MSG_EXT_PPR_DT_REQ; |
2438 | } else if (period == 9) { | 2438 | if (!width) |
2439 | ahc_linux_set_width(starget, 1); | ||
2440 | } else if (period == 9) | ||
2439 | period = 10; /* if resetting DT, period must be >= 25ns */ | 2441 | period = 10; /* if resetting DT, period must be >= 25ns */ |
2440 | ppr_options &= ~MSG_EXT_PPR_DT_REQ; | ||
2441 | } | ||
2442 | 2442 | ||
2443 | ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, | 2443 | ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, |
2444 | starget->channel + 'A', ROLE_INITIATOR); | 2444 | starget->channel + 'A', ROLE_INITIATOR); |