nexoniarz/SchOS
nexoniarz/SchOS
Watch
1
0
Fork
You've already forked SchOS
 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

boot: stop assuming the machine is an emulator

Browse source 
Every one of these works under QEMU and stops a real machine:

- MADT processors that are "online capable" but not enabled were
  counted as CPUs. AMD firmware lists absent cores that way (so does
  QEMU with maxcpus), and startothers() then waited for ever for an
  AP that does not exist. Only enabled entries count now, x2APIC
  (type 9) entries are read too, and the wait is bounded to a second;
  an AP that misses it is parked with INIT and the boot goes on.
- The PIT calibration loop had no bound. Recent boards clock-gate the
  8254: the output never rises (a hang) or floats high (TSC "0 MHz"
  and every clock thousands of times fast). The loop is bounded and
  checked, and falls back to the ACPI PM timer, then CPUID 0x15/0x16.
  Under QEMU pit=off the PM timer gives the same figures the PIT did.
- Firmware that hands over in x2APIC mode left lapic[] reading
  garbage: cpunum() panicked or the timer never started. Each CPU is
  switched back to xAPIC first (x2APIC -> disabled -> xAPIC).
- The IOAPIC was always at 0xFEC00000 and interrupts were aimed at
  APIC ID "0". Both now come from the firmware's tables.
- INIT-to-STARTUP was 100 us ("Bochs is slow"); it is the 10 ms the
  MP specification asks for.
- mouseinit() drained the 8042 with an unbounded loop. With no
  controller the port reads 0xFF and the loop never ends. It now
  notices there is no controller and skips the mouse.

Tested in QEMU: i440fx and q35, -smp 4, -smp 2,maxcpus=4, pit=off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HH7xukt4aaiGj1nQEAoQf1
This commit is contained in:
Nexoniarz 2026-10-22 10:29:12 +02:00
commit 94c936ed98
7 changed files with 355 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/arch/x86_64/mp.c
View file

@ -25,6 +25,9 @@ int ncpu;
// working ones, which was a comfortable thing to read and false.
int ncpu_online = 1;
uchar ioapicid;
// Where the I/O APIC's registers are. Every source that describes it -- the
// MADT, or this table -- says so, and ioapicinit() maps whatever they said.
uint64 ioapic_phys = IOAPIC_DEFAULT_PHYS;
static uchar
sum(uchar *addr, int len)
@ -116,7 +119,9 @@ mpinit(void)
switch(*p){
case MPPROC:
mproc = (struct mpproc*)p;
if(ncpu < NCPU) {
// Bit 0 is "usable". A disabled entry is a processor that is not
// there, and starting it means waiting for an answer that never comes.
if((mproc->flags & 0x01) && ncpu < NCPU) {
cpus[ncpu].apicid = mproc->apicid; // apicid may differ from ncpu
ncpu++;
}
@ -124,7 +129,10 @@ mpinit(void)
continue;
case MPIOAPIC:
ioapic = (struct mpioapic*)p;
ioapicid = ioapic->apicno;
if(ioapic_phys == IOAPIC_DEFAULT_PHYS || ioapic->addr_p == IOAPIC_DEFAULT_PHYS){
ioapicid = ioapic->apicno;
ioapic_phys = ioapic->addr_p;
}
p += sizeof(struct mpioapic);
continue;
case MPBUS: