X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fhost%2Fohci.c;h=74430ea1c4359d90c1a418decc47ab6a2d0ffa6e;hb=0a6c9cd0c045cc9481147531a8e3cc08aef20a98;hp=bd3793c5a44d943a01f8213a204d93d5ff5e71c1;hpb=19a85313de2d066eff09387bade41a016ad2a6a2;p=ppcskel.git

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index bd3793c..74430ea 100644
--- a/usb/host/ohci.c
+++ b/usb/host/ohci.c
@@ -18,19 +18,21 @@ Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
 #include "host.h"
 #include "../usbspec/usb11spec.h"
 
-// macro for accessing u32 variables that need to be in little endian byte order;
-// whenever you read or write from an u32 field that the ohci host controller
-// will read or write from too, use this macro for access!
-#define ACCESS_LE(dword) (u32)( (((dword) & 0xFF000000) >> 24) | \
+/* macro for accessing u32 variables that need to be in little endian byte order;
+ *
+ * whenever you read or write from an u32 field that the ohci host controller
+ * will read or write from too, use this macro for access!
+ */
+#define LE(dword) (u32)( (((dword) & 0xFF000000) >> 24) | \
 			   (((dword) & 0x00FF0000) >> 8)  | \
 			   (((dword) & 0x0000FF00) << 8)  | \
 			   (((dword) & 0x000000FF) << 24) )
 
 static struct endpoint_descriptor *allocate_endpoint();
-static struct general_td *allocate_general_td(size_t);
+static struct general_td *allocate_general_td();
 static void control_quirk();
 static void dbg_op_state();
-static void dbg_td_flag(u32 flag);
+//static void dbg_td_flag(u32 flag);
 static void configure_ports(u8 from_init);
 static void setup_port(u32 reg, u8 from_init);
 
@@ -41,27 +43,18 @@ static struct endpoint_descriptor *allocate_endpoint()
 {
 	struct endpoint_descriptor *ep;
 	ep = (struct endpoint_descriptor *)memalign(16, sizeof(struct endpoint_descriptor));
-	ep->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
-	ep->headp = ep->tailp = ep->nexted = ACCESS_LE(0);
+	ep->flags = LE(OHCI_ENDPOINT_GENERAL_FORMAT);
+	ep->headp = ep->tailp = ep->nexted = LE(0);
 	return ep;
 }
 
-static struct general_td *allocate_general_td(size_t bsize)
+static struct general_td *allocate_general_td()
 {
 	struct general_td *td;
 	td = (struct general_td *)memalign(16, sizeof(struct general_td));
-	td->flags = ACCESS_LE(0);
-	// TODO !! nexttd?
-	td->nexttd = ACCESS_LE(virt_to_phys(td));
-	//td->nexttd = ACCESS_LE(0);
-	if(bsize == 0) {
-		td->cbp = td->be = ACCESS_LE(0);
-	} else {
-		//td->cbp = ACCESS_LE(virt_to_phys(memalign(16, bsize))); //memailgn required here?
-		td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize)));
-		memset(phys_to_virt(ACCESS_LE(td->cbp)), 0, bsize);
-		td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1);
-	}
+	td->flags = LE(0);
+	td->nexttd = LE(0);
+	td->cbp = td->be = LE(0);
 	return td;
 }
 
@@ -90,8 +83,8 @@ static void control_quirk()
 		}
 
 #define ED_MASK ((u32)~0x0f)
-		ed->tailp = ed->headp = ACCESS_LE(virt_to_phys((void*) ((u32)td & ED_MASK)));
-		ed->flags |= ACCESS_LE(OHCI_ENDPOINT_DIRECTION_OUT);
+		ed->tailp = ed->headp = LE(virt_to_phys((void*) ((u32)td & ED_MASK)));
+		ed->flags |= LE(OHCI_ENDPOINT_DIRECTION_OUT);
 	}
 
 	/*
@@ -159,6 +152,7 @@ static void dbg_op_state()
 	}
 }
 
+#if 0
 static void dbg_td_flag(u32 flag)
 {
 	printf("**************** dbg_td_flag: 0x%08X ***************\n", flag);
@@ -170,139 +164,173 @@ static void dbg_td_flag(u32 flag)
 	printf(" R: %X\n", (flag>>18)&1);
 	printf("********************************************************\n");
 }
+#endif
 
+static void general_td_fill(struct general_td *dest, const usb_transfer_descriptor *src)
+{
+	dest->bufaddr = dest->cbp = LE(virt_to_phys(src->buffer));
+	dest->be = src->actlen ? LE(LE(dest->cbp) + src->actlen - 1) : LE(0);
+	dest->flags &= LE(~OHCI_TD_DIRECTION_PID_MASK);
+	dest->buflen = src->actlen;
 
-
-/**
- * Enqueue a transfer descriptor.
- */
-u8 hcdi_enqueue(usb_transfer_descriptor *td) {
-	control_quirk(); //required? YES! :O
-	u32 tmptdbuffer;
-
-	static struct endpoint_descriptor dummyconfig;
-	memset(&dummyconfig, 0, 16);
-	dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
-	dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
-
-	printf(	"===========================\n"
-			"===========================\n");
-	printf("td->buffer(1): 0x%08X\n", (void*)td->buffer);
-	sync_before_read(&hcca_oh0, 256);
-	printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
-	printf("HCCA->frame_no: %d\nhcca->hccapad1: %d\n",
-			((ACCESS_LE(hcca_oh0.frame_no) & 0xffff)>>16),
-			ACCESS_LE(hcca_oh0.frame_no)&0x0000ffff );
-
-	struct general_td *tmptd = allocate_general_td(td->actlen);
-	(void) memcpy((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))), td->buffer, td->actlen); 
-
-	tmptd->flags &= ACCESS_LE(~OHCI_TD_DIRECTION_PID_MASK);
-	switch(td->pid) {
+	switch(src->pid) {
 		case USB_PID_SETUP:
 			printf("pid_setup\n");
-			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
+			dest->flags |= LE(OHCI_TD_DIRECTION_PID_SETUP);
+			dest->flags |= LE(OHCI_TD_TOGGLE_0);
+			dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
 			break;
 		case USB_PID_OUT:
 			printf("pid_out\n");
-			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT);
+			dest->flags |= LE(OHCI_TD_DIRECTION_PID_OUT);
+			dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
+
+			/*
+			 * TODO: just temporary solution! (consider it with len?)
+			 * there can be also regular PID_OUT pakets
+			 */
+			dest->flags |= LE(OHCI_TD_TOGGLE_1);
 			break;
 		case USB_PID_IN:
 			printf("pid_in\n");
-			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
+			dest->flags |= LE(OHCI_TD_DIRECTION_PID_IN);
+			dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
+			/*
+			 * let the endpoint do the togglestuff!
+			 * TODO: just temporary solution!
+			 * there can be also inregular PID_IN pakets (@Status Stage)
+			 */
+			dest->flags |= LE(OHCI_TD_TOGGLE_CARRY);
+#if 0
+			/* should be done by HC!
+			 * first pid_in start with DATA0 */
+			 */
+			dummyconfig.headp = LE( src->togl ?
+					LE(dummyconfig.headp) | OHCI_ENDPOINT_TOGGLE_CARRY :
+					LE(dummyconfig.headp) & ~OHCI_ENDPOINT_TOGGLE_CARRY);
+#endif
 			break;
 	}
-	tmptd->flags |= ACCESS_LE((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0);
-	//tmptd->flags |= ACCESS_LE(OHCI_TD_TOGGLE_1);
-
-	printf("tmptd hexdump (before) 0x%08X:\n", tmptd);
-	hexdump(tmptd, sizeof(struct general_td));
-	//save buffer adress here; HC may change tmptd->cbp
-	tmptdbuffer = (u32) phys_to_virt(ACCESS_LE(tmptd->cbp)); 
-	printf("tmptd->cbp hexdump (before) 0x%08X:\n", phys_to_virt(ACCESS_LE(tmptd->cbp)));
-	hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-
-	sync_after_write(tmptd, sizeof(struct general_td));
-	sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-
-#define ED_MASK ((u32)~0x0f) 
-	dummyconfig.headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK)));
-
-	dummyconfig.flags |= ACCESS_LE(OHCI_ENDPOINT_LOW_SPEED | 
-		OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) | 
-		OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
-		OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
+	dest->flags |= LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
+#if 1
+	// not necessary here anymore?
+	sync_after_write(dest, sizeof(struct general_td));
+	sync_after_write((void*) phys_to_virt(LE(dest->cbp)), src->actlen);
+#endif
+}
 
-	printf("dummyconfig hexdump (before) 0x%08X:\n", &dummyconfig);
-	hexdump((void*) &dummyconfig, 16);
+static void dump_address(void *addr, u32 size, const char* str)
+{
+	sync_before_read(addr, size);
+	printf("%s hexdump @ 0x%08X:\n", str, addr);
+	hexdump(addr, size);
+}
 
-	sync_after_write(&dummyconfig, 16);
-	write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(&dummyconfig));
+struct endpoint_descriptor *edhead = 0;
+void hcdi_fire()
+{
+	printf("<^>  <^>  <^> hcdi_fire(start)\n");
+
+	control_quirk(); //required? YES! :O ... erm... or no? :/ ... in fact I have no idea
+
+	/* sync it all */
+	sync_after_write(edhead, sizeof(struct endpoint_descriptor));
+	dump_address(edhead, sizeof(struct endpoint_descriptor), "edhead(before)");
+
+	struct general_td *x = phys_to_virt(LE(edhead->headp));
+	while(virt_to_phys(x)) {
+		sync_after_write(x, sizeof(struct general_td));
+		dump_address(x, sizeof(struct general_td), "x(before)");
+		
+		if(x->buflen > 0) {
+			sync_after_write((void*) x->cbp, x->buflen);
+			dump_address((void*) phys_to_virt(LE(x->cbp)), x->buflen, "x->cbp(before)");
+		}
+		x = phys_to_virt(LE(x->nexttd));
+	}
 
-	printf("OHCI_CTRL_CLE: 0x%08X || ", read32(OHCI0_HC_CONTROL)&OHCI_CTRL_CLE);
-	printf("OHCI_CLF: 0x%08X\n", read32(OHCI0_HC_COMMAND_STATUS)&OHCI_CLF);
+	/* trigger control list */
+	u32 wait=0;
 	set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
 	write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
 
-	//printf("+++++++++++++++++++++++++++++\n");
-	/* spin until the controller is done with the control list */
-	//printf("current: 0x%08X\n", current);
-
-	//don't use this quirk stuff here!
+	//don't use this quirk stuff here!?
 #if 1
 	while(!read32(OHCI0_HC_CTRL_CURRENT_ED)) {
 	}
 #endif
-
-	udelay(20000);
-	u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
-	printf("current: 0x%08X\n", current);
 	printf("+++++++++++++++++++++++++++++\n");
-	udelay(20000);
+	printf("wait: %d\n", wait);
+	udelay(100000);
 
-	sync_before_read(tmptd, sizeof(struct general_td));
-	printf("tmptd hexdump (after) 0x%08X:\n", tmptd);
-	hexdump(tmptd, sizeof(struct general_td));
-	dbg_td_flag(ACCESS_LE(tmptd->flags));
-
-	sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-	printf("tmptd->cbp hexdump (after) 0x%08X:\n", phys_to_virt(ACCESS_LE(tmptd->cbp)));
-	hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-
-	sync_before_read(&dummyconfig, 16);
-	printf("dummyconfig hexdump (after) 0x%08X:\n", &dummyconfig);
-	hexdump((void*) &dummyconfig, 16);
+	sync_before_read(&hcca_oh0, sizeof(hcca_oh0));
+	struct general_td *n = phys_to_virt(LE(hcca_oh0.done_head));
+	printf("done_head: 0x%08X\n", n);
+#if 0
+	struct general_td *prev = 0;
+	while(n) {
+		if(prev) {
+			free(prev);
+		}
+		sync_before_read((void*) n, sizeof(struct general_td));
+		dump_address(n, sizeof(struct general_td), "n(after)");
+		dump_address((void*) phys_to_virt(LE(n->cbp)), n->buflen, "n->cbp(after)");
+		dump_address((void*) n->bufaddr, n->buflen, "n->bufaddr(after)");
+		dbg_td_flag(LE(n->flags));
+		n = prev = phys_to_virt(LE(n->nexttd));
+	}
+	hcca_oh0.done_head = 0;
+	sync_after_write(&hcca_oh0, sizeof(hcca_oh0));
+#endif
 
-	sync_before_read(&hcca_oh0, 256);
-	printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
+	write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
 
-	printf("td->buffer(1): 0x%08X\n", (void*)td->buffer);
-	struct general_td* donetd = phys_to_virt(ACCESS_LE(hcca_oh0.done_head)&~1);
-	sync_before_read(donetd, 16);
-	printf("done head hexdump: 0x%08X\n", donetd);
-	hexdump((void*) donetd, 16);
-	printf("td->buffer(2): 0x%08X\n", (void*)td->buffer);
+//	free(edhead);
 
-	sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-	printf("td->buffer: 0x%08X\np2v(A_L(tmptd->cbp: 0x%08X\ntd->actlen: %d\n", (void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-	(void) memcpy((void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+	edhead = 0;
+	printf("<^>  <^>  <^> hcdi_fire(end)\n");
+}
 
-	write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
-	dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
+/**
+ * Enqueue a transfer descriptor.
+ */
+u8 hcdi_enqueue(const usb_transfer_descriptor *td) {
+	printf("*()*()*()*()*()*()*() hcdi_enqueue(start)\n");
+	if(!edhead) {
+		edhead = allocate_endpoint();
+		edhead->flags = LE(OHCI_ENDPOINT_GENERAL_FORMAT);
+		edhead->headp = edhead->tailp = edhead->nexted = LE(0);
+		edhead->flags |= LE(OHCI_ENDPOINT_LOW_SPEED |
+				OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) |
+				OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
+				OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
+		write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(edhead));
+	}
 
+	struct general_td *tdhw = allocate_general_td();
+	general_td_fill(tdhw, td);
 
-	/* 
-	 * TD should be free'd after taking it from the done queue.
-	 * but we are very very dirty and do it anyway :p
-	 */
+#define ED_MASK ((u32)~0x0f)
+	if(!edhead->headp) {
+		/* first transfer */
+		edhead->headp = LE(virt_to_phys((void*) ((u32)tdhw & ED_MASK)));
+	}
+	else {
+		/* headp in endpoint already exists
+		 * => get to list end
+		 */
+		struct general_td *n = (struct general_td*) phys_to_virt(LE(edhead->headp));
+		while(LE(n->nexttd)) {
+			n = phys_to_virt(LE(n->nexttd));
+		}
+		n->nexttd = LE(virt_to_phys((void*) ((u32)tdhw & ED_MASK)));
+	}
 
-	/* only when a buffer is allocated */
-	if(td->actlen)
-		free((void*)tmptdbuffer);
-	free(tmptd);
+	printf("*()*()*()*()*()*()*() hcdi_enqueue(end)\n");
 	return 0;
 }
 
+
 /**
  * Remove an transfer descriptor from transfer queue.
  */
@@ -408,7 +436,7 @@ static void setup_port(u32 reg, u8 from_init)
 	if((port & RH_PS_CCS) && ((port & RH_PS_CSC) || from_init)) {
 		write32(reg, RH_PS_CSC);
 
-		wait_ms(150);
+		wait_ms(120);
 
 		/* clear CSC flag, set PES and start port reset (PRS) */
 		write32(reg, RH_PS_PES);
@@ -497,5 +525,5 @@ void hcdi_irq()
 void show_frame_no()
 {
 	sync_before_read(&hcca_oh0, 256);
-	printf("***** frame_no: %d *****\n", ACCESS_LE(hcca_oh0.frame_no));
+	printf("***** frame_no: %d *****\n", LE(hcca_oh0.frame_no));
 }