diff options
| author | mjacob <mjacob@FreeBSD.org> | 2013-02-25 14:06:24 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2013-02-25 14:06:24 +0000 |
| commit | 45aa5f8ade6f19f71ec9cdd068cc159d90abfab8 (patch) | |
| tree | e1db830009c9838ed222d8b70304708699d0bd3a /sys/dev | |
| parent | 935fd1194aa4a1bf2f3e80315a915faa331dc729 (diff) | |
| download | FreeBSD-src-45aa5f8ade6f19f71ec9cdd068cc159d90abfab8.zip FreeBSD-src-45aa5f8ade6f19f71ec9cdd068cc159d90abfab8.tar.gz | |
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
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sym/sym_hipd.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 68ad77f..7eebfd3 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; + } } } |
