From: John Hodge Date: Fri, 10 Feb 2012 08:17:32 +0000 (+0800) Subject: Modules/OHCI - Implementation work, not usable yet, but getting there X-Git-Tag: rel0.15~783 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=dbf2fba5c46254f141a52f93fa4d9e626fe72498;p=tpg%2Facess2.git Modules/OHCI - Implementation work, not usable yet, but getting there --- diff --git a/KernelLand/Modules/USB/OHCI/Makefile b/KernelLand/Modules/USB/OHCI/Makefile new file mode 100644 index 00000000..faf93570 --- /dev/null +++ b/KernelLand/Modules/USB/OHCI/Makefile @@ -0,0 +1,9 @@ +# +# Acess2 OHCI Driver +# + +OBJ = ohci.o +CPPFLAGS = -I../Core/include +NAME = OHCI + +-include ../Makefile.tpl diff --git a/KernelLand/Modules/USB/OHCI/ohci.c b/KernelLand/Modules/USB/OHCI/ohci.c index 8b61c48b..766ba6d8 100644 --- a/KernelLand/Modules/USB/OHCI/ohci.c +++ b/KernelLand/Modules/USB/OHCI/ohci.c @@ -9,58 +9,377 @@ #define VERSION VER2(0,1) #include #include "ohci.h" +#include +#include // === CONSTANTS === #define MAX_CONTROLLERS 4 +#define MAX_TD_PAGES 2 +#define MAX_ENDPT_PAGES 2 +#define MAX_PACKET_SIZE 0x1000 // TODO: Check what should be used // === PROTOTYPES === int OHCI_Initialise(char **Arguments); void OHCI_Cleanup(void); +void OHCI_InitialiseController(tOHCI_Controller *Controller); + +void *OHCI_int_AddTD(tOHCI_Controller *Controller, int Dest, int DataTgl, int Type, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); void *OHCI_DataIN(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); -void *OHCI_DataOUT(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); -void *OHCI_SendSetup(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); +void *OHCI_DataOUT(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); +void *OHCI_SendSETUP(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); + int OHCI_IsTransferComplete(void *Ptr, void *Handle); + +void *OHCI_StartPoll(void *Ptr, int Dest, int MaxPeriod, tUSBHostCb Cb, void *CbData, void *DataBuf, size_t Length); +void OHCI_StopPoll(void *Ptr, void *Hdl); +void OHCI_CheckPortUpdate(void *Ptr); +void OHCI_InterruptHandler(int IRQ, void *Ptr); + +tOHCI_Endpoint *OHCI_int_AllocateEndpt(tOHCI_Controller *Controller); +tOHCI_Endpoint *OHCI_int_GetEndptFromPhys(tPAddr PhysAddr); +tOHCI_GeneralTD *OHCI_int_AllocateGTD(tOHCI_Controller *Controller); +tOHCI_GeneralTD *OHCI_int_GetGTDFromPhys(tPAddr PhysAddr); // === GLOBALS === MODULE_DEFINE(0, VERSION, USB_OHCI, OHCI_Initialise, OHCI_Cleanup, "USB_Core", NULL); tUSBHostDef gOHCI_HostDef = { .SendIN = OHCI_DataIN, .SendOUT = OHCI_DataOUT, - .SendSETUP = OHCI_DataSETUP, + .SendSETUP = OHCI_SendSETUP, + .IsOpComplete = OHCI_IsTransferComplete, + +// .StartPolling = OHCI_StartPoll, +// .StopPolling = OHCI_StopPoll, + + .CheckPorts = OHCI_CheckPortUpdate }; +tOHCI_Controller gOHCI_Controllers[MAX_CONTROLLERS]; +tOHCI_GeneralTD *gapOHCI_TDPool[MAX_TD_PAGES]; //!< Virtual pointers to TDs, each has an index in avail bits +const int ciTDs_per_page = PAGE_SIZE/sizeof(tOHCI_GeneralTD); +tOHCI_Endpoint *gapOHCI_EndpointPool[MAX_ENDPT_PAGES]; +const int ciEndpoints_per_page = PAGE_SIZE/sizeof(tOHCI_Endpoint); // === CODE === int OHCI_Initialise(char **Arguments) { - int id; + int id = -1; int card_num = 0; - while( (id = PCI_GetDeviceByClass(0x0C0310, 0xFFFFFF)) != -1 && card_num < MAX_CONTROLLERS ) + while( (id = PCI_GetDeviceByClass(0x0C0310, 0xFFFFFF, id)) != -1 && card_num < MAX_CONTROLLERS ) { - Uint32 base_addr; - - base_addr = PCI_GetBAR(id, 0); // Offset 0x10 + tOHCI_Controller *ctrlr = &gOHCI_Controllers[card_num]; + + ctrlr->ID = card_num; + ctrlr->PciId = id; + ctrlr->IRQNum = PCI_GetIRQ(id); + ctrlr->ControlSpacePhys = PCI_GetBAR(id, 0); // Offset 0x10 + + if( ctrlr->ControlSpacePhys == 0 || ctrlr->ControlSpacePhys & 1 ) { + ctrlr->ControlSpacePhys = 0; + continue ; + } + + OHCI_InitialiseController( ctrlr ); + + card_num ++; } + if( id != -1 ) { + Log_Warning("OHCI", "Too many controllers (> %i) were detected, ignoring the rest", + MAX_CONTROLLERS); + } - // TODO: Initialise return 0; } void OHCI_Cleanup(void) { + int i; // TODO: Cleanup for unload + + for( i = 0; i < MAX_CONTROLLERS && gOHCI_Controllers[i].ControlSpacePhys; i ++ ) + { + // TODO: Clean up resources used + } } +void OHCI_InitialiseController(tOHCI_Controller *Controller) +{ + tOHCI_Controller *cnt = Controller; + struct sRegisters *iospace; + + Log_Debug("OHCI", "Card #%i at 0x%X, IRQ %i", + cnt->ID, cnt->ControlSpacePhys, cnt->IRQNum); + + // - Prepare mappings + cnt->ControlSpace = (void*)MM_MapHWPages(cnt->ControlSpacePhys, 1); + IRQ_AddHandler( cnt->IRQNum, OHCI_InterruptHandler, cnt); + + // Allocate HCCA area + cnt->HCCA = (void*)MM_AllocDMA(1, 32, &cnt->HCCAPhys); + if( !cnt->HCCA ) { + Log_Error("OHCI", "Unable to allocate HCCA (1 page, 32-bit)"); + return ; + } + // TODO: Check return value + // - HCCA is 256 bytes in length, but I like alignment + cnt->IntLists = (void*)( (tVAddr)cnt->HCCA + 512 ); + LOG("HCCAPhys = %P, HCCA = %p", cnt->HCCAPhys, cnt->HCCA); + + iospace = cnt->ControlSpace; + + // --- Restart the controller --- + Uint32 fm_interval = iospace->HcFmInterval; + iospace->HcCommandStatus |= (1 << 0); + // - Wait 10 micro-seconds + iospace->HcFmInterval = fm_interval; + // (Now in UsbSuspend state) + // - Wait 2ms + + // --- Initialise Virtual Queues --- + memset(cnt->IntLists, 0, sizeof(*cnt->IntLists)); + // Set next pointers into a binary tree + { + tPAddr next_lvl = cnt->HCCAPhys + 512; + next_lvl += 16 * sizeof(tOHCI_Endpoint); + for( int i = 0; i < 16; i ++ ) + cnt->IntLists->Period16[i].NextED = next_lvl + i/2 * sizeof(tOHCI_Endpoint); + next_lvl += 8 * sizeof(tOHCI_Endpoint); + for( int i = 0; i < 8; i ++ ) + cnt->IntLists->Period8[i].NextED = next_lvl + i/2 * sizeof(tOHCI_Endpoint); + next_lvl += 4 * sizeof(tOHCI_Endpoint); + for( int i = 0; i < 4; i ++ ) + cnt->IntLists->Period4[i].NextED = next_lvl + i/2 * sizeof(tOHCI_Endpoint); + next_lvl += 2 * sizeof(tOHCI_Endpoint); + for( int i = 0; i < 2; i ++ ) + cnt->IntLists->Period2[i].NextED = next_lvl + sizeof(tOHCI_Endpoint); + next_lvl += 1 * sizeof(tOHCI_Endpoint); + cnt->IntLists->Period1[0].NextED = next_lvl; + } + // Set all endpoints to be skipped + for( int i = 0; i < 32; i ++ ) + { + tOHCI_Endpoint *ep = &cnt->IntLists->Period16[i]; + ep->Flags |= (1 << 14); // Skip + } + + // --- Initialise HCCA --- + // - Interrupt table is set up to point to each + for( int i = 0; i < 32; i ++ ) + { + static const int _balance[] = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15}; + cnt->HCCA->HccaInterruptTable[i] = cnt->HCCAPhys + 512 + _balance[i&15] * sizeof(tOHCI_Endpoint); + } + cnt->HCCA->HccaFrameNumber = 0; + cnt->HCCA->HccaDoneHead = 0; + + // --- Initialise Registers + iospace->HcControlHeadED = MM_GetPhysAddr( (tVAddr)&cnt->IntLists->StopED ); + iospace->HcBulkHeadED = MM_GetPhysAddr( (tVAddr)&cnt->IntLists->StopED ); + iospace->HcHCCA = cnt->HCCAPhys; + iospace->HcInterruptEnable = 0xFFFFFFFF; // TODO: Without SOF detect + iospace->HcControl = 0x3C; // All queues on + iospace->HcPeriodicStart = fm_interval / 10 * 9; // 90% of fm_interval + + // --- Start + iospace->HcControl |= (2 << 6); // UsbOperational +} + +// --- USB IO Functions --- +void *OHCI_int_DoTD( + tOHCI_Controller *Controller, int Dest, + int DataTgl, int Type, + tUSBHostCb Cb, void *CbData, + void *Buf, size_t Length + ) +{ + tOHCI_GeneralTD *td; + tPAddr td_phys; + tOHCI_Endpoint *ep; + + // Sanity check + if( Length > MAX_PACKET_SIZE ) + return NULL; + + // Check that the packet resides within memory the controller can access + if( MM_GetPhysAddr((tVAddr)Buf) >= (1ULL << 32) || MM_GetPhysAddr((tVAddr)Buf + Length -1) >= (1ULL << 32) ) + { + // TODO: Handle destination outside of 32-bit address range + Log_Warning("OHCI", "_int_DoTD - Buffer outside of 32-bit range, TODO: Handle this"); + return NULL; + } + + // Find Endpoint descriptor + // TODO: + // - Allocate one if needed + // TODO: + + // Allocate a TD + td = OHCI_int_AllocateGTD(Controller); + if( !td ) { + Log_Warning("OHCI", "_int_DoTD - Unable to allocate TD... oops"); + return NULL; + } + td_phys = MM_GetPhysAddr( (tVAddr)td ); + // Fill the TD + td->Flags |= (1 << 18); // Buffer rounding + td->Flags |= (Type & 3) << 19; // Type/Direction + td->Flags |= (2 | DataTgl) << 24; // Data Toggle + td->CBP = MM_GetPhysAddr( (tVAddr) Buf ); + td->BE = MM_GetPhysAddr( (tVAddr)Buf + Length - 1 ); + // - Save callback etc + td->CbPointer = (tVAddr)Cb; + td->CbArg = (tVAddr)CbData; + + // Add to the end of the Endpoint's list + if( ep->TailP ) + OHCI_int_GetGTDFromPhys( ep->TailP )->NextTD = td_phys; + else + ep->HeadP = td_phys; + ep->TailP = td_phys; + + return td; +} void *OHCI_DataIN(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length) { + return OHCI_int_DoTD(Ptr, Dest, DataTgl, 2, Cb, CbData, Buf, Length); +} +void *OHCI_DataOUT(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length) +{ + return OHCI_int_DoTD(Ptr, Dest, DataTgl, 1, Cb, CbData, Buf, Length); +} +void *OHCI_SendSETUP(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length) +{ + return OHCI_int_DoTD(Ptr, Dest, DataTgl, 0, Cb, CbData, Buf, Length); +} +int OHCI_IsTransferComplete(void *Ptr, void *Handle) +{ + return 0; +} + +// --- Interrupt polling --- +void *OHCI_StartPoll(void *Ptr, int Dest, int MaxPeriod, tUSBHostCb Cb, void *CbData, void *DataBuf, size_t Length) +{ + int slot; + + if( MaxPeriod <= 0 ) return NULL; + + // Allocate? (or obtain) an ED + + // Get update rate + for( slot = 32; slot > MaxPeriod && slot; slot >>= 1 ); + + // Allocate a TD + + // Place onto list + switch( slot ) + { + case 1: + // Add to all lists + break; + case 2: + // Add to every second list + break; + case 4: + // Add to every fourth list + break; + case 8: + // Add to every eighth list + break; + case 16: + // Add to first list + break; + case 32: + // Add to first list + break; + default: + Log_Error("OHCI", "OHCI_StartPoll - `slot` is invalid (%i)", slot); + break; + } + return NULL; } -void *OHCI_DataOUT(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); + +void OHCI_StopPoll(void *Ptr, void *Hdl) { + // Remove from list +} + +// --- Root hub --- +void OHCI_CheckPortUpdate(void *Ptr) +{ + +} + +// --- Interrupt handler +void OHCI_InterruptHandler(int IRQ, void *Ptr) +{ + tOHCI_Controller *cnt = Ptr; + // TODO: Interrupt handler + Log_Debug("OHIC", "Interrupt handler on controller %i", cnt->ID); +} + +// --- Internal Functions --- +tOHCI_Endpoint *OHCI_int_AllocateEndpt(tOHCI_Controller *Controller) +{ + int pg, i; + // TODO: Locking + for( pg = 0; pg < MAX_ENDPT_PAGES; pg ++ ) + { + if( !gapOHCI_EndpointPool[pg] ) { + gapOHCI_EndpointPool[pg] = (void*)MM_AllocDMA(1, 32, NULL); + memset(gapOHCI_EndpointPool, 0, PAGE_SIZE); + } + + for( i = 0; i < ciEndpoints_per_page; i ++ ) + { + // Check if allocated, and if not take it + if( gapOHCI_EndpointPool[pg][i].Flags & (1 << 31) ) + continue ; + gapOHCI_EndpointPool[pg][i].Flags = (1 << 31); + + // Set controller ID + gapOHCI_EndpointPool[pg][i].Flags |= Controller->ID << 27; + + return &gapOHCI_EndpointPool[pg][i]; + } + } + return NULL; +} + +tOHCI_Endpoint *OHCI_int_GetEndptFromPhys(tPAddr PhysAddr) +{ + int i; + for( i = 0; i < MAX_ENDPT_PAGES; i ++ ) + { + tPAddr addr; + addr = MM_GetPhysAddr( (tVAddr)gapOHCI_EndpointPool[i] ); + if( PhysAddr >= addr && PhysAddr < addr + 0x1000 ) + { + return gapOHCI_EndpointPool[i] + (PhysAddr - addr) / sizeof(tOHCI_Endpoint); + } + } return NULL; } -void *OHCI_SendSetup(void *Ptr, int Dest, int DataTgl, tUSBHostCb Cb, void *CbData, void *Buf, size_t Length); + +tOHCI_GeneralTD *OHCI_int_AllocateGTD(tOHCI_Controller *Controller) { + // TODO: Locking return NULL; } + +tOHCI_GeneralTD *OHCI_int_GetGTDFromPhys(tPAddr PhysAddr) +{ + int i; + for( i = 0; i < MAX_TD_PAGES; i ++ ) + { + tPAddr addr; + addr = MM_GetPhysAddr( (tVAddr)gapOHCI_TDPool[i] ); + if( PhysAddr >= addr && PhysAddr < addr + 0x1000 ) + { + return gapOHCI_TDPool[i] + (PhysAddr - addr) / sizeof(tOHCI_GeneralTD); + } + } + return NULL; +} + diff --git a/KernelLand/Modules/USB/OHCI/ohci.h b/KernelLand/Modules/USB/OHCI/ohci.h index 30eeb962..60cbf557 100644 --- a/KernelLand/Modules/USB/OHCI/ohci.h +++ b/KernelLand/Modules/USB/OHCI/ohci.h @@ -8,6 +8,10 @@ #ifndef _OHCI_H_ #define _OHCI_H_ +typedef struct sOHCI_Controller tOHCI_Controller; +typedef struct sEndpointDesc tOHCI_Endpoint; +typedef struct sGeneralTD tOHCI_GeneralTD; + struct sEndpointDesc { // 0: 6 = Address @@ -17,7 +21,8 @@ struct sEndpointDesc // 14 = Skip entry // 15 = Format (Others, Isochronous) // 16:26 = Max Packet Size - // 27:31 = AVAIL + // 27:30 = AVAIL - Used for Controller ID + // 31 = AVAIL - Used for allocated flag (1 = allocated) Uint32 Flags; // 0: 3 = AVAIL // 4:31 = TailP @@ -50,6 +55,10 @@ struct sGeneralTD // Address of final byte in buffer Uint32 BE; + + // -- Acess Information + Uint64 CbPointer; + Uint64 CbArg; }; struct sIsochronousTD @@ -77,5 +86,71 @@ struct sIsochronousTD Uint16 Offsets[8]; }; +struct sRegisters +{ + Uint32 HcRevision; + Uint32 HcControl; + Uint32 HcCommandStatus; + Uint32 HcInterruptStatus; + Uint32 HcInterruptEnable; + Uint32 HcInterruptDisable; + + Uint32 HcHCCA; + Uint32 HcPeriodCurrentED; + Uint32 HcControlHeadED; + Uint32 HcControlCurrentED; + Uint32 HcBulkHeadED; + Uint32 HcBulkCurrentED; + Uint32 HcDoneHead; + + Uint32 HcFmInterval; + Uint32 HcFmRemaining; + Uint32 HcFmNumber; + Uint32 HcPeriodicStart; + Uint32 HcLSThreshold; + + // 0: 7 = NDP (Max of 15) + Uint32 HcRhDescriptorA; + Uint32 HcRhDescriptorB; + Uint32 HcRhStatus; + Uint32 HcRhPortStatus[15]; +}; + +struct sHCCA +{ + Uint32 HccaInterruptTable[128/4]; + Uint16 HccaFrameNumber; + Uint16 HccaPad1; + Uint32 HccaDoneHead; + Uint32 HccaReserved[116/4]; +}; + +struct sOHCI_IntLists +{ + tOHCI_Endpoint Period16[16]; + tOHCI_Endpoint Period8[8]; + tOHCI_Endpoint Period4[4]; + tOHCI_Endpoint Period2[2]; + tOHCI_Endpoint Period1[1]; + tOHCI_Endpoint StopED; +}; + +struct sOHCI_Controller +{ + int ID; + + int PciId; + Uint IRQNum; + tPAddr ControlSpacePhys; + + struct sRegisters *ControlSpace; + + tPAddr HCCAPhys; + struct sHCCA *HCCA; + struct sOHCI_IntLists *IntLists; // At HCCA+512 + + tUSBHub *RootHub; +}; + #endif