[src/nick-nhusb]: src/sys/dev/usb Sync with HEAD

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/370beb537347
branches:  nick-nhusb
changeset: 334622:370beb537347
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jan 31 07:25:34 2017 +0000

description:
Sync with HEAD

diffstat:

 sys/dev/usb/ohci.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 60f539a0fde5 -r 370beb537347 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sun Jan 29 15:58:14 2017 +0000
+++ b/sys/dev/usb/ohci.c        Tue Jan 31 07:25:34 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.254.2.84 2016/12/28 10:44:27 skrll Exp $    */
+/*     $NetBSD: ohci.c,v 1.254.2.85 2017/01/31 07:25:34 skrll Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.84 2016/12/28 10:44:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.85 2017/01/31 07:25:34 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -626,22 +626,24 @@
                KASSERT(next != cur);
 
                curlen = 0;
-               ohci_physaddr_t sdataphys = DMAADDR(dma, curoffs);
+               const ohci_physaddr_t sdataphys = DMAADDR(dma, curoffs);
                ohci_physaddr_t edataphys = DMAADDR(dma, curoffs + len - 1);
 
-               ohci_physaddr_t sphyspg = OHCI_PAGE(sdataphys);
+               const ohci_physaddr_t sphyspg = OHCI_PAGE(sdataphys);
                ohci_physaddr_t ephyspg = OHCI_PAGE(edataphys);
                /*
                 * The OHCI hardware can handle at most one page
                 * crossing per TD
                 */
                curlen = len;
-               if (!(sphyspg == ephyspg || sphyspg + 1 == ephyspg)) {
+               if (sphyspg != ephyspg &&
+                   sphyspg + OHCI_PAGE_SIZE != ephyspg) {
                        /* must use multiple TDs, fill as much as possible. */
                        curlen = 2 * OHCI_PAGE_SIZE -
-                           (sdataphys & (OHCI_PAGE_SIZE - 1));
+                           OHCI_PAGE_OFFSET(sdataphys);
                        /* the length must be a multiple of the max size */
                        curlen -= curlen % mps;
+                       edataphys = DMAADDR(dma, curoffs + curlen - 1);
                }
                KASSERT(curlen != 0);
                DPRINTFN(4, "sdataphys=0x%08x edataphys=0x%08x "