Externals/dropbear - Disabled X forwarding

[tpg/acess2.git] / KernelLand / Modules / USB / EHCI / ehci.c

diff --git a/KernelLand/Modules/USB/EHCI/ehci.c b/KernelLand/Modules/USB/EHCI/ehci.c
index af99011..c970eb4 100644 (file)
--- a/KernelLand/Modules/USB/EHCI/ehci.c
+++ b/KernelLand/Modules/USB/EHCI/ehci.c
@@ -79,11 +79,16 @@ int EHCI_Initialise(char **Arguments)
        {
                Uint32  addr = PCI_GetBAR(id, 0);
                if( addr == 0 ) {
-                       // Oops, PCI BIOS emulation time
+                       // TODO: PCI BIOS emulation time
                }
+               if( addr & 1 ) {
+                       // TODO: Error
+                       continue ;
+               }
+               addr &= ~0xF;
                Uint8   irq = PCI_GetIRQ(id);
                if( irq == 0 ) {
-                       // TODO: The same
+                       // TODO: Error?
                }
 
                Log_Log("ECHI", "Controller at PCI %i 0x%x IRQ 0x%x",
@@ -94,9 +99,32 @@ int EHCI_Initialise(char **Arguments)
                        // TODO: Detect other forms of failure than "out of slots"
                        break ;
                }
+       }
 
-               // TODO: Register with the USB stack
+       for( int i = 0; Arguments && Arguments[i]; i ++ )
+       {
+               char *pos = Arguments[i], *next;
+               LOG("pos = '%s'", pos);
+               tPAddr base = strtoull(pos, &next, 16);
+               if( base == 0 )
+                       continue;
+               pos = next;
+               LOG("pos = '%s'", pos);
+               if( *pos++ != '-' )
+                       continue;
+               LOG("pos = '%s'", pos);
+               int irq = strtol(pos, &next, 16);
+               if( irq == 0 )
+                       continue ;
+               if( *next != 0 )
+                       continue;
+               LOG("base=%x, irq=%i", base, irq);
+               if( EHCI_InitController(base, irq) )
+               {
+                       continue ;
+               }
        }
+
        return 0;
 }
 
@@ -130,14 +158,21 @@ int EHCI_InitController(tPAddr BaseAddress, Uint8 InterruptNum)
        cont->TDPool = NULL;
 
        // -- Build up structure --
-       cont->CapRegs = (void*)MM_MapHWPages(BaseAddress, 1);
+       cont->CapRegs = (void*)( MM_MapHWPages(BaseAddress, 1) + (BaseAddress % PAGE_SIZE) );
        if( !cont->CapRegs ) {
                Log_Warning("EHCI", "Can't map 1 page at %P into kernel space", BaseAddress);
                goto _error;
        }
        // TODO: Error check
        if( (cont->CapRegs->CapLength & 3) ) {
-               Log_Warning("EHCI", "Controller at %P non-aligned op regs", BaseAddress);
+               Log_Warning("EHCI", "Controller at %P non-aligned op regs (%x)",
+                       BaseAddress, cont->CapRegs->CapLength);
+               goto _error;
+       }
+       if( BaseAddress % PAGE_SIZE + cont->CapRegs->CapLength + sizeof(tEHCI_CapRegs) > PAGE_SIZE ) {
+               Log_Warning("EHCI", "%P: Cap regs over page boundary (+0x%x bytes)",
+                        BaseAddress % PAGE_SIZE + cont->CapRegs->CapLength + sizeof(tEHCI_CapRegs)
+                        );
                goto _error;
        }
        cont->OpRegs = (void*)( (Uint32*)cont->CapRegs + cont->CapRegs->CapLength / 4 );
@@ -148,6 +183,8 @@ int EHCI_InitController(tPAddr BaseAddress, Uint8 InterruptNum)
                Log_Warning("ECHI", "Can't allocate 1 32-bit page for periodic queue");
                goto _error;
        }
+       for( int i = 0; i < 1024; i ++ )
+               cont->PeriodicQueue[i] = 1;
        // TODO: Error check
        //  > Populate queue
 
@@ -186,6 +223,11 @@ int EHCI_InitController(tPAddr BaseAddress, Uint8 InterruptNum)
        // - Route all ports
        cont->OpRegs->ConfigFlag = 1;
 
+       cont->DeadTD = EHCI_int_AllocateTD(cont, 0, NULL, 0, NULL, NULL);
+       cont->DeadTD->Link = 1;
+       cont->DeadTD->Link2 = 1;
+       cont->DeadTD->Token = 0;
+
        // -- Register with USB Core --
        cont->RootHub = USB_RegisterHost(&gEHCI_HostDef, cont, cont->nPorts);
 
@@ -261,6 +303,8 @@ void *EHCI_InitInterrupt(void *Ptr, int Endpoint, int bOutbound, int Period,
        if( Period > 256 )
                Period = 256;
 
+       LOG("Endpoint=%x, bOutbound=%i, Period=%i, Length=%i", Endpoint, bOutbound, Period, Length);
+
        // Round the period to the closest power of two
        pow2period = 1;
        period_pow = 0;
@@ -366,14 +410,19 @@ void *EHCI_InitControl(void *Ptr, int Endpoint, size_t MaxPacketSize)
        
        // Allocate a QH
        tEHCI_QH *qh = EHCI_int_AllocateQH(Cont, Endpoint, MaxPacketSize);
+       qh->CurrentTD = MM_GetPhysAddr(Cont->DeadTD);
 
        // Append to async list 
        if( Cont->LastAsyncHead ) {
                Cont->LastAsyncHead->HLink = MM_GetPhysAddr(qh)|2;
                Cont->LastAsyncHead->Impl.Next = qh;
+               LOG("- Placed after %p", Cont->LastAsyncHead);
        }
-       else
+       else {
                Cont->OpRegs->AsyncListAddr = MM_GetPhysAddr(qh)|2;
+       }
+       qh->HLink = Cont->OpRegs->AsyncListAddr;
+       Cont->OpRegs->USBCmd |= USBCMD_AsyncEnable;
        Cont->LastAsyncHead = qh;
 
        LOG("Created %p for %p Ep 0x%x - %i bytes MPS", qh, Ptr, Endpoint, MaxPacketSize);
@@ -421,6 +470,8 @@ void *EHCI_SendControl(void *Ptr, void *Dest, tUSBHostCb Cb, void *CbData,
        if( (tVAddr)Dest <= 256*16 )
                return NULL;
 
+       LOG("Dest=%p, isOutbound=%i, Lengths(Setup:%i,Out:%i,In:%i)", Dest, isOutbound, SetupLength, OutLength, InLength);
+
        // Check size of SETUP and status
        
        // Allocate TDs
@@ -434,17 +485,20 @@ void *EHCI_SendControl(void *Ptr, void *Dest, tUSBHostCb Cb, void *CbData,
        {
                td_data = InData ? EHCI_int_AllocateTD(Cont, PID_IN, InData, InLength, NULL, NULL) : NULL;
                td_status = EHCI_int_AllocateTD(Cont, PID_OUT, (void*)OutData, OutLength, Cb, CbData);
-               td_status->Token |= (1 << 15);
+               td_status->Token |= (1 << 15);  // IOC
        }
 
        // Append TDs
        if( td_data ) {
                td_setup->Link = MM_GetPhysAddr(td_data);
                td_data->Link = MM_GetPhysAddr(td_status) | 1;
+               td_data->Token |= (1 << 8);     // Active
        }
        else {
                td_setup->Link = MM_GetPhysAddr(td_status) | 1;
        }
+       td_setup->Token |= (1 << 8);    // Active
+       td_status->Token |= (1 << 8);
        EHCI_int_AppendTD(Cont, Dest, td_setup);
 
        return td_status;
@@ -560,9 +614,12 @@ void EHCI_int_AppendTD(tEHCI_Controller *Cont, tEHCI_QH *QH, tEHCI_qTD *TD)
        // TODO: Figure out how to follow this properly
        if( !ptd ) {
                QH->CurrentTD = MM_GetPhysAddr(TD);
+               LOG("Appended %p to beginning of %p", TD, QH);
        }
-       else
+       else {
                ptd->Link = MM_GetPhysAddr(TD);
+               LOG("Appended %p to end of %p", TD, QH);
+       }
 }
 
 tEHCI_QH *EHCI_int_AllocateQH(tEHCI_Controller *Cont, int Endpoint, size_t MaxPacketSize)
@@ -580,9 +637,8 @@ tEHCI_QH *EHCI_int_AllocateQH(tEHCI_Controller *Cont, int Endpoint, size_t MaxPa
                ret = &Cont->QHPools[i/QH_POOL_NPERPAGE][i%QH_POOL_NPERPAGE];
                if( ret->HLink == 0 ) {
                        ret->HLink = 1;
-                       ret->CurrentTD = 0;
                        ret->Overlay.Link = 1;
-                       ret->Endpoint = (Endpoint >> 4) | ((Endpoint & 0xF) << 8)
+                       ret->Endpoint = (Endpoint >> 4) | 0x80 | ((Endpoint & 0xF) << 8)
                                | (MaxPacketSize << 16);
                        // TODO: Endpoint speed (13:12) 0:Full, 1:Low, 2:High
                        // TODO: Control Endpoint Flag (27) 0:*, 1:Full/Low Control