boot: stop assuming the machine is an emulator
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:
parent
f1798e7443
commit
94c936ed98
7 changed files with 355 additions and 23 deletions
|
|
@ -223,7 +223,19 @@ mouseinit(void)
|
|||
mouse_state.x = 400;
|
||||
mouse_state.y = 300;
|
||||
|
||||
while(inb(KBD_S_STAT) & 0x01)
|
||||
// No 8042 at all: the port floats and reads 0xFF. That is a machine with
|
||||
// USB input only -- most laptops and desktops built in the last few years,
|
||||
// whenever the firmware's legacy emulation is off -- and every bit set means
|
||||
// "output full" for ever, so the flush below never ended and boot stopped
|
||||
// here. There is no mouse to set up, so do not.
|
||||
if(inb(KBD_S_STAT) == 0xFF){
|
||||
kinfo("ps2: no controller; mouse not set up\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// Drain whatever the controller is holding. Bounded, because a controller
|
||||
// that keeps producing bytes is broken and still not a reason to hang.
|
||||
for(int i = 0; i < 1024 && (inb(KBD_S_STAT) & 0x01); i++)
|
||||
inb(KBD_S_DATA);
|
||||
|
||||
mouse_wait(1);
|
||||
|
|
|
|||
Loading…
Reference in a new issue