X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=9c1eb98739c746b493328f31a2d5d815a4c4799d;hb=3998cfbbadb005bf3ad52ea2538dc21f82864ddc;hp=43a88e387d0f660e94c90eb437c0ccb981041190;hpb=dea6bcf35a3f52396724d74e47f71cb3afade37c;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c index 43a88e38..9c1eb987 100644 --- a/Kernel/arch/x86/proc.c +++ b/Kernel/arch/x86/proc.c @@ -17,13 +17,27 @@ // === CONSTANTS === #define SWITCH_MAGIC 0xFFFACE55 // There is no code in this area // Base is 1193182 +#define TIMER_BASE 1193182 #define TIMER_DIVISOR 11931 //~100Hz +// === TYPES === +#if USE_MP +typedef struct sCPU +{ + Uint8 APICID; + Uint8 State; // 0: Unavaliable, 1: Idle, 2: Active + Uint16 Resvd; + tThread *Current; +} tCPU; +#endif + // === IMPORTS === extern tGDT gGDT[]; extern tIDT gIDT[]; +extern void APWait(void); // 16-bit AP pause code extern void APStartup(void); // 16-bit AP startup code extern Uint GetEIP(void); // start.asm +extern int GetCPUNum(void); // start.asm extern Uint32 gaInitPageDir[1024]; // start.asm extern void Kernel_Stack_Top; extern tSpinlock glThreadListLock; @@ -60,25 +74,28 @@ void Proc_Scheduler(int CPU); #if USE_MP volatile int giNumInitingCPUs = 0; tMPInfo *gMPFloatPtr = NULL; +volatile Uint32 giMP_TimerCount; // Start Count for Local APIC Timer tAPIC *gpMP_LocalAPIC = NULL; Uint8 gaAPIC_to_CPU[256] = {0}; tCPU gaCPUs[MAX_CPUS]; +tTSS gaTSSs[MAX_CPUS]; // TSS Array + int giProc_BootProcessorID = 0; #else tThread *gCurrentThread = NULL; #endif #if USE_PAE Uint32 *gPML4s[4] = NULL; #endif -tTSS *gTSSs = NULL; +tTSS *gTSSs = NULL; // Pointer to TSS array tTSS gTSS0 = {0}; // --- Error Recovery --- -char gaDoubleFaultStack[1024]; +char gaDoubleFaultStack[1024] __attribute__ ((section(".padata"))); tTSS gDoubleFault_TSS = { - .ESP0 = (Uint)&gaDoubleFaultStack[1023], + .ESP0 = (Uint)&gaDoubleFaultStack[1024], .SS0 = 0x10, .CR3 = (Uint)gaInitPageDir - KERNEL_BASE, .EIP = (Uint)Isr8, - .ESP = (Uint)&gaDoubleFaultStack[1023], + .ESP = (Uint)&gaDoubleFaultStack[1024], .CS = 0x08, .SS = 0x10, .DS = 0x10, .ES = 0x10, .FS = 0x10, .GS = 0x10, @@ -169,7 +186,7 @@ void ArchThreads_Init(void) Log("\t.ExtendedTableChecksum = 0x%02x", mptable->ExtendedTableChecksum); Log("}"); - gpMP_LocalAPIC = (void*)MM_MapHWPage(mptable->LocalAPICMemMap, 1); + gpMP_LocalAPIC = (void*)MM_MapHWPages(mptable->LocalAPICMemMap, 1); ents = mptable->Entries; giNumCPUs = 0; @@ -206,18 +223,19 @@ void ArchThreads_Init(void) gaCPUs[giNumCPUs].State = 0; giNumCPUs ++; - // Send IPI - if( !(ents->Proc.CPUFlags & 2) ) - { - MP_StartAP( giNumCPUs-1 ); + // Set BSP Variable + if( ents->Proc.CPUFlags & 2 ) { + giProc_BootProcessorID = giNumCPUs-1; } break; + + #if DUMP_MP_TABLES case 1: // Bus entSize = 8; Log("%i: Bus", i); Log("\t.ID = %i", ents->Bus.ID); - Log("\t.TypeString = '%6c'", ents->Bus.TypeString); + Log("\t.TypeString = '%6C'", ents->Bus.TypeString); break; case 2: // I/O APIC entSize = 8; @@ -250,6 +268,7 @@ void ArchThreads_Init(void) default: Log("%i: Unknown (%i)", i, ents->Type); break; + #endif } ents = (void*)( (Uint)ents + entSize ); } @@ -258,11 +277,7 @@ void ArchThreads_Init(void) Warning("Too many CPUs detected (%i), only using %i of them", giNumCPUs, MAX_CPUS); giNumCPUs = MAX_CPUS; } - - while( giNumInitingCPUs ) - MM_FinishVirtualInit(); - - Panic("Uh oh... MP Table Parsing is unimplemented\n"); + gTSSs = gaTSSs; } else { Log("No MP Table was found, assuming uniprocessor\n"); @@ -275,29 +290,45 @@ void ArchThreads_Init(void) MM_FinishVirtualInit(); #endif + #if 0 // Initialise Double Fault TSS - /* - gGDT[5].LimitLow = sizeof(tTSS); - gGDT[5].LimitHi = 0; - gGDT[5].Access = 0x89; // Type - gGDT[5].Flags = 0x4; - */ gGDT[5].BaseLow = (Uint)&gDoubleFault_TSS & 0xFFFF; gGDT[5].BaseMid = (Uint)&gDoubleFault_TSS >> 16; gGDT[5].BaseHi = (Uint)&gDoubleFault_TSS >> 24; - Log_Debug("Proc", "gIDT[8] = {OffsetLo:%04x, CS:%04x, Flags:%04x, OffsetHi:%04x}", - gIDT[8].OffsetLo, gIDT[8].CS, gIDT[8].Flags, gIDT[8].OffsetHi); + // Set double fault IDT to use the new TSS gIDT[8].OffsetLo = 0; gIDT[8].CS = 5<<3; gIDT[8].Flags = 0x8500; gIDT[8].OffsetHi = 0; - Log_Debug("Proc", "gIDT[8] = {OffsetLo:%04x, CS:%04x, Flags:%04x, OffsetHi:%04x}", - gIDT[8].OffsetLo, gIDT[8].CS, gIDT[8].Flags, gIDT[8].OffsetHi); + #endif - //__asm__ __volatile__ ("xchg %bx, %bx"); + // Set timer frequency + outb(0x43, 0x34); // Set Channel 0, Low/High, Rate Generator + outb(0x40, TIMER_DIVISOR&0xFF); // Low Byte of Divisor + outb(0x40, (TIMER_DIVISOR>>8)&0xFF); // High Byte #if USE_MP + // Get the count setting for APIC timer + Log("Determining APIC Count"); + __asm__ __volatile__ ("sti"); + while( giMP_TimerCount == 0 ) __asm__ __volatile__ ("hlt"); + __asm__ __volatile__ ("cli"); + Log("APIC Count %i", giMP_TimerCount); + { + Uint64 freq = giMP_TimerCount; + freq /= TIMER_DIVISOR; + freq *= TIMER_BASE; + if( (freq /= 1000) < 2*1000) + Log("Bus Frequency %i KHz", freq); + else if( (freq /= 1000) < 2*1000) + Log("Bus Frequency %i MHz", freq); + else if( (freq /= 1000) < 2*1000) + Log("Bus Frequency %i GHz", freq); + else + Log("Bus Frequency %i THz", freq); + } + // Initialise Normal TSS(s) for(pos=0;pos> 24; #if USE_MP } - for(pos=0;pos>8)&0xFF); // High Byte - // Create Per-Process Data Block MM_Allocate(MM_PPD_CFG); @@ -348,27 +373,47 @@ void ArchThreads_Init(void) void MP_StartAP(int CPU) { Log("Starting AP %i (APIC %i)", CPU, gaCPUs[CPU].APICID); + // Set location of AP startup code and mark for a warm restart - *(Uint16*)(KERNEL_BASE|0x467) = (Uint)&APStartup - (KERNEL_BASE|0xFFFF0); + *(Uint16*)(KERNEL_BASE|0x467) = (Uint)&APWait - (KERNEL_BASE|0xFFFF0); *(Uint16*)(KERNEL_BASE|0x469) = 0xFFFF; outb(0x70, 0x0F); outb(0x71, 0x0A); // Warm Reset - MP_SendIPI(gaCPUs[CPU].APICID, 0, 5); + MP_SendIPI(gaCPUs[CPU].APICID, 0, 5); // Init IPI + + // Delay + inb(0x80); inb(0x80); inb(0x80); inb(0x80); + + // TODO: Use a better address, preferably registered with the MM + // - MM_AllocDMA mabye? + // Create a far jump + *(Uint8*)(KERNEL_BASE|0x11000) = 0xEA; // Far JMP + *(Uint16*)(KERNEL_BASE|0x11001) = (Uint)&APStartup - (KERNEL_BASE|0xFFFF0); // IP + *(Uint16*)(KERNEL_BASE|0x11003) = 0xFFFF; // CS + // Send a Startup-IPI to make the CPU execute at 0x11000 (which we + // just filled) + MP_SendIPI(gaCPUs[CPU].APICID, 0x11, 6); // StartupIPI + giNumInitingCPUs ++; } +/** + * \brief Send an Inter-Processor Interrupt + * \param APICID Processor's Local APIC ID + * \param Vector Argument of some kind + * \param DeliveryMode Type of signal? + */ void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode) { - Uint32 addr = (Uint)gpMP_LocalAPIC + 0x300; Uint32 val; // Hi val = (Uint)APICID << 24; - Log("*%p = 0x%08x", addr+0x10, val); - *(Uint32*)(addr+0x10) = val; + Log("*%p = 0x%08x", &gpMP_LocalAPIC->ICR[1], val); + gpMP_LocalAPIC->ICR[1].Val = val; // Low (and send) val = ((DeliveryMode & 7) << 8) | (Vector & 0xFF); - Log("*%p = 0x%08x", addr, val); - *(Uint32*)addr = val; + Log("*%p = 0x%08x", &gpMP_LocalAPIC->ICR[0], val); + gpMP_LocalAPIC->ICR[0].Val = val; } #endif @@ -378,8 +423,28 @@ void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode) */ void Proc_Start(void) { + #if USE_MP + int i; + #endif + // Start Interrupts (and hence scheduler) __asm__ __volatile__("sti"); + + #if USE_MP + // Start APs + for( i = 0; i < giNumCPUs; i ++ ) + { + gaCPUs[i].Current = NULL; + if( i != giProc_BootProcessorID ) { + MP_StartAP( i ); + } + } + + Log("Waiting for APs to come up\n"); + //__asm__ __volatile__ ("sti"); + while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt"); + MM_FinishVirtualInit(); + #endif } /** @@ -389,7 +454,8 @@ void Proc_Start(void) tThread *Proc_GetCurThread(void) { #if USE_MP - return gaCPUs[ gaAPIC_to_CPU[gpMP_LocalAPIC->ID.Val&0xFF] ].Current; + //return gaCPUs[ gaAPIC_to_CPU[gpMP_LocalAPIC->ID.Val&0xFF] ].Current; + return gaCPUs[ GetCPUNum() ].Current; #else return gCurrentThread; #endif @@ -504,6 +570,7 @@ int Proc_Clone(Uint *Err, Uint Flags) eip = GetEIP(); if(eip == SWITCH_MAGIC) { outb(0x20, 0x20); // ACK Timer and return as child + __asm__ __volatile__ ("sti"); // Restart interrupts return 0; } @@ -581,13 +648,12 @@ Uint Proc_MakeUserStack(void) if(i != -1) return 0; // Allocate Stack - Allocate incrementally to clean up MM_Dump output - for( i = 0; i < USER_STACK_SZ/4069; i++ ) + for( i = 0; i < USER_STACK_SZ/0x1000; i++ ) MM_Allocate( base + (i<<12) ); return base + USER_STACK_SZ; } - /** * \fn void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize) * \brief Starts a user task @@ -599,19 +665,30 @@ void Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char ** Uint delta; Uint16 ss, cs; - LOG("stack = 0x%x", stack); + //Log("stack = %p", stack); // Copy Arguments - stack = (void*)( (Uint)stack - DataSize ); + stack -= DataSize/sizeof(*stack); memcpy( stack, ArgV, DataSize ); - // Adjust Arguments and environment - delta = (Uint)stack - (Uint)ArgV; - ArgV = (char**)stack; - for( i = 0; ArgV[i]; i++ ) ArgV[i] += delta; - i ++; - EnvP = &ArgV[i]; - for( i = 0; EnvP[i]; i++ ) EnvP[i] += delta; + //Log("stack = %p", stack); + + if( DataSize ) + { + // Adjust Arguments and environment + delta = (Uint)stack - (Uint)ArgV; + ArgV = (char**)stack; + for( i = 0; ArgV[i]; i++ ) + ArgV[i] += delta; + i ++; + + // Do we care about EnvP? + if( EnvP ) { + EnvP = &ArgV[i]; + for( i = 0; EnvP[i]; i++ ) + EnvP[i] += delta; + } + } // User Mode Segments ss = 0x23; cs = 0x1B; @@ -732,7 +809,15 @@ void Proc_Scheduler(int CPU) // Check if there is any tasks running if(giNumActiveThreads == 0) { + #if 0 Log("No Active threads, sleeping"); + #endif + #if USE_MP + if(CPU) + gpMP_LocalAPIC->EOI.Val = 0; + else + #endif + outb(0x20, 0x20); __asm__ __volatile__ ("hlt"); return; } @@ -779,11 +864,15 @@ void Proc_Scheduler(int CPU) // Set current thread #if USE_MP + gaCPUs[CPU].Current->bIsRunning = 0; gaCPUs[CPU].Current = thread; + thread->bIsRunning = 1; #else gCurrentThread = thread; #endif + //Log("CPU = %i", CPU); + // Update Kernel Stack pointer gTSSs[CPU].ESP0 = thread->KernelStack-4;