usbdwc: sync with sources (Raspberry Pi Model A support)

sys/src/9/bcm/usbdwc.c

@@ -138,9 +138,12 @@ chansetup(Hostchan *hc, Ep *ep)
 		hcc |= Lspddev;
 		/* fall through */
 	case Fullspeed:
+		if(ep->dev->hub > 1){
 			hc->hcsplt = Spltena | POS_ALL | ep->dev->hub<<OHubaddr |
 				ep->dev->port;
 			break;
+		}
+		/* fall through */
 	default:
 		hc->hcsplt = 0;
 		break;
@@ -181,6 +184,8 @@ chandone(void *a)
 	Hostchan *hc;
 
 	hc = a;
+	if(hc->hcint == (Chhltd|Ack))
+		return 0;
 	return (hc->hcint & hc->hcintmsk) != 0;
 }
 
@@ -218,7 +223,8 @@ restart:
 				return intr;
 			}
 			if((intr & mask) == 0){
-				dprint("ep%d.%d await %x intr %x -> %x\n",						ep->dev->nb, ep->nb, mask, ointr, intr);
+				dprint("ep%d.%d await %x intr %x -> %x\n",
+					ep->dev->nb, ep->nb, mask, ointr, intr);
 				goto restart;
 			}
 			now = fastticks(0);
@@ -389,7 +395,7 @@ chanio(Ep *ep, Hostchan *hc, int dir, int pid, void *a, int len)
 		if((i & Xfercomp) == 0 && i != (Chhltd|Ack) && i != Chhltd){
 			if(i & Stall)
 				error(Estalled);
-			if(i & Nyet)
+			if(i & (Nyet|Frmovrun))
 				continue;
 			if(i & Nak){
 				if(ep->ttype == Tintr)
@@ -398,6 +404,7 @@ chanio(Ep *ep, Hostchan *hc, int dir, int pid, void *a, int len)
 					tsleep(&up->sleep, return0, 0, 1);
 				continue;
 			}
+			logdump(ep);
 			print("usbotg: ep%d.%d error intr %8.8ux\n",
 				ep->dev->nb, ep->nb, i);
 			if(i & ~(Chhltd|Ack))
@@ -407,31 +414,33 @@ chanio(Ep *ep, Hostchan *hc, int dir, int pid, void *a, int len)
 					hcdma, hc->hcdma, i, hc->hcint);
 		}
 		n = hc->hcdma - hcdma;
-		if(n == 0)
+		if(n == 0){
 			if((hc->hctsiz & Pktcnt) != (hctsiz & Pktcnt))
 				break;
 			else
 				continue;
+		}
 		if(dir == Epin && ep->ttype == Tbulk && n == nleft){
 			nt = (hctsiz & Xfersize) - (hc->hctsiz & Xfersize);
-			if(nt != n)
+			if(nt != n){
-				if(n == ((nt+3) & ~3))
+				if(n == ROUND(nt, 4))
 					n = nt;
 				else
-					print("usbotg: intr %8.8ux dma "
+					print("usbotg: intr %8.8ux "
-						"%8.8ux-%8.8ux hctsiz "
+						"dma %8.8ux-%8.8ux "
-						"%8.8ux-%8.ux\n",
+						"hctsiz %8.8ux-%8.ux\n",
 						i, hcdma, hc->hcdma, hctsiz,
 						hc->hctsiz);
 			}
+		}
 		if(n > nleft){
-			if(n != ((nleft+3) & ~3))
+			if(n != ROUND(nleft, 4))
 				dprint("too much: wanted %d got %d\n",
 					len, len - nleft + n);
 			n = nleft;
 		}
 		nleft -= n;
-		if(nleft == 0 || n % maxpkt != 0)
+		if(nleft == 0 || (n % maxpkt) != 0)
 			break;
 		if((i & Xfercomp) && ep->ttype != Tctl)
 			break;
@@ -443,6 +452,24 @@ chanio(Ep *ep, Hostchan *hc, int dir, int pid, void *a, int len)
 	return len - nleft;
 }
 
+static long
+multitrans(Ep *ep, Hostchan *hc, int rw, void *a, long n)
+{
+	long sofar, m;
+
+	sofar = 0;
+	do{
+		m = n - sofar;
+		if(m > ep->maxpkt)
+			m = ep->maxpkt;
+		m = chanio(ep, hc, rw == Read? Epin : Epout, ep->toggle[rw],
+			(char*)a + sofar, m);
+		ep->toggle[rw] = hc->hctsiz & Pid;
+		sofar += m;
+	}while(sofar < n && m == ep->maxpkt);
+	return sofar;
+}
+
 static long
 eptrans(Ep *ep, int rw, void *a, long n)
 {
@@ -464,21 +491,9 @@ eptrans(Ep *ep, int rw, void *a, long n)
 		nexterror();
 	}
 	chansetup(hc, ep);
-	if(rw == Read && ep->ttype == Tbulk){
+	if(rw == Read && ep->ttype == Tbulk)
-		long sofar, m;
+		n = multitrans(ep, hc, rw, a, n);
-
+	else{
-		sofar = 0;
-		do{
-			m = n - sofar;
-			if(m > ep->maxpkt)
-				m = ep->maxpkt;
-			m = chanio(ep, hc, Epin, ep->toggle[rw],
-				(char*)a + sofar, m);
-			ep->toggle[rw] = hc->hctsiz & Pid;
-			sofar += m;
-		}while(sofar < n && m == ep->maxpkt);
-		n = sofar;
-	}else{
 		n = chanio(ep, hc, rw == Read? Epin : Epout, ep->toggle[rw],
 			a, n);
 		ep->toggle[rw] = hc->hctsiz & Pid;
@@ -529,6 +544,10 @@ ctltrans(Ep *ep, uchar *req, long n)
 	chansetup(hc, ep);
 	chanio(ep, hc, Epout, SETUP, req, Rsetuplen);
 	if(req[Rtype] & Rd2h){
+		if(ep->dev->hub <= 1){
+			ep->toggle[Read] = DATA1;
+			b->wp += multitrans(ep, hc, Read, data, datalen);
+		}else
 			b->wp += chanio(ep, hc, Epin, DATA1, data, datalen);
 		chanio(ep, hc, Epout, DATA1, nil, 0);
 		n = Rsetuplen;
@@ -639,10 +658,12 @@ fiqintr(Ureg*, void *a)
 	if(intr & Hcintr){
 		haint = r->haint & r->haintmsk;
 		for(i = 0; haint; i++){
-			if(haint & 1 && chanintr(ctlr, i) == 0){
+			if(haint & 1){
+				if(chanintr(ctlr, i) == 0){
 					r->haintmsk &= ~(1<<i);
 					wakechan |= 1<<i;
 				}
+			}
 			haint >>= 1;
 		}
 	}