Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (28 commits)
  [SCSI] mpt fusion: Changes in mptctl.c for logging support
  [SCSI] mpt fusion: Changes in mptfc.c mptlan.c mptsas.c and mptspi.c for logging support
  [SCSI] mpt fusion: Changes in mptscsih.c for logging support
  [SCSI] mpt fusion: Changes in mptbase.c for logging support
  [SCSI] mpt fusion: logging support in Kconfig, Makefile, mptbase.h and addition of mptdebug.h
  [SCSI] libsas: Fix potential NULL dereference in sas_smp_get_phy_events()
  [SCSI] bsg: Fix build for CONFIG_BLOCK=n
  [SCSI] aacraid: fix Sunrise Lake reset handling
  [SCSI] aacraid: add SCSI SYNCHONIZE_CACHE range checking
  [SCSI] add easyRAID to the no report luns blacklist
  [SCSI] advansys: lindent and other large, uninteresting changes
  [SCSI] aic79xx, aic7xxx: Fix incorrect width setting
  [SCSI] qla2xxx: fix to honor ignored parameters in sysfs attributes
  [SCSI] aacraid: draw line in sand, sundry cleanup and version update
  [SCSI] iscsi_tcp: Turn off bounce buffers
  [SCSI] libiscsi: fix cmd seqeunce number checking
  [SCSI] iscsi_tcp, ib_iser Enable module refcounting for iscsi host template
  [SCSI] libiscsi: make sure session is not blocked when removing host
  [SCSI] libsas: Remove PCI dependencies
  [SCSI] simscsi: convert to use the data buffer accessors
  ...

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 286ab83116f9..a055a96e3ad3 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -2284,9 +2284,12 @@ static void ahd_linux_set_period(struct scsi_target *starget, int period)
         if (period < 8)
                 period = 8;
         if (period < 10) {
-                ppr_options |= MSG_EXT_PPR_DT_REQ;
-                if (period == 8)
-                        ppr_options |= MSG_EXT_PPR_IU_REQ;
+                if (spi_max_width(starget)) {
+                        ppr_options |= MSG_EXT_PPR_DT_REQ;
+                        if (period == 8)
+                                ppr_options |= MSG_EXT_PPR_IU_REQ;
+                } else
+                        period = 10;
         }
 
         dt = ppr_options & MSG_EXT_PPR_DT_REQ;
@@ -2365,7 +2368,7 @@ static void ahd_linux_set_dt(struct scsi_target *starget, int dt)
                 printf("%s: %s DT\n", ahd_name(ahd), 
                        dt ? "enabling" : "disabling");
 #endif
-        if (dt) {
+        if (dt && spi_max_width(starget)) {
                 ppr_options |= MSG_EXT_PPR_DT_REQ;
                 if (!width)
                         ahd_linux_set_width(starget, 1);
@@ -2447,7 +2450,7 @@ static void ahd_linux_set_iu(struct scsi_target *starget, int iu)
                        iu ? "enabling" : "disabling");
 #endif
 
-        if (iu) {
+        if (iu && spi_max_width(starget)) {
                 ppr_options |= MSG_EXT_PPR_IU_REQ;
                 ppr_options |= MSG_EXT_PPR_DT_REQ; /* IU requires DT */
         }
@@ -2487,7 +2490,7 @@ static void ahd_linux_set_rd_strm(struct scsi_target *starget, int rdstrm)
                        rdstrm  ? "enabling" : "disabling");
 #endif
 
-        if (rdstrm)
+        if (rdstrm && spi_max_width(starget))
                 ppr_options |= MSG_EXT_PPR_RD_STRM;
 
         ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
@@ -2523,7 +2526,7 @@ static void ahd_linux_set_wr_flow(struct scsi_target *starget, int wrflow)
                        wrflow ? "enabling" : "disabling");
 #endif
 
-        if (wrflow)
+        if (wrflow && spi_max_width(starget))
                 ppr_options |= MSG_EXT_PPR_WR_FLOW;
 
         ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
@@ -2567,7 +2570,7 @@ static void ahd_linux_set_rti(struct scsi_target *starget, int rti)
                        rti ? "enabling" : "disabling");
 #endif
 
-        if (rti)
+        if (rti && spi_max_width(starget))
                 ppr_options |= MSG_EXT_PPR_RTI;
 
         ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
@@ -2603,7 +2606,7 @@ static void ahd_linux_set_pcomp_en(struct scsi_target *starget, int pcomp)
                        pcomp ? "Enable" : "Disable");
 #endif
 
-        if (pcomp) {
+        if (pcomp && spi_max_width(starget)) {
                 uint8_t precomp;
 
                 if (ahd->unit < ARRAY_SIZE(aic79xx_iocell_info)) {
@@ -2647,7 +2650,7 @@ static void ahd_linux_set_hold_mcs(struct scsi_target *starget, int hold)
         unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
         unsigned long flags;
 
-        if (hold)
+        if (hold && spi_max_width(starget))
                 ppr_options |= MSG_EXT_PPR_HOLD_MCS;
 
         ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,