// Base is 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 APStartup(); // 16-bit AP startup code
-extern Uint GetEIP(); // start.asm
+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 tThread *gSleepingThreads;
extern tThread *gDeleteThreads;
extern tThread *Threads_GetNextToRun(int CPU);
-extern void Threads_Dump();
+extern void Threads_Dump(void);
extern tThread *Threads_CloneTCB(Uint *Err, Uint Flags);
-extern void Isr8(); // Double Fault
-extern void Proc_ReturnToUser();
+extern void Isr8(void); // Double Fault
+extern void Proc_ReturnToUser(void);
// === PROTOTYPES ===
-void ArchThreads_Init();
+void ArchThreads_Init(void);
#if USE_MP
void MP_StartAP(int CPU);
void MP_SendIPI(Uint8 APICID, int Vector, int DeliveryMode);
#endif
-void Proc_Start();
-tThread *Proc_GetCurThread();
-void Proc_ChangeStack();
+void Proc_Start(void);
+tThread *Proc_GetCurThread(void);
+void Proc_ChangeStack(void);
int Proc_Clone(Uint *Err, Uint Flags);
void Proc_StartProcess(Uint16 SS, Uint Stack, Uint Flags, Uint16 CS, Uint IP);
void Proc_CallFaultHandler(tThread *Thread);
-void Proc_Scheduler();
+void Proc_Scheduler(int CPU);
// === GLOBALS ===
// --- Multiprocessing ---
#if USE_MP
volatile int giNumInitingCPUs = 0;
tMPInfo *gMPFloatPtr = NULL;
+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];
// === CODE ===
/**
- * \fn void ArchThreads_Init()
+ * \fn void ArchThreads_Init(void)
* \brief Starts the process scheduler
*/
-void ArchThreads_Init()
+void ArchThreads_Init(void)
{
Uint pos = 0;
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;
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;
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");
#endif
// 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);
- //__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
+ // 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\n", giMP_TimerCount);
#if USE_MP
// Initialise Normal TSS(s)
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
+
+ // Start APs
+ for( pos = 0; pos < giNumCPUs; pos ++ )
+ {
+ gaCPUs[pos].Current = NULL;
+ if( pos != giProc_BootProcessorID ) {
+ MP_StartAP( pos );
+ }
}
+
+ Log("Waiting for APs to come up\n");
+ while( giNumInitingCPUs ) __asm__ __volatile__ ("hlt");
+ MM_FinishVirtualInit();
+ //Panic("Uh oh... MP Table Parsing is unimplemented\n");
#endif
+ // Load the BSP's TSS
+ __asm__ __volatile__ ("ltr %%ax"::"a"(0x30));
+
#if USE_MP
gaCPUs[0].Current = &gThreadZero;
#else
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);
+ 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
/**
- * \fn void Proc_Start()
+ * \fn void Proc_Start(void)
* \brief Start process scheduler
*/
-void Proc_Start()
+void Proc_Start(void)
{
// Start Interrupts (and hence scheduler)
__asm__ __volatile__("sti");
}
/**
- * \fn tThread *Proc_GetCurThread()
+ * \fn tThread *Proc_GetCurThread(void)
* \brief Gets the current thread
*/
-tThread *Proc_GetCurThread()
+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
}
/**
- * \fn void Proc_ChangeStack()
+ * \fn void Proc_ChangeStack(void)
* \brief Swaps the current stack for a new one (in the proper stack reigon)
*/
-void Proc_ChangeStack()
+void Proc_ChangeStack(void)
{
Uint esp, ebp;
Uint tmpEbp, oldEsp;
}
/**
- * \fn int Proc_SpawnWorker()
+ * \fn int Proc_SpawnWorker(void)
* \brief Spawns a new worker thread
*/
-int Proc_SpawnWorker()
+int Proc_SpawnWorker(void)
{
tThread *new, *cur;
Uint eip, esp, ebp;
}
/**
- * \fn Uint Proc_MakeUserStack()
+ * \fn Uint Proc_MakeUserStack(void)
* \brief Creates a new user stack
*/
-Uint Proc_MakeUserStack()
+Uint Proc_MakeUserStack(void)
{
int i;
Uint base = USER_STACK_TOP - USER_STACK_SZ;
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
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;
gCurrentThread = thread;
#endif
+ //Log("CPU = %i", CPU);
+
// Update Kernel Stack pointer
gTSSs[CPU].ESP0 = thread->KernelStack-4;
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au