From 9cdcf100c10c175ac4b8c1a0a711c27642fbaf8b Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Mon, 25 Feb 2013 14:06:24 +0000
Subject: Don't try and negotiate sync mode if either period or offset are
 zero.

PR:		kern/163064
Partially Submitted by:	Peter <pmc@citylink.dinoex.sub.org>
MFC after:	1 month
---
 sys/dev/sym/sym_hipd.c | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'sys/dev/sym')

diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 68ad77f68f93..7eebfd3ffc2a 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -8211,8 +8211,13 @@ static void sym_update_trans(hcb_p np, tcb_p tp, struct sym_trans *tip,
 	 *  Scale against driver configuration limits.
 	 */
 	if (tip->width  > SYM_SETUP_MAX_WIDE) tip->width  = SYM_SETUP_MAX_WIDE;
-	if (tip->offset > SYM_SETUP_MAX_OFFS) tip->offset = SYM_SETUP_MAX_OFFS;
-	if (tip->period < SYM_SETUP_MIN_SYNC) tip->period = SYM_SETUP_MIN_SYNC;
+	if (tip->period && tip->offset) {
+		if (tip->offset > SYM_SETUP_MAX_OFFS) tip->offset = SYM_SETUP_MAX_OFFS;
+		if (tip->period < SYM_SETUP_MIN_SYNC) tip->period = SYM_SETUP_MIN_SYNC;
+	} else {
+		tip->offset = 0;
+		tip->period = 0;
+	}
 
 	/*
 	 *  Scale against actual controller BUS width.
@@ -8231,21 +8236,23 @@ static void sym_update_trans(hcb_p np, tcb_p tp, struct sym_trans *tip,
 	/*
 	 *  Scale period factor and offset against controller limits.
 	 */
-	if (tip->options & PPR_OPT_DT) {
-		if (tip->period < np->minsync_dt)
-			tip->period = np->minsync_dt;
-		if (tip->period > np->maxsync_dt)
-			tip->period = np->maxsync_dt;
-		if (tip->offset > np->maxoffs_dt)
-			tip->offset = np->maxoffs_dt;
-	}
-	else {
-		if (tip->period < np->minsync)
-			tip->period = np->minsync;
-		if (tip->period > np->maxsync)
-			tip->period = np->maxsync;
-		if (tip->offset > np->maxoffs)
-			tip->offset = np->maxoffs;
+	if (tip->offset && tip->period) {
+		if (tip->options & PPR_OPT_DT) {
+			if (tip->period < np->minsync_dt)
+				tip->period = np->minsync_dt;
+			if (tip->period > np->maxsync_dt)
+				tip->period = np->maxsync_dt;
+			if (tip->offset > np->maxoffs_dt)
+				tip->offset = np->maxoffs_dt;
+		}
+		else {
+			if (tip->period < np->minsync)
+				tip->period = np->minsync;
+			if (tip->period > np->maxsync)
+				tip->period = np->maxsync;
+			if (tip->offset > np->maxoffs)
+				tip->offset = np->maxoffs;
+		}
 	}
 }
 
-- 
cgit v1.2.3