Author: mjacob
Date: Thu Mar 28 14:25:09 2013
New Revision: 248831
URL: http://svnweb.freebsd.org/changeset/base/248831
Log:
MFC 247266
Don't try and negotiate sync mode if either period or offset are zero.
Modified:
stable/9/sys/dev/sym/sym_hipd.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/sym/sym_hipd.c
==============================================================================
--- stable/9/sys/dev/sym/sym_hipd.c Thu Mar 28 14:14:28 2013
(r248830)
+++ stable/9/sys/dev/sym/sym_hipd.c Thu Mar 28 14:25:09 2013
(r248831)
@@ -8245,8 +8245,13 @@ static void sym_update_trans(hcb_p np, t
* 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.
@@ -8265,21 +8270,23 @@ static void sym_update_trans(hcb_p np, t
/*
* 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;
+ }
}
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
