Skip to content

Commit

Permalink
x86: fix APIC warning on 32bit v2
Browse files Browse the repository at this point in the history
for http://bugzilla.kernel.org/show_bug.cgi?id=10613

BIOS bug, APIC version is 0 for CPU#0! fixing up to 0x10. (tell your hw vendor)

v2: fix 64 bit compilation

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Gabriel C <nix.or.die@googlemail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Yinghai Lu authored and Thomas Gleixner committed Jun 4, 2008
1 parent c3b25b3 commit fb3bbd6
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions arch/x86/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,19 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)

static void __cpuinit acpi_register_lapic(int id, u8 enabled)
{
unsigned int ver = 0;

if (!enabled) {
++disabled_cpus;
return;
}

generic_processor_info(id, 0);
#ifdef CONFIG_X86_32
if (boot_cpu_physical_apicid != -1U)
ver = apic_version[boot_cpu_physical_apicid];
#endif

generic_processor_info(id, ver);
}

static int __init
Expand Down Expand Up @@ -767,8 +774,13 @@ static void __init acpi_register_lapic_address(unsigned long address)
mp_lapic_addr = address;

set_fixmap_nocache(FIX_APIC_BASE, address);
if (boot_cpu_physical_apicid == -1U)
if (boot_cpu_physical_apicid == -1U) {
boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());
#ifdef CONFIG_X86_32
apic_version[boot_cpu_physical_apicid] =
GET_APIC_VERSION(apic_read(APIC_LVR));
#endif
}
}

static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
Expand Down

0 comments on commit fb3bbd6

Please sign in to comment.