* proc.c
*/
#include <acess.h>
+#include <threads.h>
#include <proc.h>
#include <desctab.h>
#include <mm_virt.h>
// === FLAGS ===
#define DEBUG_TRACE_SWITCH 0
+#define DEBUG_DISABLE_DOUBLEFAULT 1
// === CONSTANTS ===
-#define SWITCH_MAGIC 0xFFFACE55 // There is no code in this area
+#define SWITCH_MAGIC 0xFF5317C8 // FF SWITCH - There is no code in this area
// Base is 1193182
-#define TIMER_DIVISOR 11931 //~100Hz
+#define TIMER_BASE 1193182
+#define TIMER_DIVISOR 11932 //~100Hz
+
+// === TYPES ===
+#if USE_MP
+typedef struct sCPU
+{
+ Uint8 APICID;
+ Uint8 State; // 0: Unavaliable, 1: Idle, 2: Active
+ Uint16 Resvd;
+ tThread *Current;
+ tThread *IdleThread;
+} 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;
+extern char Kernel_Stack_Top[];
+extern tShortSpinlock glThreadListLock;
extern int giNumCPUs;
extern int giNextTID;
-extern int giTotalTickets;
-extern int giNumActiveThreads;
extern tThread gThreadZero;
-extern tThread *gActiveThreads;
-extern tThread *gSleepingThreads;
-extern tThread *gDeleteThreads;
-extern tThread *Threads_GetNextToRun(int CPU);
-extern void Threads_Dump(void);
extern tThread *Threads_CloneTCB(Uint *Err, Uint Flags);
extern void Isr8(void); // Double Fault
-extern void Proc_ReturnToUser(void);
+extern void Proc_ReturnToUser(tVAddr Handler, Uint Argument);
// === PROTOTYPES ===
void ArchThreads_Init(void);
#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;
+tThread *gpIdleThread = 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,
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;
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;
default:
Log("%i: Unknown (%i)", i, ents->Type);
break;
+ #endif
}
ents = (void*)( (Uint)ents + entSize );
}
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");
MM_FinishVirtualInit();
#endif
+ #if !DEBUG_DISABLE_DOUBLEFAULT
// 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
+
+ Log("Timer Frequency %i.%03i Hz",
+ TIMER_BASE/TIMER_DIVISOR,
+ ((Uint64)TIMER_BASE*1000/TIMER_DIVISOR)%1000
+ );
#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<giNumCPUs;pos++)
{
gTSSs[pos].SS0 = 0x10;
gTSSs[pos].ESP0 = 0; // Set properly by scheduler
gGDT[6+pos].BaseLow = ((Uint)(&gTSSs[pos])) & 0xFFFF;
- gGDT[6+pos].BaseMid = ((Uint)(&gTSSs[pos])) >> 16;
+ gGDT[6+pos].BaseMid = ((Uint)(&gTSSs[pos]) >> 16) & 0xFFFF;
gGDT[6+pos].BaseHi = ((Uint)(&gTSSs[pos])) >> 24;
#if USE_MP
}
- for(pos=0;pos<giNumCPUs;pos++) {
- #endif
- __asm__ __volatile__ ("ltr %%ax"::"a"(0x30+pos*8));
- #if USE_MP
- }
#endif
+ // Load the BSP's TSS
+ __asm__ __volatile__ ("ltr %%ax"::"a"(0x30));
+ // Set Current Thread and CPU Number in DR0 and DR1
+ __asm__ __volatile__ ("mov %0, %%db0"::"r"(&gThreadZero));
+ __asm__ __volatile__ ("mov %0, %%db1"::"r"(0));
+
#if USE_MP
gaCPUs[0].Current = &gThreadZero;
#else
gCurrentThread = &gThreadZero;
#endif
+ gThreadZero.CurCPU = 0;
#if USE_PAE
gThreadZero.MemState.PDP[0] = 0;
gThreadZero.MemState.CR3 = (Uint)gaInitPageDir - KERNEL_BASE;
#endif
- // 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
-
// Create Per-Process Data Block
MM_Allocate(MM_PPD_CFG);
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);
+ outb(0x70, 0x0F); outb(0x71, 0x0A); // Set warm reset flag
+ 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
*/
void Proc_Start(void)
{
+ #if USE_MP
+ int i;
+ #endif
+
+ #if USE_MP
+ // Start APs
+ for( i = 0; i < giNumCPUs; i ++ )
+ {
+ int tid;
+ if(i) gaCPUs[i].Current = NULL;
+
+ // Create Idle Task
+ if( (tid = Proc_Clone(0, 0)) == 0)
+ {
+ for(;;) HALT(); // Just yeilds
+ }
+ gaCPUs[i].IdleThread = Threads_GetThread(tid);
+ gaCPUs[i].IdleThread->ThreadName = "Idle Thread";
+ Threads_SetPriority( gaCPUs[i].IdleThread, -1 ); // Never called randomly
+ gaCPUs[i].IdleThread->Quantum = 1; // 1 slice quantum
+
+
+ // Start the AP
+ if( i != giProc_BootProcessorID ) {
+ MP_StartAP( i );
+ }
+ }
+
+ // BSP still should run the current task
+ gaCPUs[0].Current = &gThreadZero;
+
+ // Start interrupts and wait for APs to come up
+ Log("Waiting for APs to come up\n");
+ __asm__ __volatile__ ("sti");
+ while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt");
+ #else
+ // Create Idle Task
+ if(Proc_Clone(0, 0) == 0)
+ {
+ gpIdleThread = Proc_GetCurThread();
+ gpIdleThread->ThreadName = "Idle Thread";
+ Threads_SetPriority( gpIdleThread, -1 ); // Never called randomly
+ gpIdleThread->Quantum = 1; // 1 slice quantum
+ for(;;) HALT(); // Just yeilds
+ }
+
+ // Set current task
+ gCurrentThread = &gThreadZero;
+
// Start Interrupts (and hence scheduler)
__asm__ __volatile__("sti");
+ #endif
+ MM_FinishVirtualInit();
}
/**
tThread *Proc_GetCurThread(void)
{
#if USE_MP
- return gaCPUs[ gaAPIC_to_CPU[gpMP_LocalAPIC->ID.Val&0xFF] ].Current;
+ return gaCPUs[ GetCPUNum() ].Current;
#else
return gCurrentThread;
#endif
Uint tmpEbp, oldEsp = esp;
// Set CR3
+ #if USE_PAE
+ # warning "PAE Unimplemented"
+ #else
newThread->MemState.CR3 = cur->MemState.CR3;
+ #endif
// Create new KStack
newThread->KernelStack = MM_NewKStack();
newThread->SavedState.EBP = ebp;
eip = GetEIP();
if(eip == SWITCH_MAGIC) {
- outb(0x20, 0x20); // ACK Timer and return as child
+ __asm__ __volatile__ ("mov %0, %%db0" : : "r" (newThread) );
+ #if USE_MP
+ // ACK the interrupt
+ if( GetCPUNum() )
+ gpMP_LocalAPIC->EOI.Val = 0;
+ else
+ #endif
+ outb(0x20, 0x20); // ACK Timer and return as child
+ __asm__ __volatile__ ("sti"); // Restart interrupts
return 0;
}
// Set Thread ID
new->TID = giNextTID++;
// Create a new worker stack (in PID0's address space)
- // The stack is relocated by this code
+ // - The stack is relocated by this function
new->KernelStack = MM_NewWorkerStack();
// Get ESP and EBP based in the new stack
new->SavedState.EBP = ebp;
eip = GetEIP();
if(eip == SWITCH_MAGIC) {
- outb(0x20, 0x20); // ACK Timer and return as child
+ __asm__ __volatile__ ("mov %0, %%db0" : : "r"(new));
+ #if USE_MP
+ // ACK the interrupt
+ if(GetCPUNum())
+ gpMP_LocalAPIC->EOI.Val = 0;
+ else
+ #endif
+ outb(0x20, 0x20); // ACK Timer and return as child
+ __asm__ __volatile__ ("sti"); // Restart interrupts
return 0;
}
// Set EIP as parent
new->SavedState.EIP = eip;
// Mark as active
- new->Status = THREAD_STAT_ACTIVE;
Threads_AddActive( new );
return new->TID;
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;
{
// Rewinds the stack and calls the user function
// Never returns
- __asm__ __volatile__ ("mov %0, %%ebp;\n\tcall Proc_ReturnToUser" :: "r"(Thread->FaultHandler));
+ Proc_ReturnToUser( Thread->FaultHandler, Thread->CurFaultNum );
for(;;);
}
// If the spinlock is set, let it complete
if(IS_LOCKED(&glThreadListLock)) return;
- // Clear Delete Queue
- while(gDeleteThreads)
- {
- thread = gDeleteThreads->Next;
- if(gDeleteThreads->IsLocked) { // Only free if structure is unused
- gDeleteThreads->Status = THREAD_STAT_NULL;
- free( gDeleteThreads );
- }
- gDeleteThreads = thread;
- }
-
- // Check if there is any tasks running
- if(giNumActiveThreads == 0) {
- Log("No Active threads, sleeping");
- __asm__ __volatile__ ("hlt");
- return;
- }
-
// Get current thread
#if USE_MP
thread = gaCPUs[CPU].Current;
thread = gCurrentThread;
#endif
- // Reduce remaining quantum and continue timeslice if non-zero
- if(thread->Remaining--) return;
- // Reset quantum for next call
- thread->Remaining = thread->Quantum;
-
- // Get machine state
- __asm__ __volatile__ ("mov %%esp, %0":"=r"(esp));
- __asm__ __volatile__ ("mov %%ebp, %0":"=r"(ebp));
- eip = GetEIP();
- if(eip == SWITCH_MAGIC) return; // Check if a switch happened
-
- // Save machine state
- thread->SavedState.ESP = esp;
- thread->SavedState.EBP = ebp;
- thread->SavedState.EIP = eip;
+ if( thread )
+ {
+ // Reduce remaining quantum and continue timeslice if non-zero
+ if( thread->Remaining-- )
+ return;
+ // Reset quantum for next call
+ thread->Remaining = thread->Quantum;
+
+ // Get machine state
+ __asm__ __volatile__ ( "mov %%esp, %0" : "=r" (esp) );
+ __asm__ __volatile__ ( "mov %%ebp, %0" : "=r" (ebp) );
+ eip = GetEIP();
+ if(eip == SWITCH_MAGIC) return; // Check if a switch happened
+
+ // Save machine state
+ thread->SavedState.ESP = esp;
+ thread->SavedState.EBP = ebp;
+ thread->SavedState.EIP = eip;
+ }
- // Get next thread
- thread = Threads_GetNextToRun(CPU);
+ // Get next thread to run
+ thread = Threads_GetNextToRun(CPU, thread);
- // Error Check
+ // No avaliable tasks, just go into low power mode (idle thread)
if(thread == NULL) {
- Warning("Hmm... Threads_GetNextToRun returned NULL, I don't think this should happen.\n");
- return;
+ #if USE_MP
+ thread = gaCPUs[CPU].IdleThread;
+ Log("CPU %i Running Idle Thread", CPU);
+ #else
+ thread = gpIdleThread;
+ #endif
}
+ // Set current thread
+ #if USE_MP
+ gaCPUs[CPU].Current = thread;
+ #else
+ gCurrentThread = thread;
+ #endif
+
#if DEBUG_TRACE_SWITCH
Log("Switching to task %i, CR3 = 0x%x, EIP = %p",
thread->TID,
);
#endif
- // Set current thread
- #if USE_MP
- gaCPUs[CPU].Current = thread;
- #else
- gCurrentThread = thread;
+ #if USE_MP // MP Debug
+ Log("CPU = %i, Thread %p", CPU, thread);
#endif
// Update Kernel Stack pointer
#if USE_PAE
# error "Todo: Implement PAE Address space switching"
#else
- __asm__ __volatile__ ("mov %0, %%cr3"::"a"(thread->MemState.CR3));
+ __asm__ __volatile__ ("mov %0, %%cr3" : : "a" (thread->MemState.CR3));
#endif
#if 0
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au