Re: 2.4.2[01] i386 does not reenable local apic

From: mikpe@csd.uu.se
Date: Wed Jun 04 2003 - 05:53:59 EST


Keith Owens writes:
> arc/i386/kernel/apic.c::detect_init_APIC()
>
> switch (boot_cpu_data.x86_vendor) {
> case X86_VENDOR_AMD:
> if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1)
> break;
> if (boot_cpu_data.x86 == 15 && cpu_has_apic)
> break;
> goto no_apic;
> case X86_VENDOR_INTEL:
> if (boot_cpu_data.x86 == 6 ||
> (boot_cpu_data.x86 == 15 && cpu_has_apic) ||
> (boot_cpu_data.x86 == 5 && cpu_has_apic))
> break;
> goto no_apic;
> default:
> goto no_apic;
> }
>
> if (!cpu_has_apic) {
> /*
> * Some BIOSes disable the local APIC in the
> * APIC_BASE MSR. This can only be done in
> * software for Intel P6 and AMD K7 (Model > 1).
> */
> rdmsr(MSR_IA32_APICBASE, l, h);
> if (!(l & MSR_IA32_APICBASE_ENABLE)) {
> printk("Local APIC disabled by BIOS -- reenabling.\n");
> l &= ~MSR_IA32_APICBASE_BASE;
> l |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE;
> wrmsr(MSR_IA32_APICBASE, l, h);
> }
> }
>
> Because boot_cpu_data.x86 == 15 and the local APIC is disabled in BIOS,
> detect_init_APIC() skips the code that reenables the local APIC. This
> test is back to front. Change the code to force X86_VENDOR_INTEL to
> drop through and it successfully reenables the local apic, I even get
> NMI events.

The correct fix is to delete the "&& cpu_has_apic" test for family 15
CPUs. Simply falling through for VENDOR_INTEL will oops UP P5s.

I've seen a few P4 owners being caught by this. OTOH, several of those
had crap BIOSen that caused hangs with local APIC enabled.

I'll do a patch for 2.4.22-pre, if we ever actually get a 2.4.21 final...

/Mikael
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jun 07 2003 - 22:00:23 EST