static struct endpoint_descriptor *allocate_endpoint()
{
struct endpoint_descriptor *ep;
- //memalign instead of calloc doesn't work here?! WTF
- ep = (struct endpoint_descriptor *)memalign(sizeof(struct endpoint_descriptor), 16);
+ 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);
return ep;
static struct general_td *allocate_general_td(size_t bsize)
{
struct general_td *td;
- td = (struct general_td *)memalign(sizeof(struct general_td), 16);
+ 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);
+ //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(bsize, 16))); //memailgn required here?
+ //align it to 4kb? :O
+ //td->cbp = ACCESS_LE(virt_to_phys(memalign(4096, 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);
}
return td;
printf("********************************************************\n");
}
-
-
-/**
- * Enqueue a transfer descriptor.
- */
-u8 hcdi_enqueue(usb_transfer_descriptor *td) {
- control_quirk(); //required? YES! :O
-
- static struct endpoint_descriptor dummyconfig;
- dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
- dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
-
- printf( "===========================\n"
- "===========================\n");
- 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) {
+static void general_td_fill(struct general_td *dest, usb_transfer_descriptor *src)
+{
+ (void) memcpy((void*) (phys_to_virt(ACCESS_LE(dest->cbp))), src->buffer, src->actlen);
+ dest->flags &= ACCESS_LE(~OHCI_TD_DIRECTION_PID_MASK);
+ switch(src->pid) {
case USB_PID_SETUP:
printf("pid_setup\n");
- tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
+ dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
+ dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_0);
+ dest->flags |= ACCESS_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 |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT);
+ dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+
+ /*
+ * TODO: just temporary solution!
+ * there can be also regular PID_OUT pakets
+ */
+ dest->flags |= ACCESS_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 |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
+ dest->flags |= ACCESS_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 |= ACCESS_LE(OHCI_TD_TOGGLE_CARRY);
+#if 0
+ /* should be done by HC!
+ * first pid_in start with DATA0 */
+ */
+ dummyconfig.headp = ACCESS_LE( src->togl ?
+ ACCESS_LE(dummyconfig.headp) | OHCI_ENDPOINT_TOGGLE_CARRY :
+ ACCESS_LE(dummyconfig.headp) & ~OHCI_ENDPOINT_TOGGLE_CARRY);
+#endif
break;
}
- tmptd->flags |= ACCESS_LE((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0);
+ dest->flags |= ACCESS_LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
+ sync_after_write(dest, sizeof(struct general_td));
+ sync_after_write((void*) phys_to_virt(ACCESS_LE(dest->cbp)), src->actlen);
+}
+
+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);
+}
- printf("tmptd hexdump (before) 0x%08X:\n", tmptd);
- hexdump(tmptd, sizeof(struct general_td));
- 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);
+/**
+ * Enqueue a transfer descriptor.
+ */
+u8 first = 0;
+u8 hcdi_enqueue(usb_transfer_descriptor *td) {
+ static struct general_td *tSetup,*tData;
+ static u32 tSetupbuffer, tDatabuffer, tStatusbuffer;
+ static u32 tSetupblen, tDatablen, tStatusblen;
+
+ if(first == 0) {
+ printf("step 0\n");
+ tSetup = allocate_general_td(td->actlen);
+ general_td_fill(tSetup, td);
+ tSetupbuffer = (u32) phys_to_virt(ACCESS_LE(tSetup->cbp));
+ tSetupblen = td->actlen;
+ first++;
+ return 0;
+ }
+ if(first == 1) {
+ printf("step 1\n");
+ tData = allocate_general_td(td->actlen);
+ general_td_fill(tData, td);
+ tDatabuffer = (u32) phys_to_virt(ACCESS_LE(tData->cbp));
+ tDatablen = td->actlen;
+ first++;
+ return 0;
+ }
+ first = 0;
+ struct general_td *tStatus = allocate_general_td(td->actlen);
+ general_td_fill(tStatus, td);
+ tStatusbuffer = (u32) phys_to_virt(ACCESS_LE(tStatus->cbp));
+ tStatusblen = td->actlen;
- sync_after_write(tmptd, sizeof(struct general_td));
- sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+ printf( "===========================\n"
+ "===========================\n");
+ control_quirk(); //required? YES! :O ... erm... or no? :/ ... in fact I have no idea
+ struct endpoint_descriptor *dummyconfig = allocate_endpoint();
+ dummyconfig->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
+ dummyconfig->headp = dummyconfig->tailp = dummyconfig->nexted = ACCESS_LE(0);
+ 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));
+ write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(dummyconfig));
-#define ED_MASK2 ~0 /*((u32)~0x0f) */
#define ED_MASK ((u32)~0x0f)
- dummyconfig.headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK)));
+ dummyconfig->headp |= ACCESS_LE(virt_to_phys((void*) ((u32)tSetup & ED_MASK)));
+ tSetup->nexttd = ACCESS_LE(virt_to_phys((void*) ((u32)tData & ED_MASK)));
+ tData->nexttd = ACCESS_LE(virt_to_phys((void*) ((u32)tStatus & ED_MASK)));
+
+ sync_after_write(dummyconfig, 16);
+ sync_after_write(tSetup, sizeof(struct general_td));
+ sync_after_write(tData, sizeof(struct general_td));
+ sync_after_write(tStatus, sizeof(struct general_td));
- 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));
+ dump_address(tSetup, sizeof(struct general_td), "tSetup(before)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tSetup->cbp)), tSetupblen, "tSetup->cbp(before)");
- printf("dummyconfig hexdump (before) 0x%08X:\n", &dummyconfig);
- hexdump((void*) &dummyconfig, 16);
+ dump_address(tData, sizeof(struct general_td), "tData(before)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tData->cbp)), tDatablen, "tData->cbp(before)");
- sync_after_write(&dummyconfig, 16);
- write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(&dummyconfig));
+ dump_address(tStatus, sizeof(struct general_td), "tStatus(before)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tStatus->cbp)), tStatusblen, "tStatus->cbp(before)");
- 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);
+ dump_address(dummyconfig, sizeof(struct endpoint_descriptor), "dummyconfig(before)");
+
+ printf("ctrl head: 0x%08X\n", read32(OHCI0_HC_CTRL_HEAD_ED));
+ /* trigger control list */
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 */
- u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
- printf("current: 0x%08X\n", current);
- while(!current) {
- udelay(2);
- current = read32(OHCI0_HC_CTRL_CURRENT_ED);
+ //don't use this quirk stuff here!
+#if 1
+ while(!read32(OHCI0_HC_CTRL_CURRENT_ED)) {
}
+#endif
- udelay(20000);
- current = read32(OHCI0_HC_CTRL_CURRENT_ED);
+ udelay(1000000);
+ u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
printf("current: 0x%08X\n", current);
printf("+++++++++++++++++++++++++++++\n");
- udelay(20000);
-
- 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));
+ udelay(10000000);
- 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);
+ dump_address(tSetup, sizeof(struct general_td), "tSetup(after)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tSetup->cbp)), tSetupblen, "tSetup->cbp(after)");
+ dump_address((void*) tSetupbuffer, tSetupblen, "tSetupbuffer");
+ dbg_td_flag(ACCESS_LE(tSetup->flags));
- sync_before_read(&dummyconfig, 16);
- printf("dummyconfig hexdump (after) 0x%08X:\n", &dummyconfig);
- hexdump((void*) &dummyconfig, 16);
+ dump_address(tData, sizeof(struct general_td), "tData(after)");
+ dump_address((void*) phys_to_virt(ACCESS_LE(tData->cbp)), tDatablen, "tData->cbp(after)");
+ dump_address((void*) tDatabuffer, tDatablen, "tDatabuffer");
+ dbg_td_flag(ACCESS_LE(tData->flags));
- sync_before_read(&hcca_oh0, 256);
- printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
+ dump_address(tStatus, sizeof(struct general_td), "tStatus(after)");
+ //dump_address((void*) phys_to_virt(ACCESS_LE(tStatus->cbp)), tStatusblen, "tStatus->cbp(after)");
+ //dump_address((void*) tStatusbuffer, tStatusblen, "tStatusbuffer");
+ dbg_td_flag(ACCESS_LE(tStatus->flags));
- sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
- (void) memcpy((void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+ dump_address(dummyconfig, sizeof(struct endpoint_descriptor), "dummyconfig(after)");
+ /* disable control list */
write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
- dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
- //should be free'd after taking it from the done queue
- //however, it fails?! WTF
+
+ /*
+ * TD should be free'd after taking it from the done queue.
+ * but we are very very dirty and do it anyway :p
+ */
+
+ /* only when a buffer is allocated */
#if 0
- printf("WTF1\n");
- free(tmptd);
- printf("WTF0\n");
- free((void*) tmptd->cbp);
- printf("WTF3\n");
+ if(td->actlen)
+ free((void*)tStatusbuffer);
+ free(tStatus);
#endif
+ printf("hcdi_enqueue, done!\n");
return 0;
}
{
u32 port = read32(reg);
if((port & RH_PS_CCS) && ((port & RH_PS_CSC) || from_init)) {
- write32(reg, RH_PS_CCS);
write32(reg, RH_PS_CSC);
- wait_ms(200);
+ wait_ms(120);
/* clear CSC flag, set PES and start port reset (PRS) */
write32(reg, RH_PS_PES);
- wait_ms(200);
while(!(read32(reg) & RH_PS_PES)) {
printf("fu\n");
- //write32(reg, RH_PS_PES);
- /*
- printf("OHCI0_HC_RH_DESCRIPTOR_A:\t0x%08X\n", read32(OHCI0_HC_RH_DESCRIPTOR_A));
- printf("OHCI0_HC_RH_DESCRIPTOR_B:\t0x%08X\n", read32(OHCI0_HC_RH_DESCRIPTOR_B));
- printf("OHCI0_HC_RH_STATUS:\t\t0x%08X\n", read32(OHCI0_HC_RH_STATUS));
- printf("OHCI0_HC_RH_PORT_STATUS_1:\t0x%08X\n", read32(OHCI0_HC_RH_PORT_STATUS_1));
- printf("OHCI0_HC_RH_PORT_STATUS_2:\t0x%08X\n", read32(OHCI0_HC_RH_PORT_STATUS_2));
- */
return;
}
- port = read32(reg);
- wait_ms(200);
+
write32(reg, RH_PS_PRS);
/* spin until port reset is complete */
- while((read32(reg) & RH_PS_PRS));
+ while(!(read32(reg) & RH_PS_PRSC)); // hint: it may stuck here
printf("loop done\n");
+ wait_ms(20);
+
(void) usb_add_device();
}
}
}
}
+void show_frame_no()
+{
+ sync_before_read(&hcca_oh0, 256);
+ printf("***** frame_no: %d *****\n", ACCESS_LE(hcca_oh0.frame_no));
+}