Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f82cb92 authored Jul 26, 2007 by James Bottomley Committed by James Bottomley Jul 27, 2007

[SCSI] aic79xx, aic7xxx: Fix incorrect width setting



Wide transfers are required for every setting of PPR apart from QAS.
It seems the DV code starts at the minimum, which turns on DT and Wide
regardless of the setting of max_width.  Redo the PPR and period
setting routines to respect max_width (i.e. start at period = 10 if it
is zero).

This fixes bugzilla 8366

Acked-by: "Freels, James D." <freelsjd@ornl.gov>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 281afe19

drivers/scsi/aic7xxx/aic79xx_osm.c

+13 −10

Original line number	Diff line number	Diff line
		@@ -2284,9 +2284,12 @@ static void ahd_linux_set_period(struct scsi_target *starget, int period)
		if (period < 8)
		period = 8;
		if (period < 10) {
		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,

drivers/scsi/aic7xxx/aic7xxx_osm.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -2317,8 +2317,13 @@ static void ahc_linux_set_period(struct scsi_target *starget, int period)

		if (period < 9)
		period = 9; /* 12.5ns is our minimum */
		if (period == 9)
		if (period == 9) {
		if (spi_max_width(starget))
		ppr_options \|= MSG_EXT_PPR_DT_REQ;
		else
		/* need wide for DT and need DT for 12.5 ns */
		period = 10;
		}

		ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
		starget->channel + 'A', ROLE_INITIATOR);
		@@ -2381,7 +2386,7 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
		unsigned long flags;
		struct ahc_syncrate *syncrate;

		if (dt) {
		if (dt && spi_max_width(starget)) {
		ppr_options \|= MSG_EXT_PPR_DT_REQ;
		if (!width)
		ahc_linux_set_width(starget, 1);