(minor) Modules/UDI - Improved error message for multiple UDI_DL_BUF
[tpg/acess2.git] / KernelLand / Modules / USB / EHCI / ehci.c
index 8a316e3..e380520 100644 (file)
 #include "ehci.h"
 #include <drv_pci.h>
 #include <limits.h>
+#include <events.h>
+#include <timers.h>
 
 // === CONSTANTS ===
 #define EHCI_MAX_CONTROLLERS   4
+#define EHCI_THREADEVENT_IOC   THREAD_EVENT_USER1
+#define EHCI_THREADEVENT_PORTSC        THREAD_EVENT_USER2
 
 // === PROTOTYPES ===
  int   EHCI_Initialise(char **Arguments);
@@ -36,12 +40,17 @@ void        *EHCI_SendControl(void *Ptr, void *Dest, tUSBHostCb Cb, void *CbData,
        );
 void   *EHCI_SendBulk(void *Ptr, void *Dest, tUSBHostCb Cb, void *CbData, int Dir, void *Data, size_t Length);
 void   EHCI_FreeOp(void *Ptr, void *Handle);
+Uint32 EHCI_int_RootHub_FeatToMask(int Feat);
+void   EHCI_RootHub_SetPortFeature(void *Ptr, int Port, int Feat);
+void   EHCI_RootHub_ClearPortFeature(void *Ptr, int Port, int Feat);
+ int   EHCI_RootHub_GetPortStatus(void *Ptr, int Port, int Flag);
 // --- Internals ---
 tEHCI_qTD      *EHCI_int_AllocateTD(tEHCI_Controller *Cont, int PID, void *Data, size_t Length, tUSBHostCb Cb, void *CbData);
 void   EHCI_int_DeallocateTD(tEHCI_Controller *Cont, tEHCI_qTD *TD);
-void   EHCI_int_AppendTD(tEHCI_QH *QH, tEHCI_qTD *TD);
+void   EHCI_int_AppendTD(tEHCI_Controller *Cont, tEHCI_QH *QH, tEHCI_qTD *TD);
 tEHCI_QH       *EHCI_int_AllocateQH(tEHCI_Controller *Cont, int Endpoint, size_t MaxPacketSize);
 void   EHCI_int_DeallocateQH(tEHCI_Controller *Cont, tEHCI_QH *QH);
+void   EHCI_int_InterruptThread(void *ControllerPtr);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, VERSION, USB_EHCI, EHCI_Initialise, NULL, "USB_Core", NULL);
@@ -49,12 +58,18 @@ tEHCI_Controller    gaEHCI_Controllers[EHCI_MAX_CONTROLLERS];
 tUSBHostDef    gEHCI_HostDef = {
        .InitInterrupt = EHCI_InitInterrupt,
        .InitIsoch     = EHCI_InitIsoch,
+       .InitControl   = EHCI_InitControl,
        .InitBulk      = EHCI_InitBulk,
        .RemEndpoint   = EHCI_RemEndpoint,
        .SendIsoch   = NULL,
        .SendControl = EHCI_SendControl,
        .SendBulk    = EHCI_SendBulk,
-       .FreeOp      = EHCI_FreeOp
+       .FreeOp      = EHCI_FreeOp,
+       
+       .CheckPorts = NULL,     // No need
+       .SetPortFeature   = EHCI_RootHub_SetPortFeature,
+       .ClearPortFeature = EHCI_RootHub_ClearPortFeature,
+       .GetPortStatus    = EHCI_RootHub_GetPortStatus,
        };
 
 // === CODE ===
@@ -64,18 +79,52 @@ 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?
                }
 
-               if( EHCI_InitController(addr, irq) ) {
+               Log_Log("ECHI", "Controller at PCI %i 0x%x IRQ 0x%x",
+                       id, addr, irq);
+
+               if( EHCI_InitController(addr, irq) )
+               {
                        // TODO: Detect other forms of failure than "out of slots"
                        break ;
                }
        }
+
+       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;
 }
 
@@ -89,6 +138,9 @@ int EHCI_InitController(tPAddr BaseAddress, Uint8 InterruptNum)
 {
        tEHCI_Controller        *cont = NULL;
 
+       ENTER("PBaseAddress iInterruptNum",
+               BaseAddress, InterruptNum);
+
        for( int i = 0; i < EHCI_MAX_CONTROLLERS; i ++ )
        {
                if( gaEHCI_Controllers[i].PhysBase == 0 ) {
@@ -97,22 +149,86 @@ int EHCI_InitController(tPAddr BaseAddress, Uint8 InterruptNum)
                        break;
                }
        }
-
        if(!cont) {
+               Log_Notice("EHCI", "Too many controllers (EHCI_MAX_CONTROLLERS=%i)",
+                       EHCI_MAX_CONTROLLERS);
+               LEAVE('i', 1);
                return 1;
        }
 
+       // - Nuke a couple of fields so error handling code doesn't derp
+       cont->CapRegs = NULL;
+       cont->PeriodicQueue = NULL;
+       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;
+       }
+       LOG("cont->CapRegs = %p", cont->CapRegs);
        // TODO: Error check
+       if( (cont->CapRegs->CapLength & 3) ) {
+               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 );
+       LOG("cont->OpRegs = %p", cont->OpRegs);
        // - Allocate periodic queue
-       cont->PeriodicQueue = (void*)MM_AllocDMA(1, 32, NULL);
+       tPAddr  unused;
+       cont->PeriodicQueue = (void*)MM_AllocDMA(1, 32, &unused);
+       if( !cont->PeriodicQueue ) {
+               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
 
+       // - Allocate TD pool
+       cont->TDPool = (void*)MM_AllocDMA(1, 32, &unused);
+       if( !cont->TDPool ) {
+               Log_Warning("ECHI", "Can't allocate 1 32-bit page for qTD pool");
+               goto _error;
+       }
+       for( int i = 0; i < TD_POOL_SIZE; i ++ ) {
+               cont->TDPool[i].Token = 3 << 8;
+       }
+
+       // Get port count
+       cont->nPorts = cont->CapRegs->HCSParams & 0xF;
+       LOG("cont->nPorts = %i", cont->nPorts);
+
        // -- Bind IRQ --
        IRQ_AddHandler(InterruptNum, EHCI_InterruptHandler, cont);
+       cont->InterruptThread = Proc_SpawnWorker(EHCI_int_InterruptThread, cont);
+       if( !cont->InterruptThread ) {
+               Log_Warning("EHCI", "Can't spawn interrupt worker thread");
+               goto _error;
+       }
+       LOG("cont->InterruptThread = %p", cont->InterruptThread);
+
+       // Dummy TD
+       cont->DeadTD = EHCI_int_AllocateTD(cont, 0, NULL, 0, NULL, NULL);
+       memset(cont->DeadTD, 0, sizeof(tEHCI_qTD));
+       cont->DeadTD->Link = 1;
+       cont->DeadTD->Link2 = 1;
+       cont->DeadTD->Token = QTD_TOKEN_STS_HALT;
+       
+       // Dummy QH
+       cont->DeadQH = EHCI_int_AllocateQH(cont, 0, 0);
+       memset(cont->DeadQH, 0, sizeof(tEHCI_QH));
+       cont->DeadQH->HLink = MM_GetPhysAddr(cont->DeadQH)|22;
+       cont->DeadQH->Endpoint = (1<<15);       // H - Head of Reclamation List
 
        // -- Initialisation procedure (from ehci-r10) --
        // - Reset controller
@@ -122,41 +238,84 @@ int EHCI_InitController(tPAddr BaseAddress, Uint8 InterruptNum)
        cont->OpRegs->USBIntr = USBINTR_IOC|USBINTR_PortChange|USBINTR_FrameRollover;
        // - Set PERIODICLIST BASE
        cont->OpRegs->PeridocListBase = MM_GetPhysAddr( cont->PeriodicQueue );
+       // - Set ASYNCLISTADDR
+       cont->OpRegs->AsyncListAddr = MM_GetPhysAddr(cont->DeadQH);
        // - Enable controller
-       cont->OpRegs->USBCmd = (0x40 << 16) | USBCMD_PeriodicEnable | USBCMD_Run;
+       cont->OpRegs->USBCmd = (0x40 << 16) | USBCMD_PeriodicEnable | USBCMD_AsyncEnable | USBCMD_Run;
        // - Route all ports
        cont->OpRegs->ConfigFlag = 1;
-       
+
+       // -- Register with USB Core --
+       cont->RootHub = USB_RegisterHost(&gEHCI_HostDef, cont, cont->nPorts);
+       LOG("cont->RootHub = %p", cont->RootHub);
+
+       LEAVE('i', 0);
        return 0;
+_error:
+       cont->PhysBase = 0;
+       if( cont->CapRegs )
+               MM_Deallocate( (tVAddr)cont->CapRegs );
+       if( cont->PeriodicQueue )
+               MM_Deallocate( (tVAddr)cont->PeriodicQueue );
+       if( cont->TDPool )
+               MM_Deallocate( (tVAddr)cont->TDPool );
+       LEAVE('i', 2);
+       return 2;
 }
 
 void EHCI_InterruptHandler(int IRQ, void *Ptr)
 {
-       tEHCI_Controller *cont = Ptr;
-       Uint32  sts = cont->OpRegs->USBSts;
-       
-       // Clear interrupts
-       cont->OpRegs->USBSts = sts;     
+       tEHCI_Controller *Cont = Ptr;
+       Uint32  sts = Cont->OpRegs->USBSts;
+       Uint32  orig_sts = sts;
+
+       if( sts & 0xFFFF0FC0 ) {
+               LOG("Oops, reserved bits set (%08x), funny hardware?", sts);
+               sts &= ~0xFFFF0FFC0;
+       }
+
+       // Unmask read-only bits
+       sts &= ~(0xF000);
 
        if( sts & USBINTR_IOC ) {
                // IOC
+               LOG("%P IOC", Cont->PhysBase);
+               Threads_PostEvent(Cont->InterruptThread, EHCI_THREADEVENT_IOC);
                sts &= ~USBINTR_IOC;
        }
 
+       if( sts & USBINTR_AsyncAdvance ) {
+               LOG("%P IAAD", Cont->PhysBase);
+               #if 0
+               if( Cont->AsyncQHAddHead )
+               {
+               }
+               #endif
+               sts &= ~USBINTR_AsyncAdvance;
+       }
+
        if( sts & USBINTR_PortChange ) {
                // Port change, determine what port and poke helper thread
+               LOG("%P Port status change", Cont->PhysBase);
+               Threads_PostEvent(Cont->InterruptThread, EHCI_THREADEVENT_PORTSC);
                sts &= ~USBINTR_PortChange;
        }
        
        if( sts & USBINTR_FrameRollover ) {
                // Frame rollover, used to aid timing (trigger per-second operations)
+               //LOG("%p Frame rollover", Ptr);
                sts &= ~USBINTR_FrameRollover;
        }
 
        if( sts ) {
                // Unhandled interupt bits
                // TODO: Warn
+               LOG("WARN - Bitmask %x unhandled", sts);
        }
+
+
+       // Clear interrupts
+       Cont->OpRegs->USBSts = orig_sts;
 }
 
 // --------------------------------------------------------------------
@@ -168,13 +327,13 @@ void *EHCI_InitInterrupt(void *Ptr, int Endpoint, int bOutbound, int Period,
        tEHCI_Controller        *Cont = Ptr;
         int    pow2period, period_pow;
        
-       if( Endpoint >= 256*16 )
-               return NULL;
-       if( Period <= 0 )
-               return NULL;
+       ASSERTCR(Endpoint, <, 256*16, NULL);
+       ASSERTCR(Period, >, 0, NULL);
        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;
@@ -191,10 +350,14 @@ void *EHCI_InitInterrupt(void *Ptr, int Endpoint, int bOutbound, int Period,
                Period = pow2period/2;
                period_pow --;
        }
+       LOG("period_pow = %i, Period = %ims", period_pow, Period);
        
        // Allocate a QH
        tEHCI_QH *qh = EHCI_int_AllocateQH(Cont, Endpoint, Length);
        qh->Impl.IntPeriodPow = period_pow;
+       qh->EndpointExt |= 1;   // TODO: uFrame load balancing (8 entry bitfield)
+
+       Mutex_Acquire(&Cont->PeriodicListLock);
 
        // Choose an interrupt slot to use      
        int minslot = 0, minslot_load = INT_MAX;
@@ -210,39 +373,93 @@ void *EHCI_InitInterrupt(void *Ptr, int Endpoint, int bOutbound, int Period,
                }
        }
        // Increase loading on the selected slot
-       for( int i = 0; i < PERIODIC_SIZE; i += Period )
-               Cont->InterruptLoad[i+minslot] += Length;
+       for( int i = minslot; i < PERIODIC_SIZE; i += Period )
+               Cont->InterruptLoad[i] += Length;
        qh->Impl.IntOfs = minslot;
+       LOG("Using slot %i", minslot);
 
        // Allocate TD for the data
        tEHCI_qTD *td = EHCI_int_AllocateTD(Cont, (bOutbound ? PID_OUT : PID_IN), Buf, Length, Cb, CbData);
-       EHCI_int_AppendTD(qh, td);
+       EHCI_int_AppendTD(Cont, qh, td);
 
        // Insert into the periodic list
+       for( int i = 0; i < PERIODIC_SIZE; i += Period )
+       {
+               // Walk list until
+               // - the end is reached
+               // - this QH is found
+               // - A QH with a lower period is encountered
+               tEHCI_QH        *pqh = NULL;
+               tEHCI_QH        *nqh;
+               for( nqh = Cont->PeriodicQueueV[i]; nqh; pqh = nqh, nqh = nqh->Impl.Next )
+               {
+                       if( nqh == qh )
+                               break;
+                       if( nqh->Impl.IntPeriodPow < period_pow )
+                               break;
+               }
+
+               // Somehow, we've already been added to this queue.
+               if( nqh && nqh == qh )
+                       continue ;
+
+               if( qh->Impl.Next && qh->Impl.Next != nqh ) {
+                       Log_Warning("EHCI", "Suspected bookkeeping error on %p - int list %i+%i overlap",
+                               Cont, period_pow, minslot);
+                       break;
+               }
+
+               if( nqh ) {
+                       qh->Impl.Next = nqh;
+                       qh->HLink = MM_GetPhysAddr(nqh) | 2;
+               }
+               else {
+                       qh->Impl.Next = NULL;
+                       qh->HLink = 2|1;        // QH, Terminate
+               }
+
+               if( pqh ) {
+                       pqh->Impl.Next = qh;
+                       pqh->HLink = MM_GetPhysAddr(qh) | 2;
+               }
+               else {
+                       Cont->PeriodicQueueV[i] = qh;
+                       Cont->PeriodicQueue[i] = MM_GetPhysAddr(qh) | 2;
+               }
+       }
+       Mutex_Release(&Cont->PeriodicListLock);
 
        return qh;
 }
 
 void *EHCI_InitIsoch(void *Ptr, int Endpoint, size_t MaxPacketSize)
 {
-       return (void*)(tVAddr)(Endpoint + 1);
+       ENTER("pPtr iEndpoint iMaxPacketSize",
+               Ptr, Endpoint, MaxPacketSize);
+       LEAVE_RET('p', (void*)(tVAddr)(Endpoint + 1));
 }
 void *EHCI_InitControl(void *Ptr, int Endpoint, size_t MaxPacketSize)
 {
        tEHCI_Controller *Cont = Ptr;
        
+       ENTER("pPtr iEndpoint iMaxPacketSize",
+               Ptr, Endpoint, 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;
-       }
-       else
-               Cont->OpRegs->AsyncListAddr = MM_GetPhysAddr(qh)|2;
-       Cont->LastAsyncHead = qh;
+       // Append to async list
+       // TODO: Lock async list
+       qh->Impl.Next = Cont->DeadQH->Impl.Next;
+       Cont->DeadQH->Impl.Next = qh;
+       qh->HLink = Cont->DeadQH->HLink;
+       Cont->DeadQH->HLink = MM_GetPhysAddr(qh)|2;
+
+       LOG("Created %p(%P) for %P Ep 0x%x - %i bytes MPS",
+               qh, MM_GetPhysAddr(qh), Cont->PhysBase, Endpoint, MaxPacketSize);
 
+       LEAVE('p', qh);
        return qh;
 }
 void *EHCI_InitBulk(void *Ptr, int Endpoint, size_t MaxPacketSize)
@@ -256,8 +473,16 @@ void EHCI_RemEndpoint(void *Ptr, void *Handle)
        else if( (tVAddr)Handle <= 256*16 )
                return ;        // Isoch
        else {
+               tEHCI_QH        *qh = Ptr;
+
                // Remove QH from list
                // - If it's a polling endpoint, need to remove from all periodic lists
+               if( qh->Impl.IntPeriodPow != 0xFF) {
+                       // Poll
+               }
+               else {
+                       // GP
+               }
                
                // Deallocate QH
                EHCI_int_DeallocateQH(Ptr, Handle);
@@ -278,26 +503,44 @@ void *EHCI_SendControl(void *Ptr, void *Dest, tUSBHostCb Cb, void *CbData,
        if( (tVAddr)Dest <= 256*16 )
                return NULL;
 
-       // Check size of SETUP and status
+       LOG("Dest=%p, isOutbound=%i, Lengths(Setup:%i,Out:%i,In:%i)",
+               Dest, isOutbound, SetupLength, OutLength, InLength);
+
+       // TODO: Check size of SETUP and status
        
        // Allocate TDs
        td_setup = EHCI_int_AllocateTD(Cont, PID_SETUP, (void*)SetupData, SetupLength, NULL, NULL);
        if( isOutbound )
        {
-               td_data = EHCI_int_AllocateTD(Cont, PID_OUT, (void*)OutData, OutLength, NULL, NULL);
+               td_data = OutData ? EHCI_int_AllocateTD(Cont, PID_OUT, (void*)OutData, OutLength, NULL, NULL) : NULL;
                td_status = EHCI_int_AllocateTD(Cont, PID_IN, InData, InLength, Cb, CbData);
        }
        else
        {
-               td_data = EHCI_int_AllocateTD(Cont, PID_IN, InData, InLength, NULL, NULL);
+               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 |= QTD_TOKEN_IOC;      // IOC
 
        // Append TDs
-       EHCI_int_AppendTD(Dest, td_setup);
-       EHCI_int_AppendTD(Dest, td_data);
-       EHCI_int_AppendTD(Dest, td_status);
+       if( td_data ) {
+               td_setup->Link = MM_GetPhysAddr(td_data);
+               td_setup->Next = td_data;
+               td_data->Link = MM_GetPhysAddr(td_status);
+               td_data->Next = td_status;
+               td_data->Token |= QTD_TOKEN_STS_ACTIVE; // Active
+       }
+       else {
+               td_setup->Link = MM_GetPhysAddr(td_status);
+               td_setup->Next = td_status;
+       }
+       td_setup->Token |= QTD_TOKEN_STS_ACTIVE;        // Active
+       td_status->Token |= QTD_TOKEN_STS_ACTIVE;
+       td_status->Link = 1;
+       td_status->Link2 = 1;
+       EHCI_int_AppendTD(Cont, Dest, td_setup);
 
+       LOG("return td_status=%p", td_status);
        return td_status;
 }
 
@@ -312,7 +555,7 @@ void *EHCI_SendBulk(void *Ptr, void *Dest, tUSBHostCb Cb, void *CbData, int Dir,
        
        // Allocate single TD
        tEHCI_qTD       *td = EHCI_int_AllocateTD(Cont, (Dir ? PID_OUT : PID_IN), Data, Length, Cb, CbData);
-       EHCI_int_AppendTD(Dest, td);    
+       EHCI_int_AppendTD(Cont, Dest, td);
 
        return td;
 }
@@ -324,28 +567,276 @@ void EHCI_FreeOp(void *Ptr, void *Handle)
        EHCI_int_DeallocateTD(Cont, Handle);
 }
 
+Uint32 EHCI_int_RootHub_FeatToMask(int Feat)
+{
+       switch(Feat)
+       {
+       case PORT_RESET:        return PORTSC_PortReset;
+       case PORT_ENABLE:       return PORTSC_PortEnabled;
+       default:
+               Log_Warning("EHCI", "Unknown root hub port feature %i", Feat);
+               return 0;
+       }
+}
+
+void EHCI_RootHub_SetPortFeature(void *Ptr, int Port, int Feat)
+{
+       tEHCI_Controller        *Cont = Ptr;
+       if(Port >= Cont->nPorts)        return;
+
+       Cont->OpRegs->PortSC[Port] |= EHCI_int_RootHub_FeatToMask(Feat);
+}
+
+void EHCI_RootHub_ClearPortFeature(void *Ptr, int Port, int Feat)
+{
+       tEHCI_Controller        *Cont = Ptr;
+       if(Port >= Cont->nPorts)        return;
+
+       Cont->OpRegs->PortSC[Port] &= ~EHCI_int_RootHub_FeatToMask(Feat);
+}
+
+int EHCI_RootHub_GetPortStatus(void *Ptr, int Port, int Flag)
+{
+       tEHCI_Controller        *Cont = Ptr;
+       if(Port >= Cont->nPorts)        return 0;
+
+       return !!(Cont->OpRegs->PortSC[Port] & EHCI_int_RootHub_FeatToMask(Flag));
+}
+
 // --------------------------------------------------------------------
 // Internals
 // --------------------------------------------------------------------
+tEHCI_qTD *EHCI_int_GetTDFromPhys(tEHCI_Controller *Cont, Uint32 Addr)
+{
+       if( Addr == 0 ) return NULL;
+       LOG("%p + (%x - %x)", Cont->TDPool, Addr, MM_GetPhysAddr(Cont->TDPool));
+       return Cont->TDPool + (Addr - MM_GetPhysAddr(Cont->TDPool))/sizeof(tEHCI_qTD);
+}
+
 tEHCI_qTD *EHCI_int_AllocateTD(tEHCI_Controller *Cont, int PID, void *Data, size_t Length, tUSBHostCb Cb, void *CbData)
 {
+//     Semaphore_Wait(&Cont->TDSemaphore, 1);
+       Mutex_Acquire(&Cont->TDPoolMutex);
+       for( int i = 0; i < TD_POOL_SIZE; i ++ )
+       {
+               if( ((Cont->TDPool[i].Token >> 8) & 3) != 3 )
+                       continue ;
+               Cont->TDPool[i].Token = (PID << 8) | (Length << 16);
+               Mutex_Release(&Cont->TDPoolMutex);
+               
+               tEHCI_qTD       *td = &Cont->TDPool[i];
+               td->Size = Length;
+               td->Callback = Cb;
+               td->CallbackData = CbData;
+               // NOTE: Assumes that `Length` is <= PAGE_SIZE
+               ASSERTC(Length, <, PAGE_SIZE);
+               // TODO: Handle bouncing >32-bit pages
+               #if PHYS_BITS > 32
+               ASSERT( MM_GetPhysAddr(Data) >> 32 == 0 );
+               #endif
+               td->Pages[0] = MM_GetPhysAddr(Data);
+               if( (td->Pages[0] & (PAGE_SIZE-1)) + Length - 1 > PAGE_SIZE )
+                       td->Pages[1] = MM_GetPhysAddr((char*)Data + Length - 1) & ~(PAGE_SIZE-1);
+               LOG("Allocated %p(%P) for PID %i on %P",
+                       td, MM_GetPhysAddr(td), PID, Cont->PhysBase);
+               return td;
+       }
+
+       Mutex_Release(&Cont->TDPoolMutex);
        return NULL;
 }
 
 void EHCI_int_DeallocateTD(tEHCI_Controller *Cont, tEHCI_qTD *TD)
 {
+       UNIMPLEMENTED();
 }
 
-void EHCI_int_AppendTD(tEHCI_QH *QH, tEHCI_qTD *TD)
+void EHCI_int_AppendTD(tEHCI_Controller *Cont, tEHCI_QH *QH, tEHCI_qTD *TD)
 {
+       tEHCI_qTD       *ptd = NULL;
+       Uint32  link = QH->CurrentTD;
+       tPAddr  dead_td = MM_GetPhysAddr(Cont->DeadTD);
+       
+       {
+               Mutex_Acquire(&Cont->ActiveTDsLock);
+               if( Cont->ActiveTDTail )
+                       Cont->ActiveTDTail->Next = TD;
+               else
+                       Cont->ActiveTDHead = TD;
+               tEHCI_qTD       *last;
+               for( last = TD; last->Next; last = last->Next )
+                       ;
+               Cont->ActiveTDTail = last;
+               Mutex_Release(&Cont->ActiveTDsLock);
+       }
+
+       // TODO: Need locking and validation here
+       while( link && !(link & 1) && link != dead_td )
+       {
+               ptd = EHCI_int_GetTDFromPhys(Cont, link);
+               link = ptd->Link;
+       }
+       // TODO: Figure out how to follow this properly
+       if( !ptd ) {
+               QH->CurrentTD = MM_GetPhysAddr(TD)|2;
+               QH->Overlay.Link = QH->CurrentTD;
+               LOG("Appended %p to beginning of %p", TD, QH);
+       }
+       else {
+               ptd->Link = MM_GetPhysAddr(TD);
+               ptd->Link2 = MM_GetPhysAddr(TD);
+               LOG("Appended %p to end of %p", TD, QH);
+       }
+       QH->Endpoint |= QH_ENDPT_H;
+       QH->Overlay.Token &= ~QTD_TOKEN_STS_HALT;
 }
 
 tEHCI_QH *EHCI_int_AllocateQH(tEHCI_Controller *Cont, int Endpoint, size_t MaxPacketSize)
 {
+       tEHCI_QH        *ret;
+       Mutex_Acquire(&Cont->QHPoolMutex);
+       for( int i = 0; i < QH_POOL_SIZE; i ++ )
+       {
+               if( !MM_GetPhysAddr( Cont->QHPools[i/QH_POOL_NPERPAGE] ) ) {
+                       tPAddr  tmp;
+                       Cont->QHPools[i/QH_POOL_NPERPAGE] = (void*)MM_AllocDMA(1, 32, &tmp);
+                       memset(Cont->QHPools[i/QH_POOL_NPERPAGE], 0, PAGE_SIZE);
+               }
+
+               ret = &Cont->QHPools[i/QH_POOL_NPERPAGE][i%QH_POOL_NPERPAGE];
+               if( ret->HLink == 0 ) {
+                       memset(ret, 0, sizeof(*ret));
+                       ret->HLink = 1;
+                       ret->Overlay.Link = MM_GetPhysAddr(Cont->DeadTD);
+                       ret->Endpoint = (Endpoint >> 4) | 0x80 | ((Endpoint & 0xF) << 8)
+                               | (MaxPacketSize << 16);
+                       ret->EndpointExt = (1<<30);
+                       // TODO: Endpoint speed (13:12) 0:Full, 1:Low, 2:High
+                       // TODO: Control Endpoint Flag (27) 0:*, 1:Full/Low Control
+                       Mutex_Release(&Cont->QHPoolMutex);
+                       return ret;
+               }
+       }
+       Mutex_Release(&Cont->QHPoolMutex);
        return NULL;
 }
 
 void EHCI_int_DeallocateQH(tEHCI_Controller *Cont, tEHCI_QH *QH)
 {
+       // TODO: Ensure it's unused (somehow)
+       QH->HLink = 0;
+}
+
+void EHCI_int_HandlePortConnectChange(tEHCI_Controller *Cont, int Port)
+{
+       // Connect Event
+       if( Cont->OpRegs->PortSC[Port] & PORTSC_CurrentConnectStatus )
+       {
+               // Is the device low-speed?
+               if( (Cont->OpRegs->PortSC[Port] & PORTSC_LineStatus_MASK) == PORTSC_LineStatus_Kstate )
+               {
+                       LOG("Low speed device on %P Port %i, giving to companion", Cont->PhysBase, Port);
+                       Cont->OpRegs->PortSC[Port] |= PORTSC_PortOwner;
+               }
+               // not a low-speed device, EHCI reset
+               else
+               {
+                       LOG("Device connected on %P Port %i", Cont->PhysBase, Port);
+                       // Reset procedure.
+                       USB_PortCtl_BeginReset(Cont->RootHub, Port);
+               }
+       }
+       // Disconnect Event
+       else
+       {
+               if( Cont->OpRegs->PortSC[Port] & PORTSC_PortOwner ) {
+                       LOG("Device disconnected on %P Port %i (companion), taking it back",
+                               Cont->PhysBase, Port);
+                       Cont->OpRegs->PortSC[Port] &= ~PORTSC_PortOwner;
+               }
+               else {
+                       LOG("Device disconnected on %P Port %i", Cont->PhysBase, Port);
+                       USB_DeviceDisconnected(Cont->RootHub, Port);
+               }
+       }
 }
 
+void EHCI_int_InterruptThread(void *ControllerPtr)
+{
+       tEHCI_Controller        *Cont = ControllerPtr;
+       while(Cont->OpRegs)
+       {
+               Uint32  events;
+               
+               LOG("sleeping for events");
+               events = Threads_WaitEvents(EHCI_THREADEVENT_IOC|EHCI_THREADEVENT_PORTSC);
+               if( !events ) {
+                       // TODO: Should this cause a termination?
+               }
+               LOG("events = 0x%x", events);
+
+               if( events & EHCI_THREADEVENT_IOC )
+               {
+                       // IOC, Do whatever it is you do
+                       Log_Warning("EHCI", "%P IOC - TODO: Call registered callbacks and reclaim",
+                               Cont->PhysBase);
+                       // Scan active TDs
+                       Mutex_Acquire(&Cont->ActiveTDsLock);
+                       tEHCI_qTD *prev = NULL;
+                       for(tEHCI_qTD *td = Cont->ActiveTDHead; td; td = td->Next)
+                       {
+                               LOG("td(%p)->Token = %x", td, td->Token);
+                               // If active, continue
+                               if( td->Token & QTD_TOKEN_STS_ACTIVE ) {
+                                       prev = td;
+                                       continue ;
+                               }
+                               
+                               // Inactive
+                               LOG("%p Complete", td);
+                               // - call the callback
+                               if( td->Callback )
+                               {
+                                       void *ptr = NULL;
+                                       if( td->Pages[0] ) {
+                                               Log_Warning("EHCI", "TODO: Map %x,%x+%i for callback",
+                                                       td->Pages[0], td->Pages[1], td->Size);
+                                       }
+                                       td->Callback(td->CallbackData, ptr, td->Size);
+                               }
+                       
+                               // Remove and release
+                               *(prev ? &prev->Next : &Cont->ActiveTDHead) = td->Next;
+                               td->Token = 0;
+                       }
+                       Cont->ActiveTDTail = prev;
+                       Mutex_Release(&Cont->ActiveTDsLock);
+               }
+
+               // Port status change interrupt
+               if( events & EHCI_THREADEVENT_PORTSC )
+               {
+                       // Check for port status changes
+                       for(int i = 0; i < Cont->nPorts; i ++ )
+                       {
+                               Uint32  sts = Cont->OpRegs->PortSC[i];
+                               LOG("Port %i: sts = %x", i, sts);
+                               Cont->OpRegs->PortSC[i] = sts;
+                               if( sts & PORTSC_ConnectStatusChange )
+                                       EHCI_int_HandlePortConnectChange(Cont, i);
+
+                               if( sts & PORTSC_PortEnableChange )
+                               {
+                                       // Handle enable/disable
+                               }
+
+                               if( sts & PORTSC_OvercurrentChange )
+                               {
+                                       // Handle over-current change
+                               }
+                       }
+               }
+
+               LOG("Going back to sleep");
+       }
+}

UCC git Repository :: git.ucc.asn.au