The patch titled x86: apic: fix apic error on bootup has been added to the -mm tree. Its filename is x86-apic-fix-apic-error-on-bootup.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: x86: apic: fix apic error on bootup From: "Siddha, Suresh B" <suresh.b.siddha@xxxxxxxxx> Appended patch fixes the "APIC error on CPUX: 00(40)" observed during bootup. SDM Vol-3A "Valid Interrupt Vectors" says: "When an illegal vector value (0-15) is written to an LVT entry and the delivery mode is Fixed, the APIC may signal an illegal vector error, with out regard to whether the mask bit is set or whether an interrupt is actually seen on input." Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> Cc: Andi Kleen <ak@xxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: Rohit Seth <rohitseth@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/i386/kernel/apic.c | 15 +++++++++++++-- x86_64/kernel/apic.c | 0 2 files changed, 13 insertions(+), 2 deletions(-) diff -puN arch/i386/kernel/apic.c~x86-apic-fix-apic-error-on-bootup arch/i386/kernel/apic.c --- a/arch/i386/kernel/apic.c~x86-apic-fix-apic-error-on-bootup +++ a/arch/i386/kernel/apic.c @@ -157,7 +157,7 @@ void clear_local_APIC(void) maxlvt = get_maxlvt(); /* - * Masking an LVT entry on a P6 can trigger a local APIC error + * Masking an LVT entry can trigger a local APIC error * if the vector is zero. Mask LVTERR first to prevent this. */ if (maxlvt >= 3) { @@ -1117,7 +1117,18 @@ void disable_APIC_timer(void) unsigned long v; v = apic_read(APIC_LVTT); - apic_write_around(APIC_LVTT, v | APIC_LVT_MASKED); + /* + * When an illegal vector value (0-15) is written to an LVT + * entry and delivery mode is Fixed, the APIC may signal an + * illegal vector error, with out regard to whether the mask + * bit is set or whether an interrupt is actually seen on input. + * + * Boot sequence might call this function when the LVTT has + * '0' vector value. So make sure vector field is set to + * valid value. + */ + v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); + apic_write_around(APIC_LVTT, v); } } diff -puN arch/x86_64/kernel/apic.c~x86-apic-fix-apic-error-on-bootup arch/x86_64/kernel/apic.c _ Patches currently in -mm which might be from suresh.b.siddha@xxxxxxxxx are x86_64-apic-fix-apic-error-on-bootup.patch fix-x86-microcode-driver-handling-of-multiple-matching.patch x86-apic-fix-apic-error-on-bootup.patch sched-implement-smpnice.patch sched-prevent-high-load-weight-tasks-suppressing-balancing.patch sched-improve-stability-of-smpnice-load-balancing.patch sched-improve-smpnice-load-balancing-when-load-per-task.patch smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing.patch smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing-fix.patch smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing-fix-2patch.patch sched-modify-move_tasks-to-improve-load-balancing-outcomes.patch sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks.patch sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks-fix-2.patch sched_domain-handle-kmalloc-failure.patch sched_domain-handle-kmalloc-failure-fix.patch sched_domain-dont-use-gfp_atomic.patch sched_domain-use-kmalloc_node.patch sched_domain-allocate-sched_group-structures-dynamically.patch sched-mc-smt-power-savings-sched-policy.patch sched-mc-smt-power-savings-sched-policy-sparc64-build-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html