X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Farch%2Fx86%2Facpica.c;h=7bbe1cd5edf85a1afbed008fa0b5015a7b3f5124;hb=802193677c6d85b31030bba5950cb667ff064415;hp=3d915275d34abd89f437698b6e5073fbb5a389a4;hpb=1e2978df7fa83d68e84588e9695db33aafbd601b;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/arch/x86/acpica.c b/KernelLand/Kernel/arch/x86/acpica.c index 3d915275..7bbe1cd5 100644 --- a/KernelLand/Kernel/arch/x86/acpica.c +++ b/KernelLand/Kernel/arch/x86/acpica.c @@ -5,11 +5,21 @@ * acpica.c * - ACPICA Interface */ +#define ACPI_DEBUG_OUTPUT 1 +#define DEBUG 1 +#define _AcpiModuleName "Shim" +#define _COMPONENT "Acess" #include #include #include #include +#define ONEMEG (1024*1024) + +// === GLOBALS === +// - RSDP Address from uEFI +tPAddr gACPI_RSDPOverride = 0; + // === PROTOTYPES === int ACPICA_Initialise(void); void ACPI_int_InterruptProxy(int IRQ, void *data); @@ -20,6 +30,10 @@ int ACPICA_Initialise(void) { ACPI_STATUS rv; + #ifdef ACPI_DEBUG_OUTPUT + AcpiDbgLevel = ACPI_DB_ALL; + #endif + rv = AcpiInitializeSubsystem(); if( ACPI_FAILURE(rv) ) { @@ -31,6 +45,7 @@ int ACPICA_Initialise(void) if( ACPI_FAILURE(rv) ) { Log_Error("ACPI", "AcpiInitializeTables: %i", rv); + AcpiTerminate(); return -1; } @@ -39,6 +54,7 @@ int ACPICA_Initialise(void) if( ACPI_FAILURE(rv) ) { Log_Error("ACPI", "AcpiLoadTables: %i", rv); + AcpiTerminate(); return -1; } @@ -46,6 +62,7 @@ int ACPICA_Initialise(void) if( ACPI_FAILURE(rv) ) { Log_Error("ACPI", "AcpiEnableSubsystem: %i", rv); + AcpiTerminate(); return -1; } @@ -69,61 +86,109 @@ ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void) { ACPI_SIZE val; ACPI_STATUS rv; - + + if( gACPI_RSDPOverride ) + return gACPI_RSDPOverride; + rv = AcpiFindRootPointer(&val); if( ACPI_FAILURE(rv) ) return 0; + LOG("val=%x", val); + return val; // (Or use EFI) } ACPI_STATUS AcpiOsPredefinedOverride(const ACPI_PREDEFINED_NAMES *PredefinedObject, ACPI_STRING *NewValue) { - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + *NewValue = NULL; + return AE_OK; } ACPI_STATUS AcpiOsTableOverride(ACPI_TABLE_HEADER *ExisitingTable, ACPI_TABLE_HEADER **NewTable) { - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + *NewTable = NULL; + return AE_OK; } ACPI_STATUS AcpiOsPhysicalTableOverride(ACPI_TABLE_HEADER *ExisitingTable, ACPI_PHYSICAL_ADDRESS *NewAddress, UINT32 *NewTableLength) { - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + *NewAddress = 0; + return AE_OK; } // -- Memory Management --- +struct sACPICache +{ + Uint16 nObj; + Uint16 ObjectSize; + char *Name; + void *First; + char ObjectStates[]; +}; + ACPI_STATUS AcpiOsCreateCache(char *CacheName, UINT16 ObjectSize, UINT16 MaxDepth, ACPI_CACHE_T **ReturnCache) { - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + tACPICache *ret; + int namelen = (CacheName ? strlen(CacheName) : 0) + 1; + LOG("CacheName=%s, ObjSize=%x, MaxDepth=%x", CacheName, ObjectSize, MaxDepth); + + namelen = (namelen + 3) & ~3; + + ret = malloc(sizeof(*ret) + MaxDepth*sizeof(char) + namelen + MaxDepth*ObjectSize); + if( !ret ) return AE_NO_MEMORY; + + ret->nObj = MaxDepth; + ret->ObjectSize = ObjectSize; + ret->Name = (char*)(ret->ObjectStates + MaxDepth); + ret->First = ret->Name + namelen; + if( CacheName ) + strcpy(ret->Name, CacheName); + else + ret->Name[0] = 0; + memset(ret->ObjectStates, 0, sizeof(char)*MaxDepth); + + LOG("Allocated cache '%s' (%i x 0x%x)", CacheName, MaxDepth, ObjectSize); + + *ReturnCache = ret; + + return AE_OK; } ACPI_STATUS AcpiOsDeleteCache(ACPI_CACHE_T *Cache) { if( Cache == NULL ) return AE_BAD_PARAMETER; - - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + + free(Cache); + return AE_OK; } ACPI_STATUS AcpiOsPurgeCache(ACPI_CACHE_T *Cache) { if( Cache == NULL ) return AE_BAD_PARAMETER; - - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + + memset(Cache->ObjectStates, 0, sizeof(char)*Cache->nObj); + + return AE_OK; } void *AcpiOsAcquireObject(ACPI_CACHE_T *Cache) { - // TODO + ENTER("pCache", Cache); + for(int i = 0; i < Cache->nObj; i ++ ) + { + if( !Cache->ObjectStates[i] ) { + Cache->ObjectStates[i] = 1; + void *rv = (char*)Cache->First + i*Cache->ObjectSize; + LEAVE('p', rv); + return rv; + } + } + + LEAVE('n'); return NULL; } @@ -131,19 +196,39 @@ ACPI_STATUS AcpiOsReleaseObject(ACPI_CACHE_T *Cache, void *Object) { if( Cache == NULL || Object == NULL ) return AE_BAD_PARAMETER; - UNIMPLEMENTED(); - return AE_NOT_IMPLEMENTED; + + tVAddr delta = (tVAddr)Object - (tVAddr)Cache->First; + delta /= Cache->ObjectSize; + LOG("delta = %i, (limit %i)", delta, Cache->nObj); + + if( delta > Cache->nObj ) + return AE_BAD_PARAMETER; + + Cache->ObjectStates[delta] = 0; + + return AE_OK; } void *AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length) { + if( PhysicalAddress < ONEMEG ) + return (void*)(KERNEL_BASE | PhysicalAddress); + Uint ofs = PhysicalAddress & (PAGE_SIZE-1); int npages = (ofs + Length + (PAGE_SIZE-1)) / PAGE_SIZE; - return (char*)MM_MapHWPages(PhysicalAddress, npages) + ofs; + void *rv = ((char*)MM_MapHWPages(PhysicalAddress, npages)) + ofs; +// MM_DumpTables(0, -1); + LOG("Map (%P+%i pg) to %p", PhysicalAddress, npages, rv); + return rv; } void AcpiOsUnmapMemory(void *LogicalAddress, ACPI_SIZE Length) { + if( (tVAddr)LogicalAddress - KERNEL_BASE < ONEMEG ) + return ; + + LOG("%p", LogicalAddress); + Uint ofs = (tVAddr)LogicalAddress & (PAGE_SIZE-1); int npages = (ofs + Length + (PAGE_SIZE-1)) / PAGE_SIZE; // TODO: Validate `Length` is the same as was passed to AcpiOsMapMemory @@ -187,7 +272,7 @@ BOOLEAN AcpiOsWritable(void *Memory, ACPI_SIZE Length) // --- Threads --- ACPI_THREAD_ID AcpiOsGetThreadId(void) { - return Threads_GetTID(); + return Threads_GetTID() + 1; } ACPI_STATUS AcpiOsExecute(ACPI_EXECUTE_TYPE Type, ACPI_OSD_EXEC_CALLBACK Function, void *Context) @@ -220,6 +305,7 @@ void AcpiOsWaitEventsComplete(void) // --- Mutexes etc --- ACPI_STATUS AcpiOsCreateMutex(ACPI_MUTEX *OutHandle) { + LOG("()"); if( !OutHandle ) return AE_BAD_PARAMETER; tMutex *ret = calloc( sizeof(tMutex), 1 ); @@ -254,6 +340,7 @@ void AcpiOsReleaseMutex(ACPI_MUTEX Handle) ACPI_STATUS AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, ACPI_SEMAPHORE *OutHandle) { + LOG("(MaxUnits=%i,InitialUnits=%i)", MaxUnits, InitialUnits); if( !OutHandle ) return AE_BAD_PARAMETER; tSemaphore *ret = calloc( sizeof(tSemaphore), 1 ); @@ -323,6 +410,7 @@ ACPI_STATUS AcpiOsSignalSemaphore(ACPI_SEMAPHORE Handle, UINT32 Units) ACPI_STATUS AcpiOsCreateLock(ACPI_SPINLOCK *OutHandle) { + LOG("()"); if( !OutHandle ) return AE_BAD_PARAMETER; tShortSpinlock *lock = calloc(sizeof(tShortSpinlock), 1); @@ -391,7 +479,7 @@ ACPI_STATUS AcpiOsRemoveInterruptHandler(UINT32 InterruptLevel, ACPI_OSD_HANDLER ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT32 Width) { void *ptr; - if( Address < 1024*1024 ) { + if( Address < ONEMEG ) { ptr = (void*)(KERNEL_BASE | Address); } else { @@ -406,7 +494,7 @@ ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT3 case 64: *Value = *(Uint64*)ptr; break; } - if( Address >= 1024*1024 ) { + if( Address >= ONEMEG ) { MM_FreeTemp(ptr); } @@ -416,7 +504,7 @@ ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT3 ACPI_STATUS AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 Value, UINT32 Width) { void *ptr; - if( Address < 1024*1024 ) { + if( Address < ONEMEG ) { ptr = (void*)(KERNEL_BASE | Address); } else { @@ -486,19 +574,19 @@ void AcpiOsPrintf(const char *Format, ...) va_list args; va_start(args, Format); - LogV(Format, args); + LogFV(Format, args); va_end(args); } void AcpiOsVprintf(const char *Format, va_list Args) { - LogV(Format, Args); + LogFV(Format, Args); } void AcpiOsRedirectOutput(void *Destination) { - // TODO: is this needed? + // TODO: Do I even need to impliment this? } // --- Miscellaneous ---