diff options
author | mav <mav@FreeBSD.org> | 2015-04-21 11:27:50 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-04-21 11:27:50 +0000 |
commit | ad311f67aaa6771c007f5046d032924146784a23 (patch) | |
tree | d17cb3a5b3032710bfcc1c88aa4bc18945c01c4d /sys/dev/twe | |
parent | 48e295fadf174a12313b8228f727a9197df52ca9 (diff) | |
download | FreeBSD-src-ad311f67aaa6771c007f5046d032924146784a23.zip FreeBSD-src-ad311f67aaa6771c007f5046d032924146784a23.tar.gz |
MFC r280347: Remove MAXBSIZE use from drivers where it has nothing to do.
In some cases limits are just not needed, in others -- DFLTPHYS is the
right constant to use instead.
Diffstat (limited to 'sys/dev/twe')
-rw-r--r-- | sys/dev/twe/twe.c | 2 | ||||
-rw-r--r-- | sys/dev/twe/twe_freebsd.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c index 0c455c1..51c760c 100644 --- a/sys/dev/twe/twe.c +++ b/sys/dev/twe/twe.c @@ -985,7 +985,7 @@ twe_immediate_request(struct twe_request *tr, int usetmp) if (usetmp && (tr->tr_data != NULL)) { tr->tr_flags |= TWE_CMD_IMMEDIATE; - if (tr->tr_length > MAXBSIZE) + if (tr->tr_length > DFLTPHYS) return (EINVAL); bcopy(tr->tr_data, sc->twe_immediate, tr->tr_length); } diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index aee9ea7..ea9a1f1 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -233,7 +233,8 @@ twe_attach(device_t dev) BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MAXBSIZE, TWE_MAX_SGL_LENGTH, /* maxsize, nsegments */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsize */ + BUS_SPACE_UNRESTRICTED, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ 0, /* flags */ NULL, /* lockfunc */ @@ -301,7 +302,8 @@ twe_attach(device_t dev) BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MAXBSIZE, TWE_MAX_SGL_LENGTH,/* maxsize, nsegments */ + (TWE_MAX_SGL_LENGTH - 1) * PAGE_SIZE,/* maxsize */ + TWE_MAX_SGL_LENGTH, /* nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ busdma_lock_mutex, /* lockfunc */ @@ -320,7 +322,7 @@ twe_attach(device_t dev) BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MAXBSIZE, 1, /* maxsize, nsegments */ + DFLTPHYS, 1, /* maxsize, nsegments */ BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ 0, /* flags */ NULL, /* lockfunc */ |