X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Facpica.c;h=726feb715018dc9d5de207db5d73543fff3b3714;hb=a3d5866d4aa87dd93db40e9e194fea6f2b0047a4;hp=246f1fd9cef40574d3d8a0c10f175850e77ed029;hpb=e474e1eb32fb3b7b9bae4e5530a82c8b4c9c94b8;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/arch/x86/acpica.c b/KernelLand/Kernel/arch/x86/acpica.c index 246f1fd9..726feb71 100644 --- a/KernelLand/Kernel/arch/x86/acpica.c +++ b/KernelLand/Kernel/arch/x86/acpica.c @@ -5,12 +5,21 @@ * acpica.c * - ACPICA Interface */ -#define DEBUG 1 +#define ACPI_DEBUG_OUTPUT 0 +#define DEBUG 0 +#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); @@ -21,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) ) { @@ -36,7 +49,6 @@ int ACPICA_Initialise(void) return -1; } - // AcpiInitializeTables? rv = AcpiLoadTables(); if( ACPI_FAILURE(rv) ) { @@ -73,11 +85,16 @@ 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=0x%x", val); + return val; // (Or use EFI) } @@ -116,8 +133,17 @@ ACPI_STATUS AcpiOsCreateCache(char *CacheName, UINT16 ObjectSize, UINT16 MaxDept int namelen = (CacheName ? strlen(CacheName) : 0) + 1; LOG("CacheName=%s, ObjSize=%x, MaxDepth=%x", CacheName, ObjectSize, MaxDepth); + if( ReturnCache == NULL || ObjectSize < 16) { + return AE_BAD_PARAMETER; + } + + namelen = (namelen + 3) & ~3; + ret = malloc(sizeof(*ret) + MaxDepth*sizeof(char) + namelen + MaxDepth*ObjectSize); - if( !ret ) return AE_NO_MEMORY; + if( !ret ) { + Log_Notice("ACPICA", "%s: malloc() fail", __func__); + return AE_NO_MEMORY; + } ret->nObj = MaxDepth; ret->ObjectSize = ObjectSize; @@ -128,8 +154,8 @@ ACPI_STATUS AcpiOsCreateCache(char *CacheName, UINT16 ObjectSize, UINT16 MaxDept else ret->Name[0] = 0; memset(ret->ObjectStates, 0, sizeof(char)*MaxDepth); - - LOG("Allocated cache '%s' (%i x 0x%x)", CacheName, MaxDepth, ObjectSize); + + LOG("Allocated cache %p '%s' (%i x 0x%x)", ret, CacheName, MaxDepth, ObjectSize); *ReturnCache = ret; @@ -147,25 +173,41 @@ ACPI_STATUS AcpiOsDeleteCache(ACPI_CACHE_T *Cache) ACPI_STATUS AcpiOsPurgeCache(ACPI_CACHE_T *Cache) { - if( Cache == NULL ) + ENTER("pCache", Cache); + if( Cache == NULL ) { + LEAVE('i', AE_BAD_PARAMETER); return AE_BAD_PARAMETER; + } memset(Cache->ObjectStates, 0, sizeof(char)*Cache->nObj); + LEAVE('i', AE_OK); return AE_OK; } void *AcpiOsAcquireObject(ACPI_CACHE_T *Cache) { - LOG("(Cache=%p)", Cache); + ENTER("pCache", Cache); + LOG("Called by %p", __builtin_return_address(0)); for(int i = 0; i < Cache->nObj; i ++ ) { if( !Cache->ObjectStates[i] ) { Cache->ObjectStates[i] = 1; - return (char*)Cache->First + i*Cache->ObjectSize; + void *rv = (char*)Cache->First + i*Cache->ObjectSize; + if(!rv) { + LEAVE('n'); + return NULL; + } + memset(rv, 0, Cache->ObjectSize); + LEAVE('p', rv); + return rv; } } - // TODO + + Log_Debug("ACPICA", "AcpiOsAcquireObject: All %i objects used in '%s'", + Cache->nObj, Cache->Name); + + LEAVE('n'); return NULL; } @@ -173,27 +215,48 @@ ACPI_STATUS AcpiOsReleaseObject(ACPI_CACHE_T *Cache, void *Object) { if( Cache == NULL || Object == NULL ) return AE_BAD_PARAMETER; + ENTER("pCache pObject", Cache, Object); tVAddr delta = (tVAddr)Object - (tVAddr)Cache->First; delta /= Cache->ObjectSize; + LOG("Cache=%p, delta = %i, (limit %i)", Cache, delta, Cache->nObj); - if( delta > Cache->nObj ) + if( delta >= Cache->nObj ) { + LEAVE('i', AE_BAD_PARAMETER); return AE_BAD_PARAMETER; + } Cache->ObjectStates[delta] = 0; + LEAVE('i', AE_OK); 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; + char *maploc = (void*)MM_MapHWPages(PhysicalAddress, npages); + if(!maploc) { + LOG("Mapping %P+0x%x failed", PhysicalAddress, Length); + return NULL; + } +// MM_DumpTables(0, -1); + void *rv = maploc + ofs; + 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 @@ -237,7 +300,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) @@ -274,8 +337,10 @@ ACPI_STATUS AcpiOsCreateMutex(ACPI_MUTEX *OutHandle) if( !OutHandle ) return AE_BAD_PARAMETER; tMutex *ret = calloc( sizeof(tMutex), 1 ); - if( !ret ) + if( !ret ) { + Log_Notice("ACPICA", "%s: malloc() fail", __func__); return AE_NO_MEMORY; + } ret->Name = "AcpiOsCreateMutex"; *OutHandle = ret; @@ -284,6 +349,7 @@ ACPI_STATUS AcpiOsCreateMutex(ACPI_MUTEX *OutHandle) void AcpiOsDeleteMutex(ACPI_MUTEX Handle) { + // TODO: Need `Mutex_Destroy` Mutex_Acquire(Handle); free(Handle); } @@ -309,8 +375,10 @@ ACPI_STATUS AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, ACPI_SEM if( !OutHandle ) return AE_BAD_PARAMETER; tSemaphore *ret = calloc( sizeof(tSemaphore), 1 ); - if( !ret ) + if( !ret ) { + Log_Notice("ACPICA", "%s: malloc() fail", __func__); return AE_NO_MEMORY; + } Semaphore_Init(ret, InitialUnits, MaxUnits, "AcpiOsCreateSemaphore", ""); *OutHandle = ret; @@ -444,7 +512,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 { @@ -459,7 +527,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); } @@ -469,7 +537,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 { @@ -539,19 +607,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 ---